diff --git a/bin/updater/README.ES.md b/bin/updater/README.ES.md index c9efa9b..69f2a1f 100644 --- a/bin/updater/README.ES.md +++ b/bin/updater/README.ES.md @@ -122,5 +122,5 @@ SCHTASKS /DELETE /TN "ToolkitUpdater" ```bash pip install pyinstaller -pyinstaller --onefile updater.py --icon=assets/appicon.ico +pyinstaller --onefile UpdateManager.py --icon=../assets/appicon.ico ``` diff --git a/bin/updater/README.md b/bin/updater/README.md index b633708..183ebe0 100644 --- a/bin/updater/README.md +++ b/bin/updater/README.md @@ -120,5 +120,5 @@ SCHTASKS /DELETE /TN "ToolkitUpdater" ```bash pip install pyinstaller -pyinstaller --onefile updater.py --icon=assets/appicon.ico +pyinstaller --onefile UpdateManager.py --icon=../assets/appicon.ico ``` diff --git a/bin/updater/src/UpdateManager.py b/bin/updater/src/UpdateManager.py index 8ca2f51..041930c 100644 --- a/bin/updater/src/UpdateManager.py +++ b/bin/updater/src/UpdateManager.py @@ -5,9 +5,9 @@ import os import colorama import logging -from src.Updater import Updater -from src.ConfigManager import ConfigManager -from src.ColoredFormatter import ColoredFormatter +from universal_updater.Updater import Updater +from universal_updater.ConfigManager import ConfigManager +from universal_updater.ColoredFormatter import ColoredFormatter class UpdateManager: @@ -19,7 +19,7 @@ class UpdateManager: """ Initialize the UpdateManager with a ConfigManager instance and command-line arguments. """ - self.version = '2.1.0' + self.version = '2.1.1' self.config_file_name = 'tools.ini' self.config_section_defaults = 'UpdaterConfig' self.config_section_self_update = 'UpdaterAutoUpdater' @@ -100,7 +100,7 @@ class UpdateManager: dest='disable_clean', help='disable tool folder clean', action=argparse.BooleanOptionalAction, - default=self.get_argparse_default('disable_clean', False) + default=self.get_argparse_default('disable_clean', True) ) parser.add_argument( '-dr', @@ -108,7 +108,7 @@ class UpdateManager: dest='disable_repack', help='disable tool repack', action=argparse.BooleanOptionalAction, - default=self.get_argparse_default('disable_repack', False) + default=self.get_argparse_default('disable_repack', True) ) parser.add_argument( '-dic', @@ -289,3 +289,9 @@ class UpdateManager: self.set_logging_level() self.update_default_params() self.handle_updates() + + +# Entry point for the script +if __name__ == '__main__': + # Initialize and run the main method of UpdateManager + UpdateManager().main() diff --git a/bin/updater/requirements.txt b/bin/updater/src/requirements.txt similarity index 100% rename from bin/updater/requirements.txt rename to bin/updater/src/requirements.txt diff --git a/bin/updater/src/ColoredFormatter.py b/bin/updater/src/universal_updater/ColoredFormatter.py similarity index 100% rename from bin/updater/src/ColoredFormatter.py rename to bin/updater/src/universal_updater/ColoredFormatter.py diff --git a/bin/updater/src/ConfigManager.py b/bin/updater/src/universal_updater/ConfigManager.py similarity index 100% rename from bin/updater/src/ConfigManager.py rename to bin/updater/src/universal_updater/ConfigManager.py diff --git a/bin/updater/src/Downloader.py b/bin/updater/src/universal_updater/Downloader.py similarity index 100% rename from bin/updater/src/Downloader.py rename to bin/updater/src/universal_updater/Downloader.py diff --git a/bin/updater/src/FileManager.py b/bin/updater/src/universal_updater/FileManager.py similarity index 98% rename from bin/updater/src/FileManager.py rename to bin/updater/src/universal_updater/FileManager.py index 8fa6a08..89f4120 100644 --- a/bin/updater/src/FileManager.py +++ b/bin/updater/src/universal_updater/FileManager.py @@ -3,7 +3,7 @@ import pathlib import shutil import logging -from src.Helpers import Helpers +from universal_updater.Helpers import Helpers class FileManager: diff --git a/bin/updater/src/Helpers.py b/bin/updater/src/universal_updater/Helpers.py similarity index 100% rename from bin/updater/src/Helpers.py rename to bin/updater/src/universal_updater/Helpers.py diff --git a/bin/updater/src/Packer.py b/bin/updater/src/universal_updater/Packer.py similarity index 93% rename from bin/updater/src/Packer.py rename to bin/updater/src/universal_updater/Packer.py index ba23b24..d762245 100644 --- a/bin/updater/src/Packer.py +++ b/bin/updater/src/universal_updater/Packer.py @@ -7,7 +7,7 @@ import shutil import colorama import logging -from src.Helpers import Helpers +from universal_updater.Helpers import Helpers class Packer: @@ -87,12 +87,15 @@ class Packer: :return: None :raises: Exception if file extension is not supported """ - if file_ext == '.zip': - return self.unpack_zip(file_path, unpack_path, file_pass) - elif file_ext == '.rar': - return self.unpack_rar(file_path, unpack_path, file_pass) - elif file_ext == '.7z': - return self.unpack_7z(file_path, unpack_path, file_pass) + try: + if file_ext == '.zip': + return self.unpack_zip(file_path, unpack_path, file_pass) + elif file_ext == '.rar': + return self.unpack_rar(file_path, unpack_path, file_pass) + elif file_ext == '.7z': + return self.unpack_7z(file_path, unpack_path, file_pass) + except Exception as error: + raise Exception(colorama.Fore.RED + f'An error occurred during unpacking: {error}') raise Exception(colorama.Fore.RED + f'{file_ext} extension not accepted by internal unpacker') diff --git a/bin/updater/src/Scraper.py b/bin/updater/src/universal_updater/Scraper.py similarity index 100% rename from bin/updater/src/Scraper.py rename to bin/updater/src/universal_updater/Scraper.py diff --git a/bin/updater/src/ScriptExecutor.py b/bin/updater/src/universal_updater/ScriptExecutor.py similarity index 100% rename from bin/updater/src/ScriptExecutor.py rename to bin/updater/src/universal_updater/ScriptExecutor.py diff --git a/bin/updater/src/Updater.py b/bin/updater/src/universal_updater/Updater.py similarity index 95% rename from bin/updater/src/Updater.py rename to bin/updater/src/universal_updater/Updater.py index 94a622e..4428dfa 100644 --- a/bin/updater/src/Updater.py +++ b/bin/updater/src/universal_updater/Updater.py @@ -3,12 +3,12 @@ import pathlib import colorama import logging -from src.Scraper import Scraper -from src.Downloader import Downloader -from src.Packer import Packer -from src.FileManager import FileManager -from src.ScriptExecutor import ScriptExecutor -from src.Helpers import Helpers +from universal_updater.Scraper import Scraper +from universal_updater.Downloader import Downloader +from universal_updater.Packer import Packer +from universal_updater.FileManager import FileManager +from universal_updater.ScriptExecutor import ScriptExecutor +from universal_updater.Helpers import Helpers class Updater: diff --git a/bin/updater/unrar.exe b/bin/updater/unrar.exe index 5c51398..c0db927 100644 Binary files a/bin/updater/unrar.exe and b/bin/updater/unrar.exe differ diff --git a/bin/updater/updater.exe b/bin/updater/updater.exe index 0b685a7..50e2d1c 100644 Binary files a/bin/updater/updater.exe and b/bin/updater/updater.exe differ diff --git a/bin/updater/updater.py b/bin/updater/updater.py deleted file mode 100644 index 7afb445..0000000 --- a/bin/updater/updater.py +++ /dev/null @@ -1,7 +0,0 @@ -# Import the UpdateManager class from the src package -from src.UpdateManager import UpdateManager - -# Entry point for the script -if __name__ == '__main__': - # Initialize and run the main method of UpdateManager - UpdateManager().main()