Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use ignored_names as class variable in helpers

Browse Source
This commit is contained in:
amcmanu3 2023-01-27 17:36:23 -05:00
parent 67970557e5
commit afdb9d9386
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/classes/shared/helpers.py
View File

@ -78,6 +78,7 @@ class Helpers:
self.websocket_helper = WebSocketHelper(self) self.websocket_helper = WebSocketHelper(self)
self.translation = Translation(self) self.translation = Translation(self)
self.update_available = False self.update_available = False
self.ignored_names = ["crafty_managed.txt", "db_stats"]
@staticmethod @staticmethod
def auto_installer_fix(ex): def auto_installer_fix(ex):
@ -947,8 +948,7 @@ class Helpers:
return data return data
@staticmethod def generate_tree(self, folder, output=""):
def generate_tree(folder, output=""):
dir_list = [] dir_list = []
unsorted_files = [] unsorted_files = []
file_list = os.listdir(folder) file_list = os.listdir(folder)
@ -960,13 +960,12 @@ class Helpers:
file_list = sorted(dir_list, key=str.casefold) + sorted( file_list = sorted(dir_list, key=str.casefold) + sorted(
unsorted_files, key=str.casefold unsorted_files, key=str.casefold
) )
ignored_names = ["crafty_managed.txt", "db_stats"]
for raw_filename in file_list: for raw_filename in file_list:
filename = html.escape(raw_filename) filename = html.escape(raw_filename)
rel = os.path.join(folder, raw_filename) rel = os.path.join(folder, raw_filename)
dpath = os.path.join(folder, filename) dpath = os.path.join(folder, filename)
if os.path.isdir(rel): 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}"> 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"> \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)"> <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> </div><li>
\n""" \n"""
else: else:
if filename not in ignored_names: if filename not in self.ignored_names:
output += f"""<li output += f"""<li
class="d-block tree-ctx-item tree-file tree-item" class="d-block tree-ctx-item tree-file tree-item"
data-path="{dpath}" data-path="{dpath}"
@ -986,8 +985,7 @@ class Helpers:
<i class="far fa-file"></i></span>{filename}</li>""" <i class="far fa-file"></i></span>{filename}</li>"""
return output return output
@staticmethod def generate_dir(self, folder, output=""):
def generate_dir(folder, output=""):
dir_list = [] dir_list = []
unsorted_files = [] unsorted_files = []
@ -1000,14 +998,13 @@ class Helpers:
file_list = sorted(dir_list, key=str.casefold) + sorted( file_list = sorted(dir_list, key=str.casefold) + sorted(
unsorted_files, key=str.casefold unsorted_files, key=str.casefold
) )
ignored_names = ["crafty_managed.txt", "db_stats"]
output += f"""<ul class="tree-nested d-block" id="{folder}ul">""" output += f"""<ul class="tree-nested d-block" id="{folder}ul">"""
for raw_filename in file_list: for raw_filename in file_list:
filename = html.escape(raw_filename) filename = html.escape(raw_filename)
dpath = os.path.join(folder, filename) dpath = os.path.join(folder, filename)
rel = os.path.join(folder, raw_filename) rel = os.path.join(folder, raw_filename)
if os.path.isdir(rel): 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}"> 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"> \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)"> <span id="{dpath}span" class="files-tree-title" data-path="{dpath}" data-name="{filename}" onclick="getDirView(event)">
@ -1017,7 +1014,7 @@ class Helpers:
</span> </span>
</div><li>""" </div><li>"""
else: else:
if filename not in ignored_names: if filename not in self.ignored_names:
output += f"""<li output += f"""<li
class="d-block tree-ctx-item tree-file tree-item" class="d-block tree-ctx-item tree-file tree-item"
data-path="{dpath}" data-path="{dpath}"

4
app/classes/web/file_handler.py
View File

@ -100,7 +100,7 @@ class FileHandler(BaseHandler):
self.write( self.write(
Helpers.get_os_understandable_path(path) Helpers.get_os_understandable_path(path)
+ "\n" + "\n"
+ Helpers.generate_tree(path) + self.helper.generate_tree(path)
) )
self.finish() self.finish()
@ -121,7 +121,7 @@ class FileHandler(BaseHandler):
self.write( self.write(
Helpers.get_os_understandable_path(path) Helpers.get_os_understandable_path(path)
+ "\n" + "\n"
+ Helpers.generate_dir(path) + self.helper.generate_dir(path)
) )
self.finish() self.finish()