Adding to the previous commit, performed minor changes according to suggestions from a code review.

Author: atollk

fs/_ftp_parse.py

@@ -145,11 +145,11 @@ def decode_linux(line, match):
     return raw_info
 
 
-def _decode_windowsnt_time(date, time):
-    while len(time.split(":")[0]) < 2:
-        time = "0" + time
+def _decode_windowsnt_time(mdate, mtime):
+    if len(mtime.split(":")[0]) == 1:
+        mtime = "0" + mtime
     return _parse_time(
-        date + " " + time, formats=["%d-%m-%y %I:%M%p", "%d-%m-%y %H:%M"]
+        mdate + " " + mtime, formats=["%d-%m-%y %I:%M%p", "%d-%m-%y %H:%M"]
     )
 
 

tests/test_ftp_parse.py

@@ -173,6 +173,9 @@ def test_decode_windowsnt(self, mock_localtime):
 05-11-20   22:11  <DIR>       src
 11-02-17   01:23       1      12
 11-02-17    4:54                 0 icon.bmp
+11-02-17    4:54AM                 0 icon.gif
+11-02-17    4:54PM                 0 icon.png
+11-02-17    16:54                 0 icon.jpg
 """
         expected = [
             {
@@ -210,6 +213,21 @@ def test_decode_windowsnt(self, mock_localtime):
                 "details": {"modified": 1486788840.0, "size": 0, "type": 2},
                 "ftp": {"ls": "11-02-17    4:54                 0 icon.bmp"},
             },
+            {
+                "basic": {"is_dir": False, "name": "icon.gif"},
+                "details": {"modified": 1486788840.0, "size": 0, "type": 2},
+                "ftp": {"ls": "11-02-17    4:54AM                 0 icon.gif"},
+            },
+            {
+                "basic": {"is_dir": False, "name": "icon.png"},
+                "details": {"modified": 1486832040.0, "size": 0, "type": 2},
+                "ftp": {"ls": "11-02-17    4:54PM                 0 icon.png"},
+            },
+            {
+                "basic": {"is_dir": False, "name": "icon.jpg"},
+                "details": {"modified": 1486832040.0, "size": 0, "type": 2},
+                "ftp": {"ls": "11-02-17    16:54                 0 icon.jpg"},
+            },
         ]
 
         parsed = ftp_parse.parse(directory.splitlines())