Fix bugs

Author: XFY9326

.github/workflows/automatic-update.yml

@@ -12,18 +12,18 @@ jobs:
       contents: write
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           persist-credentials: false
           fetch-depth: 0
       - name: Setup Python uv
-        uses: astral-sh/setup-uv@v5
+        uses: astral-sh/setup-uv@v7
         with:
           python-version: "3.12"
-          enable-cache: true
+          enable-cache: "auto"
           cache-dependency-glob: "**/pyproject.toml"
       - name: Setup java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: "temurin"
           java-version: "17"
@@ -33,7 +33,8 @@ jobs:
             libs/PlatformTools/**/gradle-wrapper.properties
       - name: Run scripts
         run: uv run src/main.py
-      - name: Push updates
-        uses: GuillaumeFalourd/git-commit-push@v1.3
+      - name: Commit & Push changes
+        uses: actions-js/push@master
         with:
-          commit_message: Automatic update ${{ steps.date.outputs.date }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          message: Automatic update ${{ steps.date.outputs.date }}

src/android_info/consts.py

@@ -65,4 +65,5 @@
     34: ["14.0.0"],
     35: ["15.0.0"],
     36: ["16.0.0"],
+    37: ["17.0.0"],
 }

src/android_info/repository.py

@@ -9,6 +9,7 @@
 # noinspection PyProtectedMember
 from lxml.etree import _Element
 
+from .task import SingleFlight
 from .utils import xml_to_dict
 
 # noinspection HttpUrlsUsage
@@ -32,6 +33,7 @@ class AndroidRepository:
     def __init__(self, client: aiohttp.ClientSession):
         self._client = client
         self._tree: _Element | None = None
+        self._task_manager: SingleFlight = SingleFlight()
 
     @staticmethod
     def cached_instance(client: aiohttp.ClientSession) -> 'AndroidRepository':
@@ -120,7 +122,7 @@ def get_best_archive_url(pkg_dict: dict) -> str:
         else:
             raise ValueError(f"Unknown archives format: {archives}")
 
-    async def download_archive(self, archive_name: str, output_dir: str | None = None) -> str:
+    async def _download_archive_task(self, archive_name: str, output_dir: str | None) -> str:
         if output_dir is None:
             output_dir = "."
         if not os.path.isdir(output_dir):
@@ -138,6 +140,14 @@ async def download_archive(self, archive_name: str, output_dir: str | None = Non
             raise ValueError(f"Missing download tmp: {tmp_file_path}")
         return target_file_path
 
+    async def download_archive(self, archive_name: str, output_dir: str | None = None) -> str:
+        return await self._task_manager.run(
+            archive_name,
+            self._download_archive_task,
+            archive_name,
+            output_dir
+        )
+
     async def get_packages(self, path: str, channel: str | None = None) -> list[dict]:
         pkg_elements = await self._get_package_elements(path)
         return sorted([

src/android_info/task.py

@@ -0,0 +1,48 @@
+import asyncio
+from typing import Callable, Awaitable, ParamSpec, TypeVar
+
+P = ParamSpec("P")
+R = TypeVar("R")
+
+
+class SingleFlight:
+    def __init__(self) -> None:
+        self._locks: dict[str, asyncio.Lock] = {}
+        self._futures: dict[str, asyncio.Future] = {}
+        self._global_lock: asyncio.Lock = asyncio.Lock()
+
+    async def run(
+            self,
+            key: str,
+            coro_factory: Callable[P, Awaitable[R]],
+            *args: P.args,
+            **kwargs: P.kwargs,
+    ) -> R:
+        loop = asyncio.get_running_loop()
+
+        async with self._global_lock:
+            if key not in self._locks:
+                self._locks[key] = asyncio.Lock()
+                self._futures[key] = loop.create_future()
+
+            lock = self._locks[key]
+            future = self._futures[key]
+
+            if lock.locked() and not future.done():
+                return await future
+
+        async with lock:
+            if future.done():
+                return future.result()
+
+            try:
+                result = await coro_factory(*args, **kwargs)
+                future.set_result(result)
+                return result
+            except Exception as e:
+                future.set_exception(e)
+                raise
+            finally:
+                async with self._global_lock:
+                    self._locks.pop(key, None)
+                    await self._futures.pop(key, None)

src/main.py

@@ -2,6 +2,7 @@
 import http
 import json
 import os
+from typing import Any
 
 import aiofiles.os
 import aiohttp
@@ -35,7 +36,7 @@ def filter_available_api_levels(api_levels: list[AndroidAPILevel]) -> list[Andro
     return [i for i in api_levels if i.api >= 4 and i.api != 11 and i.api != 12 and i.api != 20]
 
 
-async def dump_json(data: any, output_path: str):
+async def dump_json(data: Any, output_path: str):
     async with aiofiles.open(output_path, "w", encoding="utf-8") as f:
         await f.write(json.dumps(data, ensure_ascii=False, indent=4))