extract_utils: fixups_blob: fix typing

Change-Id: I475fc0b983ba71edf36eaa449cce9b94ce2bfa09

Author: Demon000

extract_utils/fixups_blob.py

@@ -12,7 +12,7 @@
 from contextlib import suppress
 from functools import partial
 from os import path
-from typing import List, Optional, Protocol
+from typing import Any, List, Optional, Protocol
 
 from extract_utils.elf import file_needs_lib
 from extract_utils.file import File
@@ -50,15 +50,21 @@ def __call__(
         ctx: BlobFixupCtx,
         file: File,
         file_path: str,
-        *args,
+        *args: Any,
         tmp_dir: Optional[str] = None,
-        **kwargs,
+        **kwargs: Any,
     ): ...
 
 
 class blob_fixup:
     def __init__(self):
-        self.__functions: List[tuple[blob_fixup_fn_impl_type, tuple, dict]] = []
+        self.__functions: List[
+            tuple[
+                blob_fixup_fn_impl_type,
+                tuple[blob_fixup_fn_impl_type],
+                dict[str, blob_fixup_fn_impl_type],
+            ]
+        ] = []
         self.__create_tmp_dir = False
 
         self.__patchelf_path = patchelf_version_path_map[
@@ -68,9 +74,9 @@ def __init__(self):
     def call(
         self,
         fn: blob_fixup_fn_impl_type,
-        *args,
-        need_tmp_dir=True,
-        **kwargs,
+        *args: Any,
+        need_tmp_dir: bool = True,
+        **kwargs: Any,
     ) -> blob_fixup:
         self.__functions.append((fn, args, kwargs))
         if need_tmp_dir:
@@ -88,8 +94,8 @@ def replace_needed_impl(
         ctx: BlobFixupCtx,
         file: File,
         file_path: str,
-        *args,
-        **kwargs,
+        *args: Any,
+        **kwargs: Any,
     ):
         run_cmd(
             [
@@ -120,8 +126,8 @@ def add_needed_impl(
         ctx: BlobFixupCtx,
         file: File,
         file_path: str,
-        *args,
-        **kwargs,
+        *args: Any,
+        **kwargs: Any,
     ):
         if file_needs_lib(file_path, lib):
             return
@@ -138,8 +144,8 @@ def remove_needed_impl(
         ctx: BlobFixupCtx,
         file: File,
         file_path: str,
-        *args,
-        **kwargs,
+        *args: Any,
+        **kwargs: Any,
     ):
         run_cmd([self.__patchelf_path, '--remove-needed', lib, file_path])
 
@@ -153,8 +159,8 @@ def clear_symbol_version_impl(
         ctx: BlobFixupCtx,
         file: File,
         file_path: str,
-        *args,
-        **kwargs,
+        *args: Any,
+        **kwargs: Any,
     ):
         run_cmd(
             [self.__patchelf_path, '--clear-symbol-version', symbol, file_path]
@@ -165,7 +171,12 @@ def clear_symbol_version(self, symbol: str) -> blob_fixup:
         return self.call(impl)
 
     def fix_soname_impl(
-        self, ctx: BlobFixupCtx, file: File, file_path: str, *args, **kwargs
+        self,
+        ctx: BlobFixupCtx,
+        file: File,
+        file_path: str,
+        *args: Any,
+        **kwargs: Any,
     ):
         run_cmd(
             [self.__patchelf_path, '--set-soname', file.basename, file_path]
@@ -182,7 +193,7 @@ def __get_patches(self, ctx: BlobFixupCtx, module_patches_path: str):
 
         assert path.isdir(patches_path)
 
-        patches = []
+        patches: List[str] = []
         for f in os.scandir(patches_path):
             if f.name.endswith('.patch'):
                 patches.append(f.path)
@@ -196,7 +207,7 @@ def __get_patch_affected_files(self, patch: str) -> List[str]:
             ['git', '--work-tree', os.devnull, 'apply', '--numstat', patch]
         )
 
-        files = []
+        files: List[str] = []
         for line in output.strip().splitlines():
             parts = line.split('\t')
             if len(parts) != 3:
@@ -208,7 +219,7 @@ def __get_patch_affected_files(self, patch: str) -> List[str]:
         return files
 
     def __get_patches_affected_files(self, patches: List[str]) -> List[str]:
-        affected_files = []
+        affected_files: List[str] = []
         for patch in patches:
             affected_files += self.__get_patch_affected_files(patch)
         return affected_files
@@ -234,7 +245,7 @@ def __get_apktool_unpack_args(
             if affected_file == APKTOOL_ANDROID_MANIFEST_NAME:
                 decode_manifest = True
 
-        unpack_args = []
+        unpack_args: List[str] = []
         if not decode_res and not decode_manifest:
             unpack_args.append(APKTOOL_NO_RES_ARG)
 
@@ -249,9 +260,9 @@ def patch_impl(
         ctx: BlobFixupCtx,
         file: File,
         file_path: str,
-        *args,
-        tmp_dir=None,
-        **kwargs,
+        *args: Any,
+        tmp_dir: Optional[str] = None,
+        **kwargs: Any,
     ):
         patches = self.__get_patches(ctx, patches_path)
         assert tmp_dir is not None
@@ -311,9 +322,9 @@ def copy_file_to_tmp_impl(
         ctx: BlobFixupCtx,
         file: File,
         file_path: str,
-        *args,
-        tmp_dir=None,
-        **kwargs,
+        *args: Any,
+        tmp_dir: Optional[str] = None,
+        **kwargs: Any,
     ):
         assert tmp_dir is not None
         shutil.copy(file_path, tmp_dir)
@@ -326,9 +337,9 @@ def copy_file_from_tmp_impl(
         ctx: BlobFixupCtx,
         file: File,
         file_path: str,
-        *args,
-        tmp_dir=None,
-        **kwargs,
+        *args: Any,
+        tmp_dir: Optional[str] = None,
+        **kwargs: Any,
     ):
         assert tmp_dir is not None
         tmp_file_path = path.join(tmp_dir, file.basename)
@@ -348,10 +359,10 @@ def apktool_unpack_impl(
         ctx: BlobFixupCtx,
         file: File,
         file_path: str,
-        *args,
-        tmp_dir=None,
-        patches_path: Optional[str] = None,
-        **kwargs,
+        *args: Any,
+        patches_path: str,
+        tmp_dir: Optional[str] = None,
+        **kwargs: Any,
     ):
         assert tmp_dir is not None
 
@@ -373,7 +384,7 @@ def apktool_unpack_impl(
 
     def apktool_unpack(
         self,
-        patches_path: Optional[str] = None,
+        patches_path: str,
     ) -> blob_fixup:
         impl = partial(
             self.apktool_unpack_impl,
@@ -386,9 +397,9 @@ def apktool_pack_impl(
         ctx: BlobFixupCtx,
         file: File,
         file_path: str,
-        *args,
-        tmp_dir=None,
-        **kwargs,
+        *args: Any,
+        tmp_dir: Optional[str] = None,
+        **kwargs: Any,
     ):
         assert tmp_dir is not None
 
@@ -408,7 +419,12 @@ def apktool_pack(self) -> blob_fixup:
         return self.call(self.apktool_pack_impl, need_tmp_dir=True)
 
     def stripzip_impl(
-        self, ctx: BlobFixupCtx, file: File, file_path: str, *args, **kwargs
+        self,
+        ctx: BlobFixupCtx,
+        file: File,
+        file_path: str,
+        *args: Any,
+        **kwargs: Any,
     ):
         run_cmd(
             [
@@ -420,21 +436,30 @@ def stripzip_impl(
     def stripzip(self):
         return self.call(self.stripzip_impl)
 
-    def apktool_patch(self, patches_path: str, *args) -> blob_fixup:
+    def apktool_patch(
+        self,
+        patches_path: str,
+        *args: Any,
+    ) -> blob_fixup:
         if args:
             color_print(
                 'apktool_patch() no longer takes custom arguments',
                 color=Color.YELLOW,
             )
 
-        self.apktool_unpack(patches_path=patches_path)
+        self.apktool_unpack(patches_path)
         self.patch_dir(patches_path)
         self.apktool_pack()
         self.stripzip()
         return self
 
     def strip_debug_sections_impl(
-        self, ctx: BlobFixupCtx, file: File, file_path: str, *args, **kwargs
+        self,
+        ctx: BlobFixupCtx,
+        file: File,
+        file_path: str,
+        *args: Any,
+        **kwargs: Any,
     ):
         run_cmd(
             [
@@ -454,8 +479,8 @@ def regex_replace_impl(
         ctx: BlobFixupCtx,
         file: File,
         file_path: str,
-        *args,
-        **kwargs,
+        *args: Any,
+        **kwargs: Any,
     ):
         with open(file_path, 'r', newline='', encoding='utf-8') as f:
             data = f.read()
@@ -476,8 +501,8 @@ def binary_regex_replace_impl(
         ctx: BlobFixupCtx,
         file: File,
         file_path: str,
-        *args,
-        **kwargs,
+        *args: Any,
+        **kwargs: Any,
     ):
         with open(file_path, 'rb') as f:
             data = f.read()
@@ -498,8 +523,8 @@ def sig_replace_impl(
         ctx: BlobFixupCtx,
         file: File,
         file_path: str,
-        *args,
-        **kwargs,
+        *args: Any,
+        **kwargs: Any,
     ):
         with open(file_path, 'rb+') as f:
             data = f.read()
@@ -532,8 +557,8 @@ def fix_xml_impl(
         ctx: BlobFixupCtx,
         file: File,
         file_path: str,
-        *args,
-        **kwargs,
+        *args: Any,
+        **kwargs: Any,
     ):
         lines: list[str] = []
         with open(file_path, 'r', newline='', encoding='utf-8') as f:
@@ -556,8 +581,8 @@ def add_line_if_missing_impl(
         ctx: BlobFixupCtx,
         file: File,
         file_path: str,
-        *args,
-        **kwargs,
+        *args: Any,
+        **kwargs: Any,
     ):
         with open(file_path, 'r+', newline='', encoding='utf-8') as f:
             data = f.read()