1. optimized memory usage

2. fixed typos
3. temp. fix for runtime error on windows

Author: code-rgb

xapps2/__main__.py

@@ -6,12 +6,20 @@
 if __name__ == "__main__":
     if sys.platform == "win32":
         policy = asyncio.WindowsProactorEventLoopPolicy()
+        asyncio.set_event_loop_policy(policy)
+        loop = asyncio.get_event_loop()
+        try:
+            loop.run_until_complete(main())
+            # https://github.com/encode/httpx/issues/914
+            loop.run_until_complete(asyncio.sleep(1))
+        finally:
+            loop.close()
     else:
         try:
             import uvloop
         except ImportError:
             policy = asyncio.DefaultEventLoopPolicy()
         else:
             policy = uvloop.EventLoopPolicy()
-    asyncio.set_event_loop_policy(policy)
-    asyncio.run(main())
+        asyncio.set_event_loop_policy(policy)
+        asyncio.run(main())

xapps2/main.py

@@ -32,16 +32,19 @@ async def main():
 
         tasks: List = []
 
-        sem = asyncio.Semaphore(8)
+        sem = asyncio.Semaphore(4)
 
         for addon in apps_conf["addons"]:
-            if func := getattr(apk_dl, addon, None):
-                file_ext = ".zip" if "nikgapps" in addon else ".apk"
+            addon_split = addon.split("@", 1)
+            if func := getattr(apk_dl, addon_split[0], None):
+                filename = "_".join(addon_split) + (
+                    ".zip" if addon_split[0] == "nikgapps" else ".apk"
+                )
                 tasks.append(
                     (
-                        addon.replace("@", "_") + file_ext,
+                        filename,
                         sem,
-                        func(*addon.split("@", 1)[1:]),
+                        func(*addon_split[1:]),
                     )
                 )
 

xapps2/miscdl.py

@@ -103,7 +103,7 @@ async def nekox(self, varient: str = "mini") -> Optional[str]:
             "NekoX-Dev/NekoX", f"NekoX-{varient}-{DEVICE.arch}-release.apk"
         )
 
-    async def niksgapps(self, varient: str = "basic") -> Optional[str]:
+    async def nikgapps(self, varient: str = "basic") -> Optional[str]:
         if DEVICE.arch != "arm64-v8a":
             return
         if link := await get_nikgapps(DEVICE.android_str, varient):

xapps2/playstoredl.py

@@ -28,8 +28,7 @@ def __init__(self):
             "lang": "en",
         }
 
-    async def _playstore_fetch(self, package_name: str) -> Optional[str]:
-        page = await self.browser.newPage()
+    async def _playstore_fetch(self, page, package_name: str) -> Optional[str]:
         await page.setUserAgent(self.ua)
         url = f"{self.dl_site}?{urlencode({'package': package_name.strip(), **self.params})}"
         await page.goto(url)
@@ -54,17 +53,21 @@ async def _playstore_fetch(self, package_name: str) -> Optional[str]:
     async def playstore(self, package_name: str) -> Optional[str]:
         try_count = 0
         dl_link = None
+
         while not dl_link:
             try_count += 1
             LOG.info(f"Trying to connect to server: {try_count}")
             if try_count >= 8:
                 break
+            page = await self.browser.newPage()
             try:
-                dl_link = await self._playstore_fetch(package_name)
+                dl_link = await self._playstore_fetch(page, package_name)
             except Exception as e:
                 LOG.exception(f"{e.__class__.__name__}: {e}")
             else:
                 break
+            finally:
+                await page.close()
             # except pyppeteer.errors.PageError:
             #     pass