Refactored out function for getting valid filens from a folder

inclement · inclement · commit d786718733a6 · 2018-11-06T21:25:43.000Z
diff --git a/pythonforandroid/recipes/python3/__init__.py b/pythonforandroid/recipes/python3/__init__.py
@@ -2,12 +2,11 @@
 from pythonforandroid.toolchain import shprint, current_directory
 from pythonforandroid.patching import (is_darwin, is_api_gt,
                                        check_all, is_api_lt, is_ndk)
-from pythonforandroid.logger import logger, info, debug
-from pythonforandroid.util import ensure_dir
+from pythonforandroid.logger import logger, info
+from pythonforandroid.util import ensure_dir, walk_valid_filens
 from os.path import exists, join, realpath, basename
 from os import environ, listdir, walk
 import glob
-from fnmatch import fnmatch
 import sh
 
 
@@ -152,7 +151,7 @@ def create_python_bundle(self, dirn, arch):
         # zip up the standard library
         stdlib_zip = join(dirn, 'stdlib.zip')
         with current_directory(join(self.get_build_dir(arch.arch), 'Lib')):
-            stdlib_filens = self.get_stdlib_filens('.')
+            stdlib_filens = walk_valid_filens('.', STDLIB_DIR_BLACKLIST, STDLIB_FILEN_BLACKLIST)
             shprint(sh.zip, stdlib_zip, *stdlib_filens)
 
         # copy the site-packages into place
@@ -174,24 +173,5 @@ def create_python_bundle(self, dirn, arch):
         info('Renaming .so files to reflect cross-compile')
         self.reduce_object_file_names(join(dirn, 'site-packages'))
 
-    def get_stdlib_filens(self, basedir):
-        return_filens = []
-        for dirn, subdirs, filens in walk(basedir):
-            if basename(dirn) in STDLIB_DIR_BLACKLIST:
-                debug('stdlib.zip ignoring directory {}'.format(dirn))
-                while subdirs:
-                    subdirs.pop()
-                continue
-            for filen in filens:
-                for pattern in STDLIB_FILEN_BLACKLIST:
-                    if fnmatch(filen, pattern):
-                        debug('stdlib.zip ignoring file {}'.format(join(dirn, filen)))
-                        break
-                else:
-                    return_filens.append(join(dirn, filen))
-        return return_filens
-                    
-                
-
 
 recipe = Python3Recipe()
diff --git a/pythonforandroid/util.py b/pythonforandroid/util.py
@@ -1,10 +1,11 @@
 import contextlib
-from os.path import exists
-from os import getcwd, chdir, makedirs
+from os.path import exists, join
+from os import getcwd, chdir, makedirs, walk
 import io
 import json
 import shutil
 import sys
+from fnmatch import fnmatch
 from tempfile import mkdtemp
 try:
     from urllib.request import FancyURLopener
@@ -124,3 +125,33 @@ def is_exe(fpath):
                 return exe_file
 
     return None
+
+def walk_valid_filens(base_dir, invalid_dir_names, invalid_file_patterns):
+    """Recursively walks all the files and directories in ``dirn``,
+    ignoring directories that match any pattern in ``invalid_dirns``
+    and files that patch any pattern in ``invalid_filens``.
+
+    ``invalid_dirns`` and ``invalid_filens`` should both be lists of
+    strings to match. ``invalid_dir_patterns`` expects a list of
+    invalid directory names, while ``invalid_file_patterns`` expects a
+    list of glob patterns compared against the full filepath.
+
+    File and directory paths are evaluated as full paths relative to ``dirn``.
+
+    """ 
+
+    return_filens = []
+    for dirn, subdirs, filens in walk(base_dir):
+
+        # Remove invalid subdirs so that they will not be walked
+        for i in reversed(range(len(subdirs))):
+            subdir = subdirs[i]
+            if subdir in invalid_dir_names:
+                subdirs.pop(i)
+
+        for filen in filens:
+            for pattern in invalid_file_patterns:
+                if fnmatch(filen, pattern):
+                    break
+            else:
+                yield join(dirn, filen)
