From 4031b74e00a350db7c1c71f64736631b881af7b0 Mon Sep 17 00:00:00 2001 From: Andrew Date: Mon, 9 Jan 2023 16:34:12 -0500 Subject: [PATCH 1/3] Hide server stats db from users --- app/classes/shared/helpers.py | 42 +++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/app/classes/shared/helpers.py b/app/classes/shared/helpers.py index c5238ae8..01712fbb 100644 --- a/app/classes/shared/helpers.py +++ b/app/classes/shared/helpers.py @@ -960,22 +960,24 @@ 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): - output += f"""
  • - \n
    - - - - {filename} - -
  • - \n""" + if filename not in ignored_names: + output += f"""
  • + \n
    + + + + {filename} + +
  • + \n""" else: - if filename != "crafty_managed.txt": + if filename not in ignored_names: output += f"""
  • """ 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): - output += f"""
  • - \n
    - - - - {filename} - -
  • """ + if filename not in ignored_names: + output += f"""
  • + \n
    + + + + {filename} + +
  • """ else: - if filename != "crafty_managed.txt": + if filename not in ignored_names: output += f"""
  • Date: Fri, 27 Jan 2023 18:22:32 +0000 Subject: [PATCH 2/3] Update changelog !530 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d7130183..47afae18 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ TBD ### Bug fixes - Fix local java server imports. ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/529)) ### Tweaks -TBD +- Hide stats DB directory from files tree. ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/530)) ### Lang TBD

    From afdb9d9386e3b030a78dbaf94e5550538722e3d6 Mon Sep 17 00:00:00 2001 From: amcmanu3 Date: Fri, 27 Jan 2023 17:36:23 -0500 Subject: [PATCH 3/3] 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"""
  • \n
    @@ -977,7 +976,7 @@ class Helpers:
  • \n""" else: - if filename not in ignored_names: + if filename not in self.ignored_names: output += f"""
  • {filename}
    • """ 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"""