From 008b7f4ade5ee48dd5506cf973a4dfb3a8019cad Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Sun, 27 Feb 2022 19:29:30 -0500
Subject: [PATCH] Run file tree serving thorugh ajax handler alone

---
 app/classes/models/management.py |   5 +-
 app/classes/shared/helpers.py    |  66 -----------------
 app/classes/web/ajax_handler.py  | 117 +++++++++++++++++++++++++++++--
 3 files changed, 115 insertions(+), 73 deletions(-)

diff --git a/app/classes/models/management.py b/app/classes/models/management.py
index faafadfc..f57abe11 100644
--- a/app/classes/models/management.py
+++ b/app/classes/models/management.py
@@ -358,7 +358,10 @@ class helpers_management:
     @staticmethod
     def get_excluded_backup_dirs(server_id: int):
         excluded_dirs = helpers_management.get_backup_config(server_id)['excluded_dirs']
-        dir_list = excluded_dirs.split(",")
+        if excluded_dirs is not None:
+            dir_list = excluded_dirs.split(",")
+        else:
+            dir_list = []
         return dir_list
 
     @staticmethod
diff --git a/app/classes/shared/helpers.py b/app/classes/shared/helpers.py
index 7978e678..f21963d0 100644
--- a/app/classes/shared/helpers.py
+++ b/app/classes/shared/helpers.py
@@ -737,72 +737,6 @@ class Helpers:
 
         return output
 
-    @staticmethod
-    def generate_backup_tree(folder, output=""):
-        file_list = os.listdir(folder)
-        file_list = sorted(file_list, key=str.casefold)
-        output += \
-    f"""<ul class="tree-nested d-block" id="{folder}ul">"""\
-
-        for raw_filename in file_list:
-            filename = html.escape(raw_filename)
-            rel = os.path.join(folder, raw_filename)
-            dpath = os.path.join(folder, filename)
-            if os.path.isdir(rel):
-                output += \
-                    f"""<li class="tree-item" data-path="{dpath}">
-                    \n<div id="{dpath}" data-path="{dpath}" data-name="{filename}" class="tree-caret tree-ctx-item tree-folder">
-                    <input type="checkbox" name="root_path" value="{dpath}">
-                    <span id="{dpath}span" class="files-tree-title" data-path="{dpath}" data-name="{filename}" onclick="getDirView(event)">
-                      <i class="far fa-folder"></i>
-                      <i class="far fa-folder-open"></i>
-                      <strong>{filename}</strong>
-                      </span>
-                    </input></div><li>
-                    \n"""\
-
-            else:
-                output += f"""<li
-                class="tree-item tree-ctx-item tree-file"
-                data-path="{dpath}"
-                data-name="{filename}"
-                onclick=""><input type='checkbox' name='root_path' value='{dpath}'><span style="margin-right: 6px;"><i class="far fa-file"></i></span></input>{filename}</li>"""
-
-        return output
-
-    @staticmethod
-    def generate_backup_dir(folder, output=""):
-        file_list = os.listdir(folder)
-        file_list = sorted(file_list, key=str.casefold)
-        output += \
-    f"""<ul class="tree-nested d-block" id="{folder}ul">"""\
-
-        for raw_filename in file_list:
-            filename = html.escape(raw_filename)
-            rel = os.path.join(folder, raw_filename)
-            dpath = os.path.join(folder, filename)
-            if os.path.isdir(rel):
-                output += \
-                    f"""<li class="tree-item" data-path="{dpath}">
-                    \n<div id="{dpath}" data-path="{dpath}" data-name="{filename}" class="tree-caret tree-ctx-item tree-folder">
-                    <input type="checkbox" name="root_path" value="{dpath}">
-                    <span id="{dpath}span" class="files-tree-title" data-path="{dpath}" data-name="{filename}" onclick="getDirView(event)">
-                      <i class="far fa-folder"></i>
-                      <i class="far fa-folder-open"></i>
-                      <strong>{filename}</strong>
-                      </span>
-                    </input></div><li>"""\
-
-            else:
-                output += f"""<li
-                class="tree-item tree-ctx-item tree-file"
-                data-path="{dpath}"
-                data-name="{filename}"
-                onclick=""><input type='checkbox' name='root_path' value='{dpath}'><span style="margin-right: 6px;"><i class="far fa-file"></i></span></input>{filename}</li>"""
-
-
-        return output
-
     @staticmethod
     def generate_zip_dir(folder, output=""):
         file_list = os.listdir(folder)
diff --git a/app/classes/web/ajax_handler.py b/app/classes/web/ajax_handler.py
index 72f6ca08..b5be9826 100644
--- a/app/classes/web/ajax_handler.py
+++ b/app/classes/web/ajax_handler.py
@@ -148,18 +148,123 @@ class AjaxHandler(BaseHandler):
 
         elif page == "get_backup_tree":
             server_id = self.get_argument('id', None)
-            path = self.get_argument('path', None)
+            folder = self.get_argument('path', None)
 
-            self.write(helper.get_os_understandable_path(path) + '\n' +
-                        helper.generate_backup_tree(path, server_id))
+            output = ""
+
+            file_list = os.listdir(folder)
+            file_list = sorted(file_list, key=str.casefold)
+            output += \
+        f"""<ul class="tree-nested d-block" id="{folder}ul">"""\
+
+            for raw_filename in file_list:
+                filename = html.escape(raw_filename)
+                rel = os.path.join(folder, raw_filename)
+                dpath = os.path.join(folder, filename)
+                if str(dpath) in self.controller.management.get_excluded_backup_dirs(server_id):
+                    if os.path.isdir(rel):
+                        output += \
+                            f"""<li class="tree-item" data-path="{dpath}">
+                            \n<div id="{dpath}" data-path="{dpath}" data-name="{filename}" class="tree-caret tree-ctx-item tree-folder">
+                            <input type="checkbox" name="root_path" value="{dpath}" checked>
+                            <span id="{dpath}span" class="files-tree-title" data-path="{dpath}" data-name="{filename}" onclick="getDirView(event)">
+                            <i class="far fa-folder"></i>
+                            <i class="far fa-folder-open"></i>
+                            <strong>{filename}</strong>
+                            </span>
+                            </input></div><li>
+                            \n"""\
+
+                    else:
+                        output += f"""<li
+                        class="tree-item tree-ctx-item tree-file"
+                        data-path="{dpath}"
+                        data-name="{filename}"
+                        onclick=""><input type='checkbox' name='root_path' value='{dpath}' checked><span style="margin-right: 6px;">
+                        <i class="far fa-file"></i></span></input>{filename}</li>"""
+
+                else:
+                    if os.path.isdir(rel):
+                        output += \
+                            f"""<li class="tree-item" data-path="{dpath}">
+                            \n<div id="{dpath}" data-path="{dpath}" data-name="{filename}" class="tree-caret tree-ctx-item tree-folder">
+                            <input type="checkbox" name="root_path" value="{dpath}">
+                            <span id="{dpath}span" class="files-tree-title" data-path="{dpath}" data-name="{filename}" onclick="getDirView(event)">
+                            <i class="far fa-folder"></i>
+                            <i class="far fa-folder-open"></i>
+                            <strong>{filename}</strong>
+                            </span>
+                            </input></div><li>
+                            \n"""\
+
+                    else:
+                        output += f"""<li
+                        class="tree-item tree-ctx-item tree-file"
+                        data-path="{dpath}"
+                        data-name="{filename}"
+                        onclick=""><input type='checkbox' name='root_path' value='{dpath}'>
+                        <span style="margin-right: 6px;"><i class="far fa-file"></i></span></input>{filename}</li>"""
+            self.write(helper.get_os_understandable_path(folder) + '\n' +
+                        output)
             self.finish()
 
         elif page == "get_backup_dir":
             server_id = self.get_argument('id', None)
-            path = self.get_argument('path', None)
+            folder = self.get_argument('path', None)
+            output = ""
 
-            self.write(helper.get_os_understandable_path(path) + '\n' +
-                        helper.generate_backup_dir(path, server_id))
+            file_list = os.listdir(folder)
+            file_list = sorted(file_list, key=str.casefold)
+            output += \
+        f"""<ul class="tree-nested d-block" id="{folder}ul">"""\
+
+            for raw_filename in file_list:
+                filename = html.escape(raw_filename)
+                rel = os.path.join(folder, raw_filename)
+                dpath = os.path.join(folder, filename)
+                if str(dpath) in self.controller.management.get_excluded_backup_dirs(server_id):
+                    if os.path.isdir(rel):
+                        output += \
+                            f"""<li class="tree-item" data-path="{dpath}">
+                            \n<div id="{dpath}" data-path="{dpath}" data-name="{filename}" class="tree-caret tree-ctx-item tree-folder">
+                            <input type="checkbox" name="root_path" value="{dpath}">
+                            <span id="{dpath}span" class="files-tree-title" data-path="{dpath}" data-name="{filename}" onclick="getDirView(event)">
+                            <i class="far fa-folder"></i>
+                            <i class="far fa-folder-open"></i>
+                            <strong>{filename}</strong>
+                            </span>
+                            </input></div><li>"""\
+
+                    else:
+                        output += f"""<li
+                        class="tree-item tree-ctx-item tree-file"
+                        data-path="{dpath}"
+                        data-name="{filename}"
+                        onclick=""><input type='checkbox' name='root_path' value='{dpath}'><span style="margin-right: 6px;">
+                        <i class="far fa-file"></i></span></input>{filename}</li>"""
+
+                else:
+                    if os.path.isdir(rel):
+                        output += \
+                            f"""<li class="tree-item" data-path="{dpath}">
+                            \n<div id="{dpath}" data-path="{dpath}" data-name="{filename}" class="tree-caret tree-ctx-item tree-folder">
+                            <input type="checkbox" name="root_path" value="{dpath}">
+                            <span id="{dpath}span" class="files-tree-title" data-path="{dpath}" data-name="{filename}" onclick="getDirView(event)">
+                            <i class="far fa-folder"></i>
+                            <i class="far fa-folder-open"></i>
+                            <strong>{filename}</strong>
+                            </span>
+                            </input></div><li>"""\
+
+                    else:
+                        output += f"""<li
+                        class="tree-item tree-ctx-item tree-file"
+                        data-path="{dpath}"
+                        data-name="{filename}"
+                        onclick=""><input type='checkbox' name='root_path' value='{dpath}'><span style="margin-right: 6px;"><i class="far fa-file"></i></span></input>{filename}</li>"""
+
+            self.write(helper.get_os_understandable_path(folder) + '\n' +
+                        output)
             self.finish()
 
         elif page == "get_dir":