Use scandir if available

Author: willmcgugan

CHANGES.txt

@@ -100,5 +100,7 @@
 
 0.5.3:
 
+    * Implemented scandir in listdir if available
+
 
 

fs/base.py

@@ -1008,14 +1008,14 @@ def listdir(path, *args, **kwargs):
                 paths = []
                 paths_append = paths.append
                 try:
-                    for filename in listdir(current_path):
+                    for filename in listdir(current_path, dirs_only=True):
                         path = pathcombine(current_path, filename)
-                        if isdir(path):
-                            if dir_wildcard(path):
-                                dirs_append(path)
-                        else:
-                            if wildcard(filename):
-                                paths_append(filename)
+                        if dir_wildcard(path):
+                            dirs_append(path)
+                    for filename in listdir(current_path, files_only=True):
+                        path = pathcombine(current_path, filename)
+                        if wildcard(filename):
+                            paths_append(filename)
                 except ResourceNotFoundError:
                     # Could happen if another thread / process deletes something whilst we are walking
                     pass

fs/osfs/__init__.py

@@ -23,6 +23,15 @@
 import io
 import shutil
 
+scandir = None
+try:
+    scandir = os.scandir
+except AttributeError:
+    try:
+        from scandir import scandir
+    except ImportError:
+        pass
+
 from fs.base import *
 from fs.path import *
 from fs.errors import *
@@ -248,9 +257,24 @@ def isfile(self, path):
     def listdir(self, path="./", wildcard=None, full=False, absolute=False, dirs_only=False, files_only=False):
         _decode_path = self._decode_path
         sys_path = self.getsyspath(path)
-        listing = os.listdir(sys_path)
-        paths = [_decode_path(p) for p in listing]
-        return self._listdir_helper(path, paths, wildcard, full, absolute, dirs_only, files_only)
+
+        if scandir is None:
+            listing = os.listdir(sys_path)
+            paths = [_decode_path(p) for p in listing]
+            return self._listdir_helper(path, paths, wildcard, full, absolute, dirs_only, files_only)
+        else:
+            if dirs_only and files_only:
+                raise ValueError("dirs_only and files_only can not both be True")
+            # Use optimized scandir if present
+            scan = scandir(sys_path)
+            if dirs_only:
+                paths = [_decode_path(dir_entry.name) for dir_entry in scan if dir_entry.is_dir()]
+            elif files_only:
+                paths = [_decode_path(dir_entry.name) for dir_entry in scan if dir_entry.is_file()]
+            else:
+                paths = [_decode_path(dir_entry.name) for dir_entry in scan]
+
+            return self._listdir_helper(path, paths, wildcard, full, absolute, False, False)
 
     @convert_os_errors
     def makedir(self, path, recursive=False, allow_recreate=False):