Merge pull request #13 from matan1008/bugfix/ls/fix-version-compare

filevercmp: Fix 0 padded versions compare
matan1008 · Apr 22, 2023 · 9910513 · 9910513
2 parents 39b7c9a + 04689f8
commit 9910513
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/pygnuutils/filevercmp.py b/pygnuutils/filevercmp.py
@@ -61,8 +61,8 @@ def verrevcmp(s1: str, s2: str):
                 return s1_c - s2_c
             s1 = s1[1:]
             s2 = s2[1:]
-        s1.lstrip('0')
-        s2.lstrip('0')
+        s1 = s1.lstrip('0')
+        s2 = s2.lstrip('0')
         while (s1 and s1[0].isdigit()) and (s2 and s2[0].isdigit()):
             if not first_diff:
                 first_diff = ord(s1[0]) - ord(s2[0])

diff --git a/tests/test_filevercmp.py b/tests/test_filevercmp.py
@@ -1,3 +1,5 @@
+from functools import cmp_to_key
+
 from pygnuutils.filevercmp import filevercmp
 
 examples = [
@@ -79,3 +81,16 @@ def test_filevercmp():
                 assert i > j
             else:
                 assert i == j
+
+
+example_with_zeros = [
+    '.', '..', '.001', '.01', '.1', '..001', '..01', '..1', '...', '...001', '...01', '...1', '0', '1~~', '1~', '1',
+    '1.~~', '1.~', '1.', '1.0~', '1.0', '1.1~~', '1.1~', '1.01', '1.1', '1.1a', '1.1b', '1.1pre1', '1.1rc1', '1.1rc2',
+    '1.1-rc1', '1.1-rc2', '1.01.01', '1.01.1', '1.1.01', '1.1.1', '1.1/', '1/', 'a', 'aa', 'aaa', 'aab', 'ab', 'abb',
+    'b'
+]
+
+
+def test_filevercmp_with_zeros():
+    expected = sorted(example_with_zeros, key=cmp_to_key(lambda file1, file2: filevercmp(file1, file2)))
+    assert expected == example_with_zeros