From 09bba7fdb0760fff8f7b61a082f2bcebbb517dea Mon Sep 17 00:00:00 2001 From: Zedifus Date: Wed, 23 Mar 2022 06:16:22 +0000 Subject: [PATCH] =?UTF-8?q?Further=20fix=20files=20to=20conform=20with=20?= =?UTF-8?q?=E2=9A=ABBlack=20pylintrc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Mostly just breaking up strings and comments into new lines Some strings dont require 'f' but keeping in for readability with the rest of the concatinated string --- app/classes/models/management.py | 6 +- app/classes/models/users.py | 3 +- app/classes/shared/translation.py | 180 +++++++++++++++--------------- main.py | 20 ++-- 4 files changed, 111 insertions(+), 98 deletions(-) diff --git a/app/classes/models/management.py b/app/classes/models/management.py index 039ceeeb..df25e5a0 100644 --- a/app/classes/models/management.py +++ b/app/classes/models/management.py @@ -417,7 +417,8 @@ class helpers_management: self.set_backup_config(server_id=server_id, excluded_dirs=excluded_dirs) else: logger.debug( - f"Not adding {dir_to_add} to excluded directories - already in the excluded directory list for server ID {server_id}" + f"Not adding {dir_to_add} to excluded directories - " + f"already in the excluded directory list for server ID {server_id}" ) def del_excluded_backup_dir(self, server_id: int, dir_to_del: str): @@ -428,7 +429,8 @@ class helpers_management: self.set_backup_config(server_id=server_id, excluded_dirs=excluded_dirs) else: logger.debug( - f"Not removing {dir_to_del} from excluded directories - not in the excluded directory list for server ID {server_id}" + f"Not removing {dir_to_del} from excluded directories - " + f"not in the excluded directory list for server ID {server_id}" ) @staticmethod diff --git a/app/classes/models/users.py b/app/classes/models/users.py index a78862ba..dbe189c7 100644 --- a/app/classes/models/users.py +++ b/app/classes/models/users.py @@ -297,7 +297,8 @@ class helper_users: else: user_id = user.user_id - # I just copied this code from get_user, it had those TODOs & comments made by mac - Lukas + # I just copied this code from get_user, + # it had those TODOs & comments made by mac - Lukas roles_query = ( User_Roles.select() diff --git a/app/classes/shared/translation.py b/app/classes/shared/translation.py index d2e98573..22ee1d81 100644 --- a/app/classes/shared/translation.py +++ b/app/classes/shared/translation.py @@ -1,88 +1,92 @@ -import json -import logging -import os -import typing as t - -from app.classes.shared.console import console -from app.classes.shared.helpers import helper - -logger = logging.getLogger(__name__) - - -class Translation: - def __init__(self): - self.translations_path = os.path.join(helper.root_dir, "app", "translations") - self.cached_translation = None - self.cached_translation_lang = None - - def get_language_file(self, language: str): - return os.path.join(self.translations_path, str(language) + ".json") - - def translate(self, page, word, language): - fallback_language = "en_EN" - - translated_word = self.translate_inner(page, word, language) - if translated_word is None: - translated_word = self.translate_inner(page, word, fallback_language) - - if translated_word: - if isinstance(translated_word, dict): - # JSON objects - return json.dumps(translated_word) - elif isinstance(translated_word, str): - # Basic strings - return translated_word - elif hasattr(translated_word, "__iter__"): - # Multiline strings - return "\n".join(translated_word) - return "Error while getting translation" - - def translate_inner(self, page, word, language) -> t.Union[t.Any, None]: - language_file = self.get_language_file(language) - try: - if not self.cached_translation: - with open(language_file, "r", encoding="utf-8") as f: - data = json.load(f) - self.cached_translation = data - elif self.cached_translation_lang != language: - with open(language_file, "r", encoding="utf-8") as f: - data = json.load(f) - self.cached_translation = data - self.cached_translation_lang = language - else: - data = self.cached_translation - - try: - translated_page = data[page] - except KeyError: - logger.error( - f"Translation File Error: page {page} does not exist for lang {language}" - ) - console.error( - f"Translation File Error: page {page} does not exist for lang {language}" - ) - return None - - try: - translated_word = translated_page[word] - return translated_word - except KeyError: - logger.error( - f"Translation File Error: word {word} does not exist on page {page} for lang {language}" - ) - console.error( - f"Translation File Error: word {word} does not exist on page {page} for lang {language}" - ) - return None - - except Exception as e: - logger.critical( - f"Translation File Error: Unable to read {language_file} due to {e}" - ) - console.critical( - f"Translation File Error: Unable to read {language_file} due to {e}" - ) - return None - - -translation = Translation() +import json +import logging +import os +import typing as t + +from app.classes.shared.console import console +from app.classes.shared.helpers import helper + +logger = logging.getLogger(__name__) + + +class Translation: + def __init__(self): + self.translations_path = os.path.join(helper.root_dir, "app", "translations") + self.cached_translation = None + self.cached_translation_lang = None + + def get_language_file(self, language: str): + return os.path.join(self.translations_path, str(language) + ".json") + + def translate(self, page, word, language): + fallback_language = "en_EN" + + translated_word = self.translate_inner(page, word, language) + if translated_word is None: + translated_word = self.translate_inner(page, word, fallback_language) + + if translated_word: + if isinstance(translated_word, dict): + # JSON objects + return json.dumps(translated_word) + elif isinstance(translated_word, str): + # Basic strings + return translated_word + elif hasattr(translated_word, "__iter__"): + # Multiline strings + return "\n".join(translated_word) + return "Error while getting translation" + + def translate_inner(self, page, word, language) -> t.Union[t.Any, None]: + language_file = self.get_language_file(language) + try: + if not self.cached_translation: + with open(language_file, "r", encoding="utf-8") as f: + data = json.load(f) + self.cached_translation = data + elif self.cached_translation_lang != language: + with open(language_file, "r", encoding="utf-8") as f: + data = json.load(f) + self.cached_translation = data + self.cached_translation_lang = language + else: + data = self.cached_translation + + try: + translated_page = data[page] + except KeyError: + logger.error( + f"Translation File Error: page {page} " + f"does not exist for lang {language}" + ) + console.error( + f"Translation File Error: page {page} " + f"does not exist for lang {language}" + ) + return None + + try: + translated_word = translated_page[word] + return translated_word + except KeyError: + logger.error( + f"Translation File Error: word {word} does not exist on page " + f"{page} for lang {language}" + ) + console.error( + f"Translation File Error: word {word} does not exist on page " + f"{page} for lang {language}" + ) + return None + + except Exception as e: + logger.critical( + f"Translation File Error: Unable to read {language_file} due to {e}" + ) + console.critical( + f"Translation File Error: Unable to read {language_file} due to {e}" + ) + return None + + +translation = Translation() diff --git a/main.py b/main.py index 41ea9f53..0ce9e31a 100644 --- a/main.py +++ b/main.py @@ -10,7 +10,8 @@ from app.classes.shared.helpers import helper if helper.checkRoot(): console.critical( - "Root detected. Root/Admin access denied. Run Crafty again with non-elevated permissions." + "Root detected. Root/Admin access denied. " + "Run Crafty again with non-elevated permissions." ) time.sleep(5) console.critical("Crafty shutting down. Root/Admin access denied.") @@ -103,8 +104,10 @@ if __name__ == "__main__": if fresh_install: console.debug("Fresh install detected") console.warning( - "We have detected a fresh install. Please be sure to forward Crafty's port, " - + f"{helper.get_setting('https_port')}, through your router/firewall if you would like to be able to access Crafty remotely." + f"We have detected a fresh install. Please be sure to forward " + f"Crafty's port, {helper.get_setting('https_port')}, " + f"through your router/firewall if you would like to be able " + f"to access Crafty remotely." ) installer.default_settings() else: @@ -127,10 +130,12 @@ if __name__ == "__main__": # start stats logging tasks_manager.start_stats_recording() - # once the controller is up and stats are logging, we can kick off the scheduler officially + # once the controller is up and stats are logging, we can kick off + # the scheduler officially tasks_manager.start_scheduler() - # refresh our cache and schedule for every 12 hoursour cache refresh for serverjars.com + # refresh our cache and schedule for every 12 hoursour cache refresh + # for serverjars.com tasks_manager.serverjar_cache_refresher() logger.info("Checking Internet. This may take a minute.") @@ -138,8 +143,9 @@ if __name__ == "__main__": if not helper.check_internet(): console.warning( - "We have detected the machine running Crafty has no connection to the internet. " - + "Client connections to the server may be limited." + "We have detected the machine running Crafty has no " + "connection to the internet. Client connections to " + "the server may be limited." ) if not controller.check_system_user():