Do not group 2 numbers

Author: DaanVanVugt

bin/lsdeflate

@@ -9,5 +9,4 @@ if __name__ == "__main__":
     for ext in grouped_names:
         all_out = all_out + list(map(lambda s: s + ext, 
                                      group_basenames(grouped_names[ext])))
-    all_out.sort()
     print("\n".join(all_out))

lsdeflate/__init__.py

@@ -34,6 +34,8 @@ def group_names_by_ext(lines):
     Find the longest sequence
     Subtract this from the list
     recurse
+
+This returns a list of ranges in no particular order
 """
 def list_to_ranges(lst):
     if not isinstance(lst, np.ndarray): lst = np.asarray(lst)
@@ -49,8 +51,13 @@ def list_to_ranges(lst):
     rest = np.zeros(lst.shape[0]-1-iend+istart,dtype=np.int)
     rest[:istart] = lst[:istart]
     rest[istart:] = lst[iend+1:]
-    return sorted([(lst[istart],lst[iend],diffs[istart])] + list_to_ranges(rest),
-                  key=lambda x:x[0])
+    # If it is only a small range consider giving just the numbers
+    if ((lst[iend] - lst[istart])/diffs[istart] == 1):
+        result = [(lst[istart],lst[istart],1), 
+                  (lst[iend],lst[iend],1)]
+    else:
+        result = [(lst[istart],lst[iend],diffs[istart])]
+    return result + list_to_ranges(rest)
 
 
 """
@@ -93,8 +100,9 @@ def group_basenames(basenames):
             for num_s in tmp_s:
                 output.append(key[0] + num_s + key[1])
         else:
-            ranges = list_to_ranges(tmp)
-            for imin,imax,step in ranges:
+            for amin,amax,step in sorted(list_to_ranges(tmp), key=lambda x: x[0]):
+                imin = np.nonzero(tmp == amin)[0][0]
+                imax = np.nonzero(tmp == amax)[0][0]
                 smin = grouped_numbers_str[key][imin]
                 smax = grouped_numbers_str[key][imax]
                 # Remove leading zeros

setup.py

@@ -2,12 +2,12 @@
 setup(
   name = 'lsdeflate',
   packages = ['lsdeflate'], # this must be the same as the name above
-  version = '0.2',
+  version = '0.3',
   description = 'Compress ls output by gathering numeric ranges into brace expansions',
   author = 'Daan van Vugt',
   author_email = '[email protected]',
   url = 'https://github.com/exteris/mypackage', # use the URL to the github repo
-  download_url = 'https://github.com/exteris/lsdeflate/archive/0.2.tar.gz', # I'll explain this in a second
+  download_url = 'https://github.com/exteris/lsdeflate/archive/0.3.tar.gz', # I'll explain this in a second
   keywords = ['unix', 'ls', 'directory', 'clean'], # arbitrary keywords
   classifiers = [],
   scripts=['bin/lsdeflate'],

tests/test_rangefinder.py

@@ -8,11 +8,10 @@ class RangeCases(unittest.TestCase):
   # for python range function we need to go until step+1
   cases = ([],# empty
            [(1,1,1)],# only [1]
-           [(1,2,1)],# [1 2]
-           [(1,3,2)],
+           [(1,1,1),(2,2,1)],# [1 2]
+           [(1,1,1),(3,3,1)],# [1 3]
            [(2,4,1)],
            [(1,1,1),(2,6,2)],
-           [(1,2,1),(4,5,1),(8,9,1)],
            [(1,8,1),(10,12,1),(14,16,1)],
            )
 
@@ -22,7 +21,7 @@ def test_list_to_ranges(self):
       lst = sorted(sum(
           map(lambda c: list(range(c[0],c[1]+1,c[2])), case), []))
       # sum concatenates lists (because + operator does that)
-      result = lsdeflate.list_to_ranges(lst)
+      result = sorted(lsdeflate.list_to_ranges(lst), key=lambda x: x[0])
       self.assertEqual(case, result, "list="+repr(lst))
 
 if __name__ == '__main__':