From afdb9d9386e3b030a78dbaf94e5550538722e3d6 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Fri, 27 Jan 2023 17:36:23 -0500
Subject: [PATCH] Use ignored_names as class variable in helpers

---
 app/classes/shared/helpers.py   | 17 +++++++----------
 app/classes/web/file_handler.py |  4 ++--
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/app/classes/shared/helpers.py b/app/classes/shared/helpers.py
index 01712fbb..432276a0 100644
--- a/app/classes/shared/helpers.py
+++ b/app/classes/shared/helpers.py
@@ -78,6 +78,7 @@ class Helpers:
         self.websocket_helper = WebSocketHelper(self)
         self.translation = Translation(self)
         self.update_available = False
+        self.ignored_names = ["crafty_managed.txt", "db_stats"]
 
     @staticmethod
     def auto_installer_fix(ex):
@@ -947,8 +948,7 @@ class Helpers:
 
         return data
 
-    @staticmethod
-    def generate_tree(folder, output=""):
+    def generate_tree(self, folder, output=""):
         dir_list = []
         unsorted_files = []
         file_list = os.listdir(folder)
@@ -960,13 +960,12 @@ class Helpers:
         file_list = sorted(dir_list, key=str.casefold) + sorted(
             unsorted_files, key=str.casefold
         )
-        ignored_names = ["crafty_managed.txt", "db_stats"]
         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):
-                if filename not in ignored_names:
+                if filename not in self.ignored_names:
                     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">
                         <span id="{dpath}span" class="files-tree-title" data-path="{dpath}" data-name="{filename}" onclick="getDirView(event)">
@@ -977,7 +976,7 @@ class Helpers:
                         </div><li>
                         \n"""
             else:
-                if filename not in ignored_names:
+                if filename not in self.ignored_names:
                     output += f"""<li
                     class="d-block tree-ctx-item tree-file tree-item"
                     data-path="{dpath}"
@@ -986,8 +985,7 @@ class Helpers:
                     <i class="far fa-file"></i></span>{filename}</li>"""
         return output
 
-    @staticmethod
-    def generate_dir(folder, output=""):
+    def generate_dir(self, folder, output=""):
 
         dir_list = []
         unsorted_files = []
@@ -1000,14 +998,13 @@ class Helpers:
         file_list = sorted(dir_list, key=str.casefold) + sorted(
             unsorted_files, key=str.casefold
         )
-        ignored_names = ["crafty_managed.txt", "db_stats"]
         output += f"""<ul class="tree-nested d-block" id="{folder}ul">"""
         for raw_filename in file_list:
             filename = html.escape(raw_filename)
             dpath = os.path.join(folder, filename)
             rel = os.path.join(folder, raw_filename)
             if os.path.isdir(rel):
-                if filename not in ignored_names:
+                if filename not in self.ignored_names:
                     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">
                         <span id="{dpath}span" class="files-tree-title" data-path="{dpath}" data-name="{filename}" onclick="getDirView(event)">
@@ -1017,7 +1014,7 @@ class Helpers:
                         </span>
                         </div><li>"""
             else:
-                if filename not in ignored_names:
+                if filename not in self.ignored_names:
                     output += f"""<li
                     class="d-block tree-ctx-item tree-file tree-item"
                     data-path="{dpath}"
diff --git a/app/classes/web/file_handler.py b/app/classes/web/file_handler.py
index e1131c3c..5cf4df9e 100644
--- a/app/classes/web/file_handler.py
+++ b/app/classes/web/file_handler.py
@@ -100,7 +100,7 @@ class FileHandler(BaseHandler):
                 self.write(
                     Helpers.get_os_understandable_path(path)
                     + "\n"
-                    + Helpers.generate_tree(path)
+                    + self.helper.generate_tree(path)
                 )
             self.finish()
 
@@ -121,7 +121,7 @@ class FileHandler(BaseHandler):
                 self.write(
                     Helpers.get_os_understandable_path(path)
                     + "\n"
-                    + Helpers.generate_dir(path)
+                    + self.helper.generate_dir(path)
                 )
             self.finish()