fix: correct README spelling, update modpack URLs, and improve task management in the launcher

Author: hampta

README.md

@@ -3,7 +3,7 @@
 [![Launcher Release-Build](https://github.com/cubedvij/launcher/actions/workflows/release.yml/badge.svg)](https://github.com/cubedvij/launcher/actions/workflows/release.yml)
 [![Launcher Dev-Build](https://github.com/cubedvij/launcher/actions/workflows/dev.yml/badge.svg)](https://github.com/cubedvij/launcher/actions/workflows/dev.yml)
 
-🎮 Лаунчер для гри на сервері "Кубіний Двіж" 
+🎮 Лаунчер для гри на сервері "Кубічний Двіж" 
 
 <img src="https://github.com/user-attachments/assets/7535707f-41ac-42ef-a1dd-4f3fdbaa7315" width="640" />
 

src/config.py

@@ -31,10 +31,17 @@
 STATS_API_VERSION = "v1"
 SERVER_IP = "play.cubedvij.pp.ua"
 AUTHLIB_INJECTOR_URL = "https://auth.cubedvij.pp.ua/authlib-injector"
+
+MODPACK_REPO = "cubedvij/modpack"
+
 CHANGELOG_URL = (
-    "https://raw.githubusercontent.com/cubedvij/modpack/refs/heads/main/README.md"
+    f"https://raw.githubusercontent.com/{MODPACK_REPO}/refs/heads/main/README.md"
+)
+
+MODPACK_INDEX_URL = (
+    f"https://raw.githubusercontent.com/{MODPACK_REPO}/refs/heads/main/modrinth.index.json"
 )
-MODPACK_REPO_URL = "https://github.com/cubedvij/modpack"
+MODPACK_REPO_URL = f"https://github.com/{MODPACK_REPO}"
 LATEST_LAUNCHER_RELEASE_URL = (
     "https://api.github.com/repos/cubedvij/launcher/releases/latest"
 )

src/modpack.py

@@ -9,7 +9,7 @@
 
 import httpx
 
-from config import APPDATA_FOLDER, MODPACK_REPO_URL
+from config import APPDATA_FOLDER, MODPACK_REPO_URL, MODPACK_INDEX_URL
 from settings import settings
 from minecraft_launcher_lib._helper import (
     check_path_inside_minecraft_directory,
@@ -30,9 +30,8 @@
 
 class Modpack:
     def __init__(self):
-        self._repo_url = MODPACK_REPO_URL
-        self._index_url = f"{self._repo_url}/raw/refs/heads/main/modrinth.index.json"
-        self._zip_url = f"{self._repo_url}/archive/refs/heads/main.zip"
+        self._index_url = MODPACK_INDEX_URL
+        self._zip_url = f"{MODPACK_REPO_URL}/archive/refs/heads/main.zip"
         self._modpack_index_file = None
         self.name = "cubedvij"
         self.installed_version = None
@@ -42,9 +41,9 @@ def __init__(self):
         self._setup_paths()
         self._etag = self._get_saved_index_etag()
 
-        self._fetch_latest_index(force=True)
+        # self._fetch_latest_index(force=True)
         self._get_installed_modpack_version()
-        self._load_modpack_info()
+        # self._load_modpack_info()
         # self._ensure_modpack_exists()
         # run on thread - self._ensure_modpack_exists()
         # executor = ThreadPoolExecutor(max_workers=1)
@@ -223,7 +222,7 @@ def install_mrpack(
             callback.get("setMax", empty)(len(file_list))
 
             mods = []
-            for count, file in enumerate(file_list):
+            for _, file in enumerate(file_list):
                 full_path = os.path.abspath(
                     os.path.join(modpack_directory, file["path"])
                 )
@@ -236,6 +235,9 @@ def install_mrpack(
                     }
                 )
 
+            # Clean old mods
+            self._clean_old_mods()
+
             # Download the files in parallel
             self.download_mods(callback, max_workers, mods)
 
@@ -468,9 +470,6 @@ def update(self, callback: Optional[dict[Callable]] = None) -> None:
         if not self._download_modpack():
             raise RuntimeError("Failed to download modpack update")
 
-        # Clean old mods
-        self._clean_old_mods()
-
         options = {
             "skipDependenciesInstall": True,
         }
@@ -506,7 +505,7 @@ def _clean_old_mods(self) -> None:
                 mod_path = os.path.join(mods_dir, mod)
                 if os.path.isfile(mod_path) and mod.endswith(".jar"):
                     os.remove(mod_path)
-                    logging.info(f"Removed old mod: {mod_path}")
+            logging.info("Old mods cleaned up successfully.")
         else:
             logging.info("Mods directory does not exist, skipping cleanup.")
 

src/routes/index.py

@@ -66,17 +66,20 @@ async def init_tasks(self):
         self._latest_tasks_inited = self.page.loop.time()
 
     async def on_window_event(self, event: ft.WindowEvent):
-        logging.info(f"Window event: {event.type}")
         if (
             event.type == ft.WindowEventType.MINIMIZE
             or event.type == ft.WindowEventType.HIDE
+            or event.type == ft.WindowEventType.BLUR
         ):
             # kill all tasks when window is minimized
             self._server_status_task.cancel()
             self._check_launcher_updates_task.cancel()
             self._check_modpack_update_task.cancel()
             self._playtime_update_task.cancel()
-        elif event.type == ft.WindowEventType.FOCUS or event.type == ft.WindowEventType.RESTORE:
+        elif (
+            event.type == ft.WindowEventType.FOCUS
+            or event.type == ft.WindowEventType.RESTORE
+        ):
             # restart tasks when window is restored
             await self.init_tasks()
 
@@ -105,14 +108,14 @@ async def _check_launcher_updates(self):
             self.page.update()
 
     async def _check_modpack_update_async(self):
-        await asyncio.to_thread(self._check_modpack_update)
+        await asyncio.to_thread(self._check_modpack_update, force=True)
         while True:
             await asyncio.sleep(60)
             await asyncio.to_thread(self._check_modpack_update)
 
-    def _check_modpack_update(self):
+    def _check_modpack_update(self, force: bool = False):
         if self.page:
-            modpack._fetch_latest_index()
+            modpack._fetch_latest_index(force=force)
             if modpack.is_up_to_date():
                 return
             if modpack.installed_version == "unknown":
@@ -457,10 +460,10 @@ async def _server_status_update(self):
         while True:
             try:
                 await asyncio.to_thread(self._update_server_status)
-                await asyncio.sleep(10)
+                await asyncio.sleep(5)
             except Exception as e:
                 logging.info(f"Error updating server status: {e}")
-                await asyncio.sleep(10)
+                await asyncio.sleep(5)
 
     async def _playtime_update(self):
         while True:
@@ -528,10 +531,10 @@ def _check_game(self, event: ft.TapEvent):
             self._install_minecraft()
         # check if modpack version is latest
         elif not modpack.is_up_to_date():
-            self._update_modpack()
+            self._update_modpack(event)
         # check if modpack installed correctly
         elif not modpack.verify_installation():
-            self._update_modpack()
+            self._update_modpack(event)
         else:
             self._launch_minecraft(modpack.modloader_full)
 
@@ -633,7 +636,7 @@ def _install_minecraft(self):
         if self.page is not None:
             self.page.update()
 
-    def _update_modpack(self):
+    def _update_modpack(self, event: ft.TapEvent):
         logging.info("Updating modpack...")
         self._progress_bar.visible = True
         self._progress_text.visible = True
@@ -654,12 +657,9 @@ def _update_modpack(self):
         self._check_game_button_enable()
         self._play_button_enable()
         # update version column
-        self._version_column.controls[
-            0
-        ].value = f"Встановлена версія: {modpack.installed_version}"
-        self._version_column.controls[
-            1
-        ].value = f"Остання версія: {modpack.remote_version}"
+        self._version_tooltip.message = (
+            f"Встановлено останню версію: {modpack.installed_version}"
+        )
 
         if self.page is not None:
             self.page.update()

src/stats.py

@@ -17,7 +17,6 @@ async def get_player_stats(self, uuid: str):
             params={"player": uuid}
         )
         # Raise an error if the request was unsuccessful
-        response.raise_for_status()
         if response.status_code == 403:
             # rate limit exceeded
             return None