Run Ruff across repository and apply lint fixes

toraidl · toraidl · commit e596b5ac0582 · 2026-03-20T16:44:59.000+08:00
Applied repository-wide ruff cleanup and manual follow-up fixes so that 'ruff check .' passes cleanly.

Includes import sorting, unused import/variable cleanup, minor string literal simplifications, and targeted exception-handling improvements (raise-from) flagged by Ruff.

Also fixed remaining non-auto-fixable issues in device_auto_config, payload_dumper, lpunpack, installer example code, and sdat2img.
diff --git a/examples/modifier_plugins_example.py b/examples/modifier_plugins_example.py
@@ -3,10 +3,11 @@
 This example shows how to extend the ROM modification system with custom plugins.
 """
 from pathlib import Path
+
 from src.core.modifiers import (
-    SystemModifier,
     ModifierPlugin,
     ModifierRegistry,
+    SystemModifier,
 )
 
 
@@ -22,9 +23,6 @@ def modify(self) -> bool:
         """Apply custom theme."""
         self.logger.info("Applying custom theme...")
         
-        # Access target directory
-        target_dir = self.ctx.target_dir
-        
         # Example: Copy theme files
         theme_dir = Path("themes/my_custom_theme")
         if theme_dir.exists():
@@ -77,7 +75,6 @@ def modify(self) -> bool:
 # Usage examples
 def example_basic_usage(ctx):
     """Basic plugin usage."""
-    from src.core.modifiers import SystemModifier
     
     # Create system modifier (auto-registers default plugins)
     modifier = SystemModifier(ctx)
@@ -91,7 +88,6 @@ def example_basic_usage(ctx):
 
 def example_plugin_management(ctx):
     """Advanced plugin management."""
-    from src.core.modifiers import SystemModifier, PluginManager
     
     modifier = SystemModifier(ctx)
     
diff --git a/examples/monitoring_example.py b/examples/monitoring_example.py
@@ -8,10 +8,8 @@
 # Add project root to path
 sys.path.insert(0, str(Path(__file__).parent.parent))
 
-from src.core.monitoring import Monitor, get_monitor, monitored
+from src.core.monitoring import Monitor, get_monitor
 from src.core.monitoring.console_ui import ConsoleReporter
-from src.core.modifiers import SystemModifier, PluginManager
-from src.core.modifiers.plugin_system import ModifierPlugin
 
 
 def example_basic_monitoring():
@@ -110,7 +108,7 @@ def example_tracing():
     
     # Print trace
     trace = monitor.report.execution_tracer.to_dict()
-    print(f"\nExecution Trace:")
+    print("\nExecution Trace:")
     print(f"  Total operations: {trace['summary']['total_operations']}")
     print(f"  Successful: {trace['summary']['successful_operations']}")
     print(f"  Total duration: {trace['summary']['total_duration']:.2f}s")
diff --git a/src/core/__init__.py b/src/core/__init__.py
@@ -1,6 +1,6 @@
 """Core modules for HyperOS Porting Tool."""
 
-from src.core.cache_manager import PortRomCacheManager, FileLock, CacheMetadata
+from src.core.cache_manager import CacheMetadata, FileLock, PortRomCacheManager
 
 __all__ = [
     "PortRomCacheManager",
diff --git a/src/core/config_schema.py b/src/core/config_schema.py
@@ -4,9 +4,8 @@
 """
 
 import json
-from typing import Any, Dict, List, Optional, Tuple
 from pathlib import Path
-
+from typing import Any, Dict, List, Optional, Tuple
 
 # Schema for replacements.json
 REPLACEMENTS_SCHEMA: Dict[str, Any] = {
diff --git a/src/core/device_auto_config.py b/src/core/device_auto_config.py
@@ -339,7 +339,7 @@ def auto_configure_device(
                 device_code = fallback_device_code
                 payload_info = PayloadDumperOutput()
             else:
-                raise RuntimeError(f"Could not determine device code: {e}")
+                raise RuntimeError(f"Could not determine device code: {e}") from e
 
     auto_config = DeviceAutoConfig(device_code, payload_info, stock_props)
     return auto_config.setup_device()
diff --git a/src/core/modifier.py b/src/core/modifier.py
@@ -13,11 +13,11 @@
 import warnings
 
 from src.core.modifiers import (
-    SmaliArgs,
-    SystemModifier,
-    FrameworkModifier,
     FirmwareModifier,
+    FrameworkModifier,
     RomModifier,
+    SmaliArgs,
+    SystemModifier,
 )
 
 # Emit deprecation warning
diff --git a/src/core/modifiers/firmware_modifier.py b/src/core/modifiers/firmware_modifier.py
@@ -4,12 +4,12 @@
 import re
 import shutil
 import tempfile
+import urllib.request
 from pathlib import Path
 from typing import Optional
-import urllib.request
 
-from src.utils.shell import ShellRunner
 from src.core.modifiers.base_modifier import BaseModifier
+from src.utils.shell import ShellRunner
 
 
 class FirmwareModifier(BaseModifier):
@@ -41,14 +41,14 @@ def __init__(self, context):
             self.repo_name = self.ctx.device_config.get("ksu_repo_name", self.repo_name)
             self.ksu_config_url_template = self.ctx.device_config.get(
                 "ksu_gh_api_url_template",
-                f"https://api.github.com/repos/{{owner}}/{{repo}}/releases/latest",
+                "https://api.github.com/repos/{owner}/{repo}/releases/latest",
             )
         else:
             # Use config directly from ctx if available
             self.ksu_config_url_template = getattr(
                 self.ctx,
                 "ksu_gh_api_url_template",
-                f"https://api.github.com/repos/{{owner}}/{{repo}}/releases/latest",
+                "https://api.github.com/repos/{owner}/{repo}/releases/latest",
             )
 
     def run(self):
diff --git a/src/core/modifiers/framework/__init__.py b/src/core/modifiers/framework/__init__.py
@@ -12,17 +12,17 @@
 
 from __future__ import annotations
 
-from src.core.modifiers.framework.modifier import FrameworkModifier
 from src.core.modifiers.framework.base import FrameworkModifierBase
-from src.core.modifiers.framework.tasks import FrameworkTasks
+from src.core.modifiers.framework.modifier import FrameworkModifier
 from src.core.modifiers.framework.patches import (
-    RETRUN_TRUE,
-    RETRUN_FALSE,
-    REMAKE_VOID,
     INVOKE_TRUE,
-    PRELOADS_SHAREDUIDS,
     MY_PLATFORM_KEY,
+    PRELOADS_SHAREDUIDS,
+    REMAKE_VOID,
+    RETRUN_FALSE,
+    RETRUN_TRUE,
 )
+from src.core.modifiers.framework.tasks import FrameworkTasks
 
 __all__ = [
     "FrameworkModifier",
diff --git a/src/core/modifiers/framework_modifier.py b/src/core/modifiers/framework_modifier.py
@@ -20,15 +20,15 @@
 
 # Re-export all components from the new location for backward compatibility
 from src.core.modifiers.framework import (
+    INVOKE_TRUE,
+    MY_PLATFORM_KEY,
+    PRELOADS_SHAREDUIDS,
+    REMAKE_VOID,
+    RETRUN_FALSE,
+    RETRUN_TRUE,
     FrameworkModifier,
     FrameworkModifierBase,
     FrameworkTasks,
-    RETRUN_TRUE,
-    RETRUN_FALSE,
-    REMAKE_VOID,
-    INVOKE_TRUE,
-    PRELOADS_SHAREDUIDS,
-    MY_PLATFORM_KEY,
 )
 
 # Emit deprecation warning
diff --git a/src/core/modifiers/plugins/__init__.py b/src/core/modifiers/plugins/__init__.py
@@ -3,11 +3,11 @@
 This module contains plugins for common modification tasks.
 """
 
-from src.core.modifiers.plugins.wild_boost import WildBoostPlugin
 from src.core.modifiers.plugins.eu_localization import EULocalizationPlugin
 from src.core.modifiers.plugins.feature_unlock import FeatureUnlockPlugin
-from src.core.modifiers.plugins.vndk_fix import VNDKFixPlugin
 from src.core.modifiers.plugins.file_replacement import FileReplacementPlugin
+from src.core.modifiers.plugins.vndk_fix import VNDKFixPlugin
+from src.core.modifiers.plugins.wild_boost import WildBoostPlugin
 
 __all__ = [
     "WildBoostPlugin",
diff --git a/src/core/modifiers/plugins/apk/__init__.py b/src/core/modifiers/plugins/apk/__init__.py
@@ -5,13 +5,13 @@
 """
 
 from src.core.modifiers.plugins.apk.base import ApkModifierPlugin, ApkModifierRegistry
+from src.core.modifiers.plugins.apk.devices_overlay import DevicesOverlayModifier
+from src.core.modifiers.plugins.apk.htmlviewer import HTMLViewerModifier
 from src.core.modifiers.plugins.apk.installer import InstallerModifier
-from src.core.modifiers.plugins.apk.securitycenter import SecurityCenterModifier
-from src.core.modifiers.plugins.apk.settings import SettingsModifier
 from src.core.modifiers.plugins.apk.joyose import JoyoseModifier
 from src.core.modifiers.plugins.apk.powerkeeper import PowerKeeperModifier
-from src.core.modifiers.plugins.apk.devices_overlay import DevicesOverlayModifier
-from src.core.modifiers.plugins.apk.htmlviewer import HTMLViewerModifier
+from src.core.modifiers.plugins.apk.securitycenter import SecurityCenterModifier
+from src.core.modifiers.plugins.apk.settings import SettingsModifier
 
 __all__ = [
     "ApkModifierPlugin",
diff --git a/src/core/modifiers/plugins/apk/installer.py b/src/core/modifiers/plugins/apk/installer.py
@@ -223,9 +223,7 @@ def _disable_upload_and_intercept(self, work_dir: Path):
     def _remove_network_error_ui(self, work_dir: Path):
         """Remove Network Error UI."""
         self.logger.info("Removing Network Error UI...")
-        
-        res_dir = work_dir / "res"
-        
+
         # Find Layout IDs and disable their usage
         layout_ids = [
             "layout_network_error",
diff --git a/src/core/modifiers/plugins/eu_localization.py b/src/core/modifiers/plugins/eu_localization.py
@@ -7,13 +7,13 @@
 """
 
 import json
+import re
 import shutil
+import subprocess
 import tempfile
 import zipfile
-import subprocess
-import re
 from pathlib import Path
-from typing import Any, Dict, List, Union
+from typing import Any, Dict, List
 
 from src.core.modifiers.plugin_system import ModifierPlugin, ModifierRegistry
 
diff --git a/src/core/modifiers/plugins/file_replacement.py b/src/core/modifiers/plugins/file_replacement.py
@@ -22,8 +22,8 @@ class FileReplacementPlugin(ModifierPlugin):
 
     def __init__(self, context, **kwargs):
         super().__init__(context, **kwargs)
-        from src.core.config_merger import ConfigMerger
         from src.core.conditions import ConditionEvaluator
+        from src.core.config_merger import ConfigMerger
         from src.utils.shell import ShellRunner
 
         self.merger = ConfigMerger(self.logger)
diff --git a/src/core/rom/constants.py b/src/core/rom/constants.py
@@ -3,7 +3,6 @@
 from enum import Enum, auto
 from typing import List
 
-
 ANDROID_LOGICAL_PARTITIONS: List[str] = [
     "system",
     "system_ext",
diff --git a/src/utils/contextpatch.py b/src/utils/contextpatch.py
@@ -1,11 +1,11 @@
+import logging
 import os
-from re import sub
 from difflib import SequenceMatcher
-import logging
 from pathlib import Path
-
+from re import sub
 from typing import Generator
 
+
 class ContextPatcher:
     def __init__(self):
         self.logger = logging.getLogger("ContextPatcher")
diff --git a/src/utils/download.py b/src/utils/download.py
@@ -1,8 +1,9 @@
-import os
 import logging
 from pathlib import Path
+
 from .file_downloader import download_file
 
+
 class AssetDownloader:
     def __init__(self, repo="toraidl/HyperOS-Port-Python", tag="assets"):
         self.repo = repo
diff --git a/src/utils/downloader.py b/src/utils/downloader.py
@@ -1,13 +1,14 @@
-import shutil
-import platform
 import logging
-import zipfile
-import tarfile
 import os
-import re
+import platform
+import shutil
+import tarfile
+import zipfile
 from pathlib import Path
-from src.utils.shell import ShellRunner
+
 from src.utils.file_downloader import download_file
+from src.utils.shell import ShellRunner
+
 
 class Aria2Manager:
     def __init__(self):
diff --git a/src/utils/file_downloader.py b/src/utils/file_downloader.py
@@ -1,9 +1,10 @@
+import logging
 import sys
 import urllib.request
-import logging
 from pathlib import Path
 from typing import Optional
 
+
 def download_file(url: str, target_path: Path, logger: Optional[logging.Logger] = None) -> bool:
     """
     Download a file from a URL with a text-based progress bar using only standard libraries.
diff --git a/src/utils/fspatch.py b/src/utils/fspatch.py
@@ -1,5 +1,5 @@
-import os
 import logging
+import os
 from pathlib import Path
 
 logger = logging.getLogger("FsPatcher")
diff --git a/src/utils/lpunpack.py b/src/utils/lpunpack.py
@@ -9,7 +9,7 @@
 from dataclasses import dataclass, field
 from pathlib import Path
 from string import Template
-from typing import IO, Dict, List, TypeVar, cast, BinaryIO
+from typing import IO, BinaryIO, Dict, List, TypeVar, cast
 
 SPARSE_HEADER_MAGIC = 0xED26FF3A
 SPARSE_HEADER_SIZE = 28
@@ -533,8 +533,7 @@ def get_size(index):
             }
         except Exception:
             pass
-        finally:
-            return result
+        return result
 
     def to_json(self) -> str:
         data = self._get_info()
@@ -797,8 +796,8 @@ def _read_metadata(self):
             super_device: LpMetadataBlockDevice = cast(LpMetadataBlockDevice, iter(metadata.block_devices).__next__())
             if metadata.metadata_region > super_device.first_logical_sector * LP_SECTOR_SIZE:
                 raise LpUnpackError('Logical partition metadata overlaps with logical partition contents.')
-        except StopIteration:
-            raise LpUnpackError('Metadata does not specify a super device.')
+        except StopIteration as err:
+            raise LpUnpackError('Metadata does not specify a super device.') from err
 
         return metadata
 
@@ -834,7 +833,7 @@ def unpack(self):
 
             if self._partition_name:
                 filter_partition = []
-                for index, partition in enumerate(metadata.partitions):
+                for _index, partition in enumerate(metadata.partitions):
                     if partition.name in self._partition_name:
                         filter_partition.append(partition)
 
@@ -855,7 +854,7 @@ def unpack(self):
                         print(f"{metadata.to_json()}\n")
 
             if not self._show_info and self._out_dir is None:
-                raise LpUnpackError(message=f'Not specified directory for extraction')
+                raise LpUnpackError(message='Not specified directory for extraction')
 
             if self._out_dir:
                 for partition in metadata.partitions:
diff --git a/src/utils/otatools_manager.py b/src/utils/otatools_manager.py
@@ -1,8 +1,5 @@
-import os
-import shutil
-import zipfile
 import logging
-import urllib.request
+import zipfile
 from pathlib import Path
 from typing import Optional
 
diff --git a/src/utils/payload_dumper.py b/src/utils/payload_dumper.py
@@ -401,7 +401,7 @@ def extract_device_info(
             logger.info(f"Using fallback device code: {fallback_device_code}")
             # Return empty output with fallback code
             return fallback_device_code, PayloadDumperOutput()
-        raise RuntimeError(f"Failed to extract device info and no fallback provided: {e}")
+        raise RuntimeError(f"Failed to extract device info and no fallback provided: {e}") from e
 
 
 def get_partition_list_from_payload(payload_path: Path) -> List[str]:
diff --git a/src/utils/sdat2img.py b/src/utils/sdat2img.py
diff --git a/src/utils/shell.py b/src/utils/shell.py
diff --git a/src/utils/sync_engine.py b/src/utils/sync_engine.py
diff --git a/src/utils/xml_utils.py b/src/utils/xml_utils.py
diff --git a/tools/cache_manager.py b/tools/cache_manager.py
diff --git a/tools/generate_eu_bundle.py b/tools/generate_eu_bundle.py
