Merge pull request #67 from kellyjonbrazil/Dev

Dev v1.11.4

changelog.txt

@@ -1,5 +1,8 @@
 jc changelog
 
+20200610 v1.11.4
+- Update ls parser to fix error on parsing an empty directory
+
 20200609 v1.11.3
 - Add local parser plugin feature (contributed by Dean Serenevy)
 

jc/cli.py

@@ -21,7 +21,7 @@ import jc.appdirs as appdirs
 
 
 class info():
-    version = '1.11.3'
+    version = '1.11.4'
     description = 'jc cli output JSON conversion tool'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'

jc/parsers/ls.py

@@ -149,7 +149,7 @@ import jc.utils
 
 
 class info():
-    version = '1.4'
+    version = '1.5'
     description = 'ls command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -226,8 +226,8 @@ def parse(data, raw=False, quiet=False):
 
     linedata = data.splitlines()
 
-    # Delete first line if it starts with 'total 1234'
     if linedata:
+        # Delete first line if it starts with 'total 1234'
         if re.match(r'total [0-9]+', linedata[0]):
             linedata.pop(0)
 
@@ -239,7 +239,6 @@ def parse(data, raw=False, quiet=False):
             if re.match(r'total [0-9]+', linedata[0]):
                 linedata.pop(0)
 
-    if linedata:
         # Check if -l was used to parse extra data
         if re.match(r'[-dclpsbDCMnP?]([-r][-w][-xsS]){2}([-r][-w][-xtT])[+]?', linedata[0]):
             for entry in linedata:

setup.py

@@ -5,7 +5,7 @@ with open('README.md', 'r') as f:
 
 setuptools.setup(
     name='jc',
-    version='1.11.3',
+    version='1.11.4',
     author='Kelly Brazil',
     author_email='kellyjonbrazil@gmail.com',
     description='Converts the output of popular command-line tools and file-types to JSON.',

tests/test_ls.py

@@ -215,6 +215,12 @@ class MyTests(unittest.TestCase):
         with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/osx-10.14.6/ls-lR-empty-folder.json'), 'r', encoding='utf-8') as f:
             self.osx_10_14_6_ls_lR_empty_folder_json = json.loads(f.read())
 
+    def test_ls_empty_dir(self):
+        """
+        Test plain 'ls' on an empty directory
+        """
+        self.assertEqual(jc.parsers.ls.parse('', quiet=True), [])
+
     def test_ls_centos_7_7(self):
         """
         Test plain 'ls /' on Centos 7.7