ready for testing!

giordanidev · Jul 11, 2023 · a72b279 · a72b279
1 parent abeb791
commit a72b279
Show file tree

Hide file tree

Showing 16 changed files with 140 additions and 277 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,14 +1,5 @@
 venv/
 __pycache__/
-README.txt
-build/
-dist/
-main.spec
-output/
-setup.py
-Aion-Classic-Mods.json
 logs/logs.log
 config/config.ini
-config/lists/filter_delete.json
-config/lists/font_delete.json
-config/lists/voice_delete.json
+config/lists/
diff --git a/app_functions.py b/app_functions.py
diff --git a/assets/Data/data_ptBR.pak b/assets/Data/data_ptBR.pak
diff --git a/config/config.ini b/config/config.ini
@@ -5,3 +5,4 @@ region =
 napath = 
 eupath = 
 eulauncherpath = 
+
diff --git a/config/lang/en_US.json b/config/lang/en_US.json
@@ -1,6 +1,6 @@
 {
     "app_title": "Aion Classic 'Mods' by Load",
-    "app_version": " - v1.1.0",
+    "app_version": " - v1.2.0",
     "app_info_label": "Please choose an option to begin.",
 
     "voice": "KR voices",
@@ -16,6 +16,7 @@
     "app_return_label_waiting": "Waiting...",
     "app_return_label_verifying": "Verifying files, please wait!",
     "app_return_label_uptodate": "There are no new files to update.",
+    "app_return_label_update": "Update available.",
     "app_return_label_install": "Success! Files have been installed.",
     "app_return_label_install_ready": "Files are ready to be installed.",
     "app_return_label_deleted": "Success! Files deleted.",
@@ -28,6 +29,7 @@
     "app_button_verifying": "Verifying...",
     "app_button_install": "Install",
     "app_button_download": "Download",
+    "app_button_downloading": "Downloading",
     "app_button_delete": "Delete",
     "app_button_uptodate": "Up to date!",
     "app_button_close_game": "Close Aion",

diff --git a/config/lang/pt_BR.json b/config/lang/pt_BR.json
@@ -16,6 +16,7 @@
     "app_return_label_waiting": "Esperando...",
     "app_return_label_verifying": "Verificando arquivos... Por favor, aguarde!",
     "app_return_label_uptodate": "Não há novos arquivos para atualizar.",
+    "app_return_label_update": "Atualização disponível.",
     "app_return_label_install": "Successo! Arquivos instalados.",
     "app_return_label_install_ready": "Arquivos estão prontos para ser instalados.",
     "app_return_label_deleted": "Successo! Arquivos excluídos.",
@@ -27,7 +28,8 @@
     "app_button_verify_all": "Verificar Todos",
     "app_button_verifying": "Verificando...",
     "app_button_install": "Instalar",
-    "app_button_download": "Download",
+    "app_button_download": "Baixar",
+    "app_button_downloading": "Baixando",
     "app_button_delete": "Excluir",
     "app_button_uptodate": "Atualizado!",
     "app_button_close_game": "Fechar Aion",

diff --git a/config/lists/filter_delete.json b/config/lists/filter_delete.json
@@ -1,34 +1 @@
-[
-    [
-        ".\\assets\\data\\Strings\\aionfilterline_load.dat",
-        "E:\\JOGOS\\AION_CLASSIC\\l10n\\enu\\data\\Strings\\aionfilterline_load.dat"
-    ],
-    [
-        ".\\assets\\data\\Strings\\aionfilterline_load.dat",
-        "E:\\JOGOS\\aionclassic\\l10n\\eng\\data\\Strings\\aionfilterline_load.dat"
-    ],
-    [
-        ".\\assets\\data\\Strings\\aionfilterline_load.dat",
-        "E:\\JOGOS\\aionclassic\\l10n\\fra\\data\\Strings\\aionfilterline_load.dat"
-    ],
-    [
-        ".\\assets\\data\\Strings\\aionfilterline_load.dat",
-        "E:\\JOGOS\\aionclassic\\l10n\\deu\\data\\Strings\\aionfilterline_load.dat"
-    ],
-    [
-        ".\\assets\\data\\Strings\\aionfilterline_load.pak",
-        "E:\\JOGOS\\AION_CLASSIC\\l10n\\enu\\data\\Strings\\aionfilterline_load.pak"
-    ],
-    [
-        ".\\assets\\data\\Strings\\aionfilterline_load.pak",
-        "E:\\JOGOS\\aionclassic\\l10n\\eng\\data\\Strings\\aionfilterline_load.pak"
-    ],
-    [
-        ".\\assets\\data\\Strings\\aionfilterline_load.pak",
-        "E:\\JOGOS\\aionclassic\\l10n\\fra\\data\\Strings\\aionfilterline_load.pak"
-    ],
-    [
-        ".\\assets\\data\\Strings\\aionfilterline_load.pak",
-        "E:\\JOGOS\\aionclassic\\l10n\\deu\\data\\Strings\\aionfilterline_load.pak"
-    ]
-]
+{}
diff --git a/config/lists/font_delete.json b/config/lists/font_delete.json
@@ -1,18 +1 @@
-[
-    [
-        ".\\assets\\textures\\ui\\hit_number_jp.pak",
-        "E:\\JOGOS\\AION_CLASSIC\\l10n\\enu\\textures\\ui\\hit_number_jp.pak"
-    ],
-    [
-        ".\\assets\\textures\\ui\\hit_number_jp.pak",
-        "E:\\JOGOS\\aionclassic\\l10n\\eng\\textures\\ui\\hit_number_jp.pak"
-    ],
-    [
-        ".\\assets\\textures\\ui\\hit_number_jp.pak",
-        "E:\\JOGOS\\aionclassic\\l10n\\fra\\textures\\ui\\hit_number_jp.pak"
-    ],
-    [
-        ".\\assets\\textures\\ui\\hit_number_jp.pak",
-        "E:\\JOGOS\\aionclassic\\l10n\\deu\\textures\\ui\\hit_number_jp.pak"
-    ]
-]
+{}
diff --git a/config/lists/translation_delete.json b/config/lists/translation_delete.json
@@ -1 +1 @@
-{}
+{}
diff --git a/config/lists/translation_install.json b/config/lists/translation_install.json
@@ -1 +1 @@
-{}
+{}
diff --git a/config/lists/voice_delete.json b/config/lists/voice_delete.json
@@ -1,98 +1 @@
-[
-    [
-        ".\\assets\\sounds\\voice\\attack\\attack_kr.pak",
-        "E:\\JOGOS\\AION_CLASSIC\\l10n\\enu\\sounds\\voice\\attack\\attack_kr.pak"
-    ],
-    [
-        ".\\assets\\sounds\\voice\\attack\\attack_kr.pak",
-        "E:\\JOGOS\\aionclassic\\l10n\\eng\\sounds\\voice\\attack\\attack_kr.pak"
-    ],
-    [
-        ".\\assets\\sounds\\voice\\attack\\attack_kr.pak",
-        "E:\\JOGOS\\aionclassic\\l10n\\fra\\sounds\\voice\\attack\\attack_kr.pak"
-    ],
-    [
-        ".\\assets\\sounds\\voice\\attack\\attack_kr.pak",
-        "E:\\JOGOS\\aionclassic\\l10n\\deu\\sounds\\voice\\attack\\attack_kr.pak"
-    ],
-    [
-        ".\\assets\\sounds\\voice\\cast\\cast_kr.pak",
-        "E:\\JOGOS\\AION_CLASSIC\\l10n\\enu\\sounds\\voice\\cast\\cast_kr.pak"
-    ],
-    [
-        ".\\assets\\sounds\\voice\\cast\\cast_kr.pak",
-        "E:\\JOGOS\\aionclassic\\l10n\\eng\\sounds\\voice\\cast\\cast_kr.pak"
-    ],
-    [
-        ".\\assets\\sounds\\voice\\cast\\cast_kr.pak",
-        "E:\\JOGOS\\aionclassic\\l10n\\fra\\sounds\\voice\\cast\\cast_kr.pak"
-    ],
-    [
-        ".\\assets\\sounds\\voice\\cast\\cast_kr.pak",
-        "E:\\JOGOS\\aionclassic\\l10n\\deu\\sounds\\voice\\cast\\cast_kr.pak"
-    ],
-    [
-        ".\\assets\\sounds\\voice\\damage\\damage_kr.pak",
-        "E:\\JOGOS\\AION_CLASSIC\\l10n\\enu\\sounds\\voice\\damage\\damage_kr.pak"
-    ],
-    [
-        ".\\assets\\sounds\\voice\\damage\\damage_kr.pak",
-        "E:\\JOGOS\\aionclassic\\l10n\\eng\\sounds\\voice\\damage\\damage_kr.pak"
-    ],
-    [
-        ".\\assets\\sounds\\voice\\damage\\damage_kr.pak",
-        "E:\\JOGOS\\aionclassic\\l10n\\fra\\sounds\\voice\\damage\\damage_kr.pak"
-    ],
-    [
-        ".\\assets\\sounds\\voice\\damage\\damage_kr.pak",
-        "E:\\JOGOS\\aionclassic\\l10n\\deu\\sounds\\voice\\damage\\damage_kr.pak"
-    ],
-    [
-        ".\\assets\\sounds\\voice\\defence\\defence_kr.pak",
-        "E:\\JOGOS\\AION_CLASSIC\\l10n\\enu\\sounds\\voice\\defence\\defence_kr.pak"
-    ],
-    [
-        ".\\assets\\sounds\\voice\\defence\\defence_kr.pak",
-        "E:\\JOGOS\\aionclassic\\l10n\\eng\\sounds\\voice\\defence\\defence_kr.pak"
-    ],
-    [
-        ".\\assets\\sounds\\voice\\defence\\defence_kr.pak",
-        "E:\\JOGOS\\aionclassic\\l10n\\fra\\sounds\\voice\\defence\\defence_kr.pak"
-    ],
-    [
-        ".\\assets\\sounds\\voice\\defence\\defence_kr.pak",
-        "E:\\JOGOS\\aionclassic\\l10n\\deu\\sounds\\voice\\defence\\defence_kr.pak"
-    ],
-    [
-        ".\\assets\\sounds\\voice\\login\\login_kr.pak",
-        "E:\\JOGOS\\AION_CLASSIC\\l10n\\enu\\sounds\\voice\\login\\login_kr.pak"
-    ],
-    [
-        ".\\assets\\sounds\\voice\\login\\login_kr.pak",
-        "E:\\JOGOS\\aionclassic\\l10n\\eng\\sounds\\voice\\login\\login_kr.pak"
-    ],
-    [
-        ".\\assets\\sounds\\voice\\login\\login_kr.pak",
-        "E:\\JOGOS\\aionclassic\\l10n\\fra\\sounds\\voice\\login\\login_kr.pak"
-    ],
-    [
-        ".\\assets\\sounds\\voice\\login\\login_kr.pak",
-        "E:\\JOGOS\\aionclassic\\l10n\\deu\\sounds\\voice\\login\\login_kr.pak"
-    ],
-    [
-        ".\\assets\\sounds\\voice\\motion\\motion_kr.pak",
-        "E:\\JOGOS\\AION_CLASSIC\\l10n\\enu\\sounds\\voice\\motion\\motion_kr.pak"
-    ],
-    [
-        ".\\assets\\sounds\\voice\\motion\\motion_kr.pak",
-        "E:\\JOGOS\\aionclassic\\l10n\\eng\\sounds\\voice\\motion\\motion_kr.pak"
-    ],
-    [
-        ".\\assets\\sounds\\voice\\motion\\motion_kr.pak",
-        "E:\\JOGOS\\aionclassic\\l10n\\fra\\sounds\\voice\\motion\\motion_kr.pak"
-    ],
-    [
-        ".\\assets\\sounds\\voice\\motion\\motion_kr.pak",
-        "E:\\JOGOS\\aionclassic\\l10n\\deu\\sounds\\voice\\motion\\motion_kr.pak"
-    ]
-]
+{}
diff --git a/logs/logs.log b/logs/logs.log
@@ -1,17 +0,0 @@
-2023-07-10 13:43:09,733 [MainThread] -> [DEBUG] -> :: <module>() -> App initialized.
-2023-07-10 13:43:09,734 [MainThread] -> [DEBUG] -> :: <module>() -> app_functions.py imported.
-2023-07-10 13:43:09,754 [MainThread] -> [DEBUG] -> :: getLang() -> (pt_BR) translation loaded.
-2023-07-10 13:43:09,755 [MainThread] -> [DEBUG] -> :: appConfigLoad() -> appConfigLoad: [('theme', 'System'), ('color', 'Blue'), ('region', '3'), ('napath', 'E:\\JOGOS\\AION_CLASSIC'), ('eupath', 'E:\\JOGOS\\aionclassic'), ('eulauncherpath', '')]
-2023-07-10 13:43:10,167 [MainThread] -> [DEBUG] -> :: <module>() -> main.py imported.
-2023-07-10 13:43:10,169 [MainThread] -> [DEBUG] -> :: appConfigLoad() -> appConfigLoad: [('theme', 'System'), ('color', 'Blue'), ('region', '3'), ('napath', 'E:\\JOGOS\\AION_CLASSIC'), ('eupath', 'E:\\JOGOS\\aionclassic'), ('eulauncherpath', '')]
-2023-07-10 13:43:10,271 [MainThread] -> [DEBUG] -> :: __init__() -> App() class initialized.
-2023-07-10 13:43:10,288 [MainThread] -> [DEBUG] -> :: __init__() -> createTabs() class initialized.
-2023-07-10 13:43:10,289 [MainThread] -> [DEBUG] -> :: appConfigLoad() -> appConfigLoad: [('theme', 'System'), ('color', 'Blue'), ('region', '3'), ('napath', 'E:\\JOGOS\\AION_CLASSIC'), ('eupath', 'E:\\JOGOS\\aionclassic'), ('eulauncherpath', '')]
-2023-07-10 13:43:10,289 [MainThread] -> [DEBUG] -> :: __init__() -> app_config.items(): [('theme', 'System'), ('color', 'Blue'), ('region', '3'), ('napath', 'E:\\JOGOS\\AION_CLASSIC'), ('eupath', 'E:\\JOGOS\\aionclassic'), ('eulauncherpath', '')]
-2023-07-10 13:43:10,303 [MainThread] -> [DEBUG] -> :: __init__() -> Tabs created.
-2023-07-10 13:43:10,304 [MainThread] -> [DEBUG] -> :: appConfigLoad() -> appConfigLoad: [('theme', 'System'), ('color', 'Blue'), ('region', '3'), ('napath', 'E:\\JOGOS\\AION_CLASSIC'), ('eupath', 'E:\\JOGOS\\aionclassic'), ('eulauncherpath', '')]
-2023-07-10 13:43:10,304 [MainThread] -> [INFO] -> :: firstRun() :: Not the first run anymore!
-2023-07-10 13:43:10,423 [MainThread] -> [DEBUG] -> :: __init__() -> Tabs populated.
-2023-07-10 13:43:10,424 [MainThread] -> [DEBUG] -> :: appConfigLoad() -> appConfigLoad: [('theme', 'System'), ('color', 'Blue'), ('region', '3'), ('napath', 'E:\\JOGOS\\AION_CLASSIC'), ('eupath', 'E:\\JOGOS\\aionclassic'), ('eulauncherpath', '')]
-2023-07-10 13:43:10,424 [MainThread] -> [DEBUG] -> :: __init__() -> Default values -> theme: System | region: 3 | napath: E:\JOGOS\AION_CLASSIC | eupath: E:\JOGOS\aionclassic | color: Blue
-2023-07-10 13:43:10,429 [MainThread] -> [DEBUG] -> :: __init__() -> Default values read.

diff --git a/main.py b/main.py
@@ -119,7 +119,7 @@ def __init__(self, master, changeColorEvent, **kwargs):
         self.filterButton.grid(row=2, column=3, padx=padx_both, pady=pady_both)
         self.fontButton = ctk.CTkButton(self.appTopFrame, text=translateText("app_button_install"), state="disabled", width=90)
         self.fontButton.grid(row=3, column=3, padx=padx_both, pady=pady_both)
-        self.translationButton = ctk.CTkButton(self.appTopFrame, text=translateText("app_button_install"), state="disabled", width=90)
+        self.translationButton = ctk.CTkButton(self.appTopFrame, text=translateText("app_button_download"), state="disabled", width=90)
         self.translationButton.grid(row=4, column=3, padx=padx_both, pady=pady_both)
 
         self.voiceDeleteButton = ctk.CTkButton(self.appTopFrame, text=translateText("app_button_delete"), state="disabled", width=90)
@@ -152,7 +152,7 @@ def __init__(self, master, changeColorEvent, **kwargs):
                                                   self.fontButton,
                                                   self.fontDeleteButton))
         self.translationButton.configure(command=partial(copyFilesButton,
-                                                  "font",
+                                                  "translation",
                                                   "copy",
                                                   self.translationReturnLabel,
                                                   self.translationButton,
@@ -177,7 +177,7 @@ def __init__(self, master, changeColorEvent, **kwargs):
                                                         self.fontButton,
                                                         self.fontDeleteButton))
         self.translationDeleteButton.configure(command=partial(copyFilesButton,
-                                                        "font",
+                                                        "translation",
                                                         "delete",
                                                         self.translationReturnLabel,
                                                         self.translationButton,
@@ -188,10 +188,10 @@ def __init__(self, master, changeColorEvent, **kwargs):
         self.verifyAllButton.grid(row=0, column=3, columnspan=2, padx=padx_both, pady=pady_both)
 
         self.verifyAllButton.configure(command=partial(verifyFilesButton, 
-                                                   ["filter", "font", "voice"], 
-                                                   [self.filterButton, self.fontButton, self.voiceButton],
-                                                   [self.filterDeleteButton, self.fontDeleteButton, self.voiceDeleteButton],
-                                                   [self.filterReturnLabel, self.fontReturnLabel, self.voiceReturnLabel],
+                                                   ["filter", "font", "voice", "translation"], 
+                                                   [self.filterButton, self.fontButton, self.voiceButton, self.translationButton],
+                                                   [self.filterDeleteButton, self.fontDeleteButton, self.voiceDeleteButton, self.translationDeleteButton],
+                                                   [self.filterReturnLabel, self.fontReturnLabel, self.voiceReturnLabel, self.translationReturnLabel],
                                                    self.verifyAllButton,
                                                    self))
 
@@ -275,6 +275,7 @@ def __init__(self, master, changeColorEvent, **kwargs):
                       f"region: {app_config.get('app', 'region')} | "+
                       f"napath: {app_config.get('app', 'napath')} | "+
                       f"eupath: {app_config.get('app', 'eupath')} | "+
+                      f"eulauncherpath: {app_config.get('app', 'eulauncherpath')} | "+
                       f"color: {app_config.get('app', 'color')}")
         if app_config.get('app', 'theme'):
             lang_theme = getLangTranslation(app_config.get('app', 'theme'))
@@ -285,6 +286,7 @@ def __init__(self, master, changeColorEvent, **kwargs):
         if app_config.get('app', 'region'): self.regionRadio.set(app_config.get('app', 'region'))
         if app_config.get('app', 'napath'): self.naPathEntry.insert(0, app_config.get('app', 'napath'))
         if app_config.get('app', 'eupath'): self.euPathEntry.insert(0, app_config.get('app', 'eupath'))
+        if app_config.get('app', 'eulauncherpath'): self.euLauncherPathEntry.insert(0, app_config.get('app', 'eulauncherpath'))
 
         logging.debug(f"{sys._getframe().f_code.co_name}() -> Default values read.")
 

diff --git a/config/config.json → tests/config.json b/config/config.json → tests/config.json
diff --git a/tests/downloadtest.py b/tests/downloadtest.py
diff --git a/installer.nsi → tests/installer.nsi b/installer.nsi → tests/installer.nsi
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,3 +5,4 @@ region =
		napath =
		eupath =
		eulauncherpath =