build.py->library: refactor file selection, so it includes subfolders

Author: sommersoft

circuitpython_build_tools/build.py

@@ -108,31 +108,56 @@ def library(library_path, output_directory, mpy_cross=None, example_bundle=False
     for filename in os.listdir(library_path):
         full_path = os.path.join(library_path, filename)
         if os.path.isdir(full_path):
-            files = os.listdir(full_path)
-            files = filter(lambda x: x.endswith(".py") or x.startswith("font5x8.bin"), files)
+            path_walk = [names for names in os.walk(full_path)]
+            #print("- '{}' walk: {}".format(filename, path_walk))
+
+            # iterate through path_walk, appending each file to
+            # 'walked_files' while retaining subdirectory structure
+            walked_files = []
+            for path in path_walk:
+                path_tail_idx = path[0].rfind("/") + 1
+                path_tail = path[0][path_tail_idx:]
+                rel_path = ""
+                # if this entry is the package top dir, keep it
+                # empty so we don't double append the dir name
+                if filename not in path_tail:
+                    rel_path = "{}/".format(path_tail)
+
+                for path_files in path[2]:
+                    walked_files.append("{}{}".format(rel_path, path_files))
+            #print(" - expanded file walk: {}".format(walked_files))
+
+            files = filter(lambda x: x.endswith(".py") or x.startswith("font5x8.bin"), walked_files)
             files = map(lambda x: os.path.join(filename, x), files)
+
             if filename.startswith("examples"):
                 example_files.extend(files)
-                #print("  - example files: {}".format(example_files))
+                #print("- example files: {}".format(example_files))
             else:
                 if pkg_folder_prefix:
                     if (not example_bundle and
                         not filename.startswith(pkg_folder_prefix)):
-                        print("skipped path: {}".format(full_path))
-                        continue
+                            #print("skipped path: {}".format(full_path))
+                            continue
                 if not example_bundle:
                     package_files.extend(files)
-                    #print("  - package files: {}".format(package_files))
+                    #print("- package files: {} | {}".format(filename, package_files))
 
         if (filename.endswith(".py") and
            filename not in IGNORE_PY and
            not example_bundle):
-            py_files.append(filename)
+                py_files.append(filename)
 
     if len(py_files) > 1:
         raise ValueError("Multiple top level py files not allowed. Please put them in a package "
                          "or combine them into a single file.")
 
+    for fn in example_files:
+        base_dir = os.path.join(output_directory.replace("/lib", "/"), os.path.dirname(fn))
+        if not os.path.isdir(base_dir):
+            os.makedirs(base_dir)
+            total_size += 512
+
     for fn in package_files:
         base_dir = os.path.join(output_directory, os.path.dirname(fn))
         if not os.path.isdir(base_dir):