show subdirectories in screenshot

Author: FoamyGuy

create_requirement_images.py

@@ -86,6 +86,7 @@ def generate_requirement_image(
 ):  # pylint: disable=too-many-statements
     """Generate a single requirement image"""
 
+
     def make_line(
         requirement_name, position=(0, 0), icon=None, hidden=False, triangle_icon=None
     ):  # pylint: disable=too-many-branches
@@ -192,14 +193,16 @@ def make_header(position, project_files):
         # dynamic files from project dir in learn guide repo
         rows_added = 0
         project_files_to_draw = []
-        project_folders_to_draw = []
+        project_folders_to_draw = {}
         for cur_file in project_files:
-            if "." in cur_file[-5:]:
-                cur_extension = cur_file.split(".")[-1]
-                if cur_extension in SHOWN_FILETYPES:
-                    project_files_to_draw.append(cur_file)
-            else:
-                project_folders_to_draw.append(cur_file)
+            if type(cur_file) == str:
+                if "." in cur_file[-5:]:
+                    cur_extension = cur_file.split(".")[-1]
+                    if cur_extension in SHOWN_FILETYPES:
+                        project_files_to_draw.append(cur_file)
+
+            elif type(cur_file) == tuple:
+                project_folders_to_draw[cur_file[0]] = cur_file[1]
 
         for i, file in enumerate(sorted(project_files_to_draw)):
             cur_file_extension = file.split(".")[-1]
@@ -212,16 +215,41 @@ def make_header(position, project_files):
             )
             rows_added += 1
 
-        for i, file in enumerate(sorted(project_folders_to_draw)):
+        extra_rows = 0
+        for i, file in enumerate(sorted(project_folders_to_draw.keys())):
             make_line(
                 file,
                 (
                     position[0] + INDENT_SIZE * 2,
-                    position[1] + (LINE_SPACING * (6 + i + len(project_files_to_draw))),
+                    position[1] + (LINE_SPACING * (6 + i + len(project_files_to_draw) + extra_rows)),
                 ),
-                triangle_icon=right_triangle,
+                triangle_icon=down_triangle,
             )
             rows_added += 1
+            if file == "midi":
+                #print(project_folders_to_draw)
+                pass
+            extra_sub_file_space = 0
+            for j, sub_file in enumerate(sorted(project_folders_to_draw[file])):
+                extra_rows += 1
+                cur_file_extension = sub_file.split(".")[-1]
+                cur_file_icon = FILE_TYPE_ICON_MAP.get(cur_file_extension, folder_icon)
+                triangle_icon = None
+                if cur_file_icon == folder_icon:
+                    triangle_icon = right_triangle
+                make_line(
+                    sub_file,
+                    (
+                        position[0] + INDENT_SIZE *3,
+                        #position[1] + (LINE_SPACING * (6 + i + j + 1 + extra_sub_file_space
+                        #                               + len(project_files_to_draw))),
+                        position[1] + (LINE_SPACING * (6 + rows_added)),
+                    ),
+                    triangle_icon=triangle_icon,
+                    icon=cur_file_icon
+                )
+                rows_added += 1
+            extra_sub_file_space = extra_rows
 
         make_line(
             "lib",
@@ -281,6 +309,16 @@ def sort_libraries(libraries):
         package_list, file_list = get_dependencies(libraries)
         return sorted(package_list) + sorted(file_list)
 
+    def count_files(files_list):
+        _count = 0
+        for _file in files_list:
+            if type(_file) == str:
+                _count += 1
+            elif type(_file) == tuple:
+                _count += 1
+                _count += len(_file[1])
+        return _count
+
     def make_libraries(libraries, position):
 
         for i, lib_name in enumerate(libraries):
@@ -301,7 +339,7 @@ def make_libraries(libraries, position):
     if "main.py" in project_files:
         project_files.remove("main.py")
 
-    project_files_count = len(project_files)
+    project_files_count = count_files(project_files)
 
     image_height = (
         PADDING * 2

get_imports.py

@@ -111,15 +111,41 @@ def get_files_for_project(project_name):
     """Get the set of files for a learn project"""
     found_files = set()
     project_dir = "{}/{}/".format(LEARN_GUIDE_REPO, project_name)
-    for file in os.listdir(project_dir):
+    # root level
+    full_tree = os.walk(project_dir)
+
+    root_level = next(full_tree)
+    if project_name == "NeoTrellis_M4_MIDI_Synth":
+        print(root_level)
+
+    for file in root_level[2]:
         if "." in file:
             cur_extension = file.split(".")[-1]
             if cur_extension in SHOWN_FILETYPES:
                 # print(file)
                 found_files.add(file)
-        else:
-            # add dir
-            found_files.add(file)
+
+    for _dir in root_level[1]:
+        if project_name == "NeoTrellis_M4_MIDI_Synth":
+            print(_dir)
+        # TODO: second item needs to be a tuple
+        dir_tuple = (_dir, tuple())
+        for cur_tuple in os.walk(project_dir):
+            if project_name == "NeoTrellis_M4_MIDI_Synth":
+                print(cur_tuple)
+                #print("{} - {}".format(cur_tuple[0].split("/")[-1], _dir))
+                #print(cur_tuple)
+            if cur_tuple[0].split("/")[-1] == _dir:
+                # TODO: can't use add or append to add to a tuple
+                # TODO: need to use + to make new tuple or * unpacking
+                # https://stackoverflow.com/questions/16730339/python-add-item-to-the-tuple
+                for _sub_dir in cur_tuple[1]:
+                    dir_tuple = (dir_tuple[0], dir_tuple[1] + (_sub_dir,))
+                for _sub_file in cur_tuple[2]:
+                    dir_tuple = (dir_tuple[0], dir_tuple[1] + (_sub_file,))
+
+        # e.g. ("dir_name", ("file_1.txt", "file_2.txt"))
+        found_files.add(dir_tuple)
     return found_files