From 460472fe9d57b27b08c473e8c24846e4954bc32f Mon Sep 17 00:00:00 2001 From: Andrew Date: Tue, 21 Dec 2021 17:33:59 -0500 Subject: [PATCH 1/3] Fix weird caching thing causing slow folder opening on files --- app/classes/shared/helpers.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/app/classes/shared/helpers.py b/app/classes/shared/helpers.py index 18d34970..93d91381 100644 --- a/app/classes/shared/helpers.py +++ b/app/classes/shared/helpers.py @@ -94,19 +94,15 @@ class Helpers: return True except Exception as err: return False - + @staticmethod def check_port(server_port): - a_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - - ip = get('https://api.ipify.org').content.decode('utf8') - - location = (ip, server_port) - result_of_check = a_socket.connect_ex(location) - - if result_of_check == 0: + try: + host_public = get('https://api.ipify.org').text + tn = telnetlib.Telnet(host_public, server_port, 10) + telnetlib.close() return True - else: + except Exception as err: return False @staticmethod From c9908a3e0fb57cba01024e034f360c4c4a269a59 Mon Sep 17 00:00:00 2001 From: Andrew Date: Tue, 21 Dec 2021 17:36:49 -0500 Subject: [PATCH 2/3] Add sorting to filelist --- app/classes/shared/helpers.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/classes/shared/helpers.py b/app/classes/shared/helpers.py index 93d91381..e9a3d3cb 100644 --- a/app/classes/shared/helpers.py +++ b/app/classes/shared/helpers.py @@ -649,7 +649,9 @@ class Helpers: @staticmethod def generate_tree(folder, output=""): - for raw_filename in os.listdir(folder): + file_list = os.listdir(folder) + file_list.sort() + for raw_filename in file_list: filename = html.escape(raw_filename) rel = os.path.join(folder, raw_filename) if os.path.isdir(rel): From 5d6cbf6a4f89f05ea8daeaa55df748e6191c649c Mon Sep 17 00:00:00 2001 From: Andrew Date: Tue, 21 Dec 2021 17:39:24 -0500 Subject: [PATCH 3/3] add port checking stuff --- app/classes/shared/helpers.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/app/classes/shared/helpers.py b/app/classes/shared/helpers.py index e9a3d3cb..a4bf2fc8 100644 --- a/app/classes/shared/helpers.py +++ b/app/classes/shared/helpers.py @@ -97,12 +97,16 @@ class Helpers: @staticmethod def check_port(server_port): - try: - host_public = get('https://api.ipify.org').text - tn = telnetlib.Telnet(host_public, server_port, 10) - telnetlib.close() + a_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + + ip = get('https://api.ipify.org').content.decode('utf8') + + location = (ip, server_port) + result_of_check = a_socket.connect_ex(location) + + if result_of_check == 0: return True - except Exception as err: + else: return False @staticmethod