fix for ftp dir listing (#208)

Author: willmcgugan

CHANGELOG.md

@@ -6,7 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [2.0.27] - Unreleased
 
-### Fixed for Winows paths #152
+### Fixed
+
+- Fixed for Winows paths #152
+- Fixed ftp dir parsing (@dhirschfeld)
 
 ## [2.0.26] - 2018-07-26
 

fs/ftpfs.py

@@ -542,14 +542,17 @@ def _parse_mlsx(cls, lines):
             name, facts = cls._parse_facts(line.strip())
             if name is None:
                 continue
-            is_dir = facts.get("type", None) in ("dir", "cdir", "pdir")
+            _type = facts.get("type", "file")
+            if _type not in {"dir", "file"}:
+                continue
+            is_dir = _type == "dir"
             raw_info = {}  # type: Dict[Text, Dict[Text, object]]
 
             raw_info["basic"] = {"name": name, "is_dir": is_dir}
             raw_info["ftp"] = facts  # type: ignore
             raw_info["details"] = {
                 "type": (
-                    int(ResourceType.directory) if is_dir else int(ResourceType.file)
+                    int(ResourceType.directory if is_dir else ResourceType.file)
                 )
             }
 

tests/test_ftpfs.py

@@ -49,6 +49,38 @@ def test_parse_mlsx(self):
         info = list(FTPFS._parse_mlsx(["foo=bar; .."]))
         self.assertEqual(info, [])
 
+    def test_parse_mlsx_type(self):
+        lines = [
+            "Type=cdir;Modify=20180731114724;UNIX.mode=0755; /tmp",
+            "Type=pdir;Modify=20180731112024;UNIX.mode=0775; /",
+            "Type=file;Size=331523;Modify=20180731112041;UNIX.mode=0644; a.csv",
+            "Type=file;Size=368340;Modify=20180731112041;UNIX.mode=0644; b.csv",
+        ]
+        expected = [
+            {
+                "basic": {"name": "a.csv", "is_dir": False},
+                "ftp": {
+                    "type": "file",
+                    "size": "331523",
+                    "modify": "20180731112041",
+                    "unix.mode": "0644",
+                },
+                "details": {"type": 2, "size": 331523, "modified": 1533036041},
+            },
+            {
+                "basic": {"name": "b.csv", "is_dir": False},
+                "ftp": {
+                    "type": "file",
+                    "size": "368340",
+                    "modify": "20180731112041",
+                    "unix.mode": "0644",
+                },
+                "details": {"type": 2, "size": 368340, "modified": 1533036041},
+            },
+        ]
+        info = list(FTPFS._parse_mlsx(lines))
+        self.assertEqual(info, expected)
+
     def test_opener(self):
         ftp_fs = open_fs("ftp://will:[email protected]")
         self.assertIsInstance(ftp_fs, FTPFS)