impl: Make get_tree() a static method & return DocumentTree

src/__init__.py

@@ -30,9 +30,8 @@ def index(path):
     internal_path = os.path.join(data_path, path + '.md')
     path = '/' + path
 
-    document_tree = files.get_tree(data_path)
+    document_tree = files.DocumentTree.get_tree(data_path)
-    for entry in document_tree:
+    document_tree.print_tree()
-        entry.print_tree()
 
     # Checks ###################################################
 

src/files.py

@@ -1,4 +1,5 @@
 import os
+import posixpath
 from typing import Self
 
 
@@ -13,27 +14,28 @@ class DocumentTree():
         for child in self.children:
             child.print_tree(level + 1)
 
+    @staticmethod
+    def get_tree(base: str, path: str = '') -> "DocumentTree":
+        print(base, path)
+        children = list()
 
-# TODO: Make this a static method or something, so we can make some sort of
+        # Split and remerge for Windows
-#       interface that calls this predefined class
+        internal_path = os.path.join(base, *path.split('/'))
-def get_tree(path: str) -> list[DocumentTree]:
-    ret = list()
 
-    _, dirs, files = next(os.walk(path))
+        if not os.path.exists(internal_path):
+            raise Exception("Tried to open a folder that doesn't exist")
+
+        _, dirs, files = next(os.walk(internal_path))
 
-    # First pass, get the whole folder structure
         for dir in dirs:
-        dir_path = os.path.join(path, dir)
+            subpath = posixpath.join(path, dir)
-
+            children.append(DocumentTree.get_tree(base, subpath))
-        ret.append(
-            DocumentTree(dir, get_tree(dir_path))
-        )
 
         # Second pass, add the files. If it's a .md file, strip the extension,
         # checking for conflicts with folders
         #
-    # TODO: Maybe this isn't the best way to define what the text of a folder
+        # TODO: Maybe this isn't the best way to define what the text of a
-    #       should be.
+        #       folder should be.
         #
         # TODO: What if there's a file obscuring a folder?
         #       Check if the superposing is a .md file, warn the user otherwise
@@ -41,7 +43,7 @@ def get_tree(path: str) -> list[DocumentTree]:
             if file.endswith('.md'):
                 file = file[:-3]
 
-        if file not in ret:
+            if file not in children:
-            ret.append(DocumentTree(file, []))
+                children.append(DocumentTree(file, []))
 
-    return ret
+        return DocumentTree(path.split('/')[-1], children)

templates/main.html

@@ -16,7 +16,7 @@
 {% block body %}
 <main>
     <nav>
-        {{ render_tree(item_list) }}
+        {{ render_tree(item_list.children) }}
     </nav>
 
     <article>