fix: use f.tell to get file size

yeah, it fixes continuous downloading

setup.py

@@ -10,9 +10,9 @@ README = (HERE / "README.md").read_text()
 
 setup(
     name='worthless',
-    version='2.2.20',
+    version='2.2.22',
     packages=['worthless', 'worthless.classes', 'worthless.classes.launcher', 'worthless.classes.installer'],
-    url='https://git.froggi.es/tretrauit/worthless-launcher',
+    url='https://git.tretrauit.me/tretrauit/worthless-launcher',
     license='MIT License',
     author='tretrauit',
     author_email='tretrauit@gmail.org',

worthless/__init__.py

@@ -4,4 +4,4 @@ Launcher = launcher.Launcher
 Installer = installer.Installer
 
 
-__version__ = "2.2.20"
+__version__ = "2.2.22"

worthless/cli.py

@@ -169,7 +169,8 @@ class UI:
             return
         await self.download_game()
         print("Game archive:", game.latest.get_name())
-        await self._install_from_archive(self._installer.temp_path.joinpath(game.latest.get_name()), forced)
+        # I'm too lazy to properly fix things so here we are :D
+        await self._install_from_archive(self._installer.temp_path.joinpath(game.latest.segments[0]["path"].split("/")[-1]), forced)
 
     async def install_voiceover(self, languages: str):
         res_info = await self._launcher.get_resource_info()

worthless/installer.py

@@ -26,12 +26,13 @@ async def _download_file(file_url: str, file_name: str, file_path: Path | str, f
     headers = {}
     file_path = Path(file_path).joinpath(file_name)
     if overwrite:
-        await file_path.unlink(missing_ok=True)
+        file_path.unlink(missing_ok=True)
     if file_path.exists():
-        cur_len = (file_path.stat()).st_size
-        headers |= {
+        with file_path.open("rb") as f:
+            cur_len = f.tell()
+        headers |= { 
             "Range": f"bytes={cur_len}-{file_len if file_len else ''}"
-        }
+        } 
     else:
         file_path.touch()
     print(f"Downloading {file_url} to {file_path}...")
@@ -40,13 +41,9 @@ async def _download_file(file_url: str, file_name: str, file_path: Path | str, f
         if rsp.status == 416:
             return
         rsp.raise_for_status()
-        while True:
-            chunk = await rsp.content.read(chunks)
-            await asyncio.sleep(0)
-            if not chunk:
-                break
-            with file_path.open("ab") as f:
-                f.write(chunk)
+        with file_path.open("ab") as f:
+            async for data in rsp.content.iter_chunked(chunks):
+                f.write(data)
 
 
 def calculate_md5(file_to_calculate):
@@ -78,19 +75,28 @@ class HDiffPatch:
 
     @staticmethod
     def _get_platform_arch():
+        processor = platform.machine()
         match platform.system():
             case "Windows":
-                match platform.architecture()[0]:
-                    case "32bit":
+                match processor:
+                    case "i386":
                         return "windows32"
-                    case "64bit":
+                    case "x86_64":
                         return "windows64"
+                    case "arm":
+                        return "windows_arm32"
+                    case "arm64":
+                        return "windows_arm64"
             case "Linux":
-                match platform.architecture()[0]:
-                    case "32bit":
+                match processor:
+                    case "i386":
                         return "linux32"
-                    case "64bit":
+                    case "x86_64":
                         return "linux64"
+                    case "arm":
+                        return "linux_arm32"
+                    case "arm64":
+                        return "linux_arm64"
             case "Darwin":
                 return "macos"
 
@@ -140,10 +146,13 @@ class HDiffPatch:
             rsp = await session.get("https://api.github.com/repos/{}/{}/releases/latest".format(owner, repo),
                                     params={"Headers": "Accept: application/vnd.github.v3+json"})
             rsp.raise_for_status()
+            archive_processor = self._get_platform_arch()
             for asset in (await rsp.json())["assets"]:
-                if asset["name"].endswith(".zip") and "linux" not in asset["name"] and "windows" not in asset["name"] \
-                        and "macos" not in asset["name"] and "android" not in asset["name"]:
-                    return asset
+                if not asset["name"].endswith(".zip"):
+                    continue
+                if archive_processor not in asset["name"]:
+                    continue
+                return asset
 
     async def get_latest_release_url(self):
         asset = await self._get_latest_release_info()
@@ -397,7 +406,10 @@ class Installer:
                     print("Failed to patch {}, reverting and let the in-game updater do the job...".format(
                         old_file.with_suffix(old_suffix))
                     )
-                    old_file.rename(old_file.with_suffix(old_suffix))
+                    try:
+                        old_file.rename(old_file.with_suffix(old_suffix))
+                    except Exception:
+                        pass
 
                 files.remove(patch_file)
                 # Limit to 8 process running so it doesn't hang the PC.
@@ -442,25 +454,26 @@ class Installer:
 
     async def download_full_game(self, pre_download=False):
         game = await self._get_game(pre_download)
-        if not game.latest.path == "":
-            archive_name = game.latest.path.split("/")[-1]
-            if calculate_md5(self.temp_path.joinpath(archive_name)) != game.latest.md5:
-                raise RuntimeError("mismatch md5 for downloaded game archive")
-            return
         # Segment download
-        base_archive = None
-        for i, segment in enumerate(game.latest.segments):
+        # base_archive = None
+        for _, segment in enumerate(game.latest.segments):
             archive_name = segment["path"].split("/")[-1]
-            if i == 0:
-                base_archive = archive_name = Path(archive_name).stem  # Remove .001
-            if self.temp_path.joinpath(archive_name + ".downloaded").exists():
+            if self.temp_path.joinpath(archive_name + ".downloaded").exists() and self.temp_path.joinpath(archive_name).exists():
+                print(f"calculating md5 for downloaded game archive: {archive_name}")
+                md5 = calculate_md5(self.temp_path.joinpath(archive_name))
+                if md5 != segment["md5"]:
+                    print(f"mismatch md5 for downloaded game archive: {archive_name} ({md5}; expected {segment['md5']}), continuing anyway...")
                 continue
             await self._download_file(segment["path"], archive_name)
-            if i != 0:
-                with open(self.temp_path.joinpath(base_archive), 'ab') as f:
-                    with open(self.temp_path.joinpath(archive_name), 'rb') as f2:
-                        f.write(f2.read())
-                self.temp_path.joinpath(archive_name).unlink()
+            print(f"calculating md5 for downloaded game archive: {archive_name}")
+            md5 = calculate_md5(self.temp_path.joinpath(archive_name))
+            if md5 != segment["md5"]:
+                print(f"mismatch md5 for downloaded game archive: {archive_name} ({md5}; expected {segment['md5']}), continuing anyway...")
+            # if i != 0:
+            #     with open(self.temp_path.joinpath(base_archive), 'ab') as f:
+            #         with open(self.temp_path.joinpath(archive_name), 'rb') as f2:
+            #             shutil.copyfileobj(f2, f)
+            #     self.temp_path.joinpath(archive_name).unlink()
             self.temp_path.joinpath(archive_name + ".downloaded").touch()
             
 
@@ -474,13 +487,21 @@ class Installer:
     async def uninstall_game(self):
         await asyncio.to_thread(shutil.rmtree, self._gamedir, ignore_errors=True)
 
-    async def _extract_game_file(self, archive: str | Path | Path):
+    async def _extract_game_file(self, archive: str | Path):
         if isinstance(archive, str | Path):
             archive = Path(archive).resolve()
         if not archive.exists():
             raise FileNotFoundError(f"'{archive}' not found")
-        with zipfile.ZipFile(archive, 'r') as f:
-            await asyncio.to_thread(f.extractall, path=self._gamedir)
+        game_dir_str = str(self._gamedir)
+        if not game_dir_str.endswith("/"):
+            game_dir_str += "/"
+        print(f'-o"{game_dir_str}"')
+        proc = await asyncio.create_subprocess_shell(f'7z x {str(archive)} -o"{game_dir_str}"')
+        await proc.wait()
+        if proc.returncode != 0:
+            raise RuntimeError("Extracting failed")
+        # with zipfile.ZipFile(archive, 'r') as f:
+        #     await asyncio.to_thread(f.extractall, path=self._gamedir)
 
     async def apply_voiceover(self, voiceover_archive: str | Path):
         # Since Voiceover packages are unclear about diff package or full package
@@ -498,7 +519,9 @@ class Installer:
 
         If `force_reinstall` is True, the game will be uninstalled then reinstalled.
         """
-        if self.get_game_data_path().exists():
+        if self.get_game_data_path().exists() \
+            and all([self._gamedir.joinpath(x).exists() for x in ["UnityPlayer.dll", "pkg_version"]]) \
+            and any([self._gamedir.joinpath(x).exists() for x in ["GenshinImpact.exe", "YuanShen.exe"]]):
             if not force_reinstall:
                 raise ValueError(f"Game is already installed in {self._gamedir}")
             await self.uninstall_game()

worthless/patcher.py

@@ -28,7 +28,7 @@ except ImportError:
 
 
 class Patcher:
-    def __init__(self, gamedir: Path | AsyncPath | str = AsyncPath.cwd(), data_dir: str | Path | AsyncPath = None,
+    def __init__(self, gamedir: Path | AsyncPath | str = Path.cwd(), data_dir: str | Path | AsyncPath = None,
                  patch_url: str = None, overseas=True, patch_provider="Krock"):
         if isinstance(gamedir, str | Path):
             gamedir = AsyncPath(gamedir)