From 984f4cc4d6efc1089d904de2b8602de0b157a338 Mon Sep 17 00:00:00 2001 From: Andrew Date: Sun, 15 May 2022 12:38:48 -0500 Subject: [PATCH 1/5] Change Files Aesthetic --- app/classes/shared/helpers.py | 20 +++++++++---------- app/classes/web/ajax_handler.py | 12 +++++------ .../templates/panel/server_files.html | 19 +++++++++++++----- 3 files changed, 30 insertions(+), 21 deletions(-) diff --git a/app/classes/shared/helpers.py b/app/classes/shared/helpers.py index 9e0ab392..ed97507d 100644 --- a/app/classes/shared/helpers.py +++ b/app/classes/shared/helpers.py @@ -826,8 +826,8 @@ class Helpers: output += f"""
  • \n
    - - + + {filename}
  • @@ -835,7 +835,7 @@ class Helpers: else: if filename != "crafty_managed.txt": output += f"""
  • @@ -864,15 +864,15 @@ class Helpers: output += f"""
  • \n
    - - + + {filename}
  • """ else: if filename != "crafty_managed.txt": output += f"""
  • @@ -894,8 +894,8 @@ class Helpers: \n
    - - + + {filename}
  • @@ -916,8 +916,8 @@ class Helpers: \n
    - - + + {filename}
  • """ diff --git a/app/classes/web/ajax_handler.py b/app/classes/web/ajax_handler.py index ab5d974d..c6f16ac3 100644 --- a/app/classes/web/ajax_handler.py +++ b/app/classes/web/ajax_handler.py @@ -134,15 +134,15 @@ class AjaxHandler(BaseHandler): \n
    - - + + {filename}
  • \n""" else: output += f"""
  • @@ -154,15 +154,15 @@ class AjaxHandler(BaseHandler): \n
    - - + + {filename}
  • \n""" else: output += f"""
  • diff --git a/app/frontend/templates/panel/server_files.html b/app/frontend/templates/panel/server_files.html index 4282b3bd..27fb29b3 100644 --- a/app/frontend/templates/panel/server_files.html +++ b/app/frontend/templates/panel/server_files.html @@ -39,12 +39,15 @@ -
    +
    -
    +
    +

    +

    +

    {{ translate('serverFiles', 'createFile', data['lang']) }} {{ @@ -72,7 +75,7 @@ .overlay { display: none; flex-direction: column; - background-color: #fff; + background-color: #9f9daf; border-radius: 10px; box-shadow: 0 10px 20px rgb(64 64 64 / 5%); padding: 10px 0; @@ -97,7 +100,7 @@ .overlay-content { display: flex; flex-direction: column; - background-color: #fff; + background-color: #9f9daf; border-radius: 10px; box-shadow: 0 10px 20px rgb(64 64 64 / 5%); padding: 10px 0; @@ -125,7 +128,7 @@ /* When you mouse over the navigation links, change their color */ .overlay a:hover, .overlay a:focus { - background: #f1f3f7; + background: grey; color: #4b00ff; } @@ -445,6 +448,9 @@ e.stopImmediatePropagation(); var ctxmenuPath = e.target.getAttribute('data-path'); var ctxmenuName = e.target.getAttribute('data-name'); + + document.getElementById('context-title').innerHTML = ctxmenuName; + console.log(ctxmenuName); if (!ctxmenuPath) { console.log({ 'event.target': e.target, ctxmenuPath }); return; @@ -926,6 +932,9 @@ $('#deleteDir').toggle(isDir); $('#upload').toggle(isDir); + document.getElementById('context-title').innerHTML = ctxmenuName; + console.log(ctxmenuName); + var isFile = event.target.classList.contains('tree-file'); $('#deleteFile').toggle(isFile); $('#downloadFile').toggle(isFile); From 0f19c0c787ec51e60d912bd972195bbe1dc67c88 Mon Sep 17 00:00:00 2001 From: Andrew Date: Sun, 15 May 2022 13:16:28 -0500 Subject: [PATCH 2/5] Realtime server stats all the time --- app/classes/shared/server.py | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py index 7be5fad4..348cc63f 100644 --- a/app/classes/shared/server.py +++ b/app/classes/shared/server.py @@ -117,6 +117,12 @@ class Server: self.backup_thread = threading.Thread( target=self.a_backup_server, daemon=True, name=f"backup_{self.name}" ) + self.server_scheduler.add_job( + self.realtime_stats, + "interval", + seconds=5, + id="stats_" + str(self.server_id), + ) self.is_backingup = False # Reset crash and update at initialization HelperServerStats.server_crash_reset(self.server_id) @@ -184,21 +190,6 @@ class Server: # Register an shedule for polling server stats when running logger.info(f"Polling server statistics {self.name} every {5} seconds") Console.info(f"Polling server statistics {self.name} every {5} seconds") - try: - self.server_scheduler.add_job( - self.realtime_stats, - "interval", - seconds=5, - id="stats_" + str(self.server_id), - ) - except: - self.server_scheduler.remove_job("stats_" + str(self.server_id)) - self.server_scheduler.add_job( - self.realtime_stats, - "interval", - seconds=5, - id="stats_" + str(self.server_id), - ) def setup_server_run_command(self): # configure the server @@ -591,9 +582,6 @@ class Server: self.cleanup_server_object() server_users = PermissionsServers.get_server_user_list(self.server_id) - # remove the stats polling job since server is stopped - self.server_scheduler.remove_job("stats_" + str(self.server_id)) - self.record_server_stats() for user in server_users: @@ -641,8 +629,6 @@ class Server: # clear the old scheduled watcher task self.server_scheduler.remove_job(f"c_{self.server_id}") - # remove the stats polling job since server is stopped - self.server_scheduler.remove_job("stats_" + str(self.server_id)) # the server crashed, or isn't found - so let's reset things. logger.warning( @@ -685,7 +671,6 @@ class Server: proc.kill() # kill the main process we are after logger.info("Sending SIGKILL to parent") - self.server_scheduler.remove_job("stats_" + str(self.server_id)) self.process.kill() def get_start_time(self): From e161e2cf0b972b80b8dd69166095025b31863104 Mon Sep 17 00:00:00 2001 From: Andrew Date: Sun, 15 May 2022 13:28:02 -0500 Subject: [PATCH 3/5] Add cleanup method for server stats on delete --- app/classes/shared/main_controller.py | 1 + app/classes/shared/server.py | 3 +++ 2 files changed, 4 insertions(+) diff --git a/app/classes/shared/main_controller.py b/app/classes/shared/main_controller.py index efcfabf5..d96d31cd 100644 --- a/app/classes/shared/main_controller.py +++ b/app/classes/shared/main_controller.py @@ -841,6 +841,7 @@ class Controller: # Cleanup scheduled tasks try: + srv_obj.remove_stats_job() HelpersManagement.delete_scheduled_task_by_server(server_id) except DoesNotExist: logger.info("No scheduled jobs exist. Continuing.") diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py index 348cc63f..efe5348a 100644 --- a/app/classes/shared/server.py +++ b/app/classes/shared/server.py @@ -504,6 +504,9 @@ class Server: f"Assuming it was never started." ) + def remove_stats_job(self): + self.server_scheduler.remove_job("stats_" + str(self.server_id)) + def start_crash_detection(self): # This is only used if the crash detection settings change # while the server is running. From 490fc86d4eb403b163a0b1daf84296dcea630bdc Mon Sep 17 00:00:00 2001 From: Andrew Date: Sun, 15 May 2022 14:00:24 -0500 Subject: [PATCH 4/5] Cleanup server schedule on delete --- app/classes/shared/main_controller.py | 2 +- app/classes/shared/server.py | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/classes/shared/main_controller.py b/app/classes/shared/main_controller.py index d96d31cd..0c0fcc5f 100644 --- a/app/classes/shared/main_controller.py +++ b/app/classes/shared/main_controller.py @@ -812,6 +812,7 @@ class Controller: Console.info(f"Deleting Server: ID {server_id} | Name: {server_name} ") srv_obj = server["server_obj"] + srv_obj.server_scheduler.shutdown() running = srv_obj.check_running() if running: @@ -841,7 +842,6 @@ class Controller: # Cleanup scheduled tasks try: - srv_obj.remove_stats_job() HelpersManagement.delete_scheduled_task_by_server(server_id) except DoesNotExist: logger.info("No scheduled jobs exist. Continuing.") diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py index efe5348a..1f596f80 100644 --- a/app/classes/shared/server.py +++ b/app/classes/shared/server.py @@ -1,3 +1,4 @@ +from logging import exception import os import re import time @@ -504,9 +505,6 @@ class Server: f"Assuming it was never started." ) - def remove_stats_job(self): - self.server_scheduler.remove_job("stats_" + str(self.server_id)) - def start_crash_detection(self): # This is only used if the crash detection settings change # while the server is running. From 4f6a90eb6a7b45ba9f1b78edbda2fb989ec52d23 Mon Sep 17 00:00:00 2001 From: Andrew Date: Sun, 15 May 2022 14:05:23 -0500 Subject: [PATCH 5/5] Remove unused import --- app/classes/shared/server.py | 1 - 1 file changed, 1 deletion(-) diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py index 1f596f80..348cc63f 100644 --- a/app/classes/shared/server.py +++ b/app/classes/shared/server.py @@ -1,4 +1,3 @@ -from logging import exception import os import re import time