refactor: 优化代码格式和结构

- 使用自动格式化工具重新格式化代码
- 调整缩进和换行方式
- 简化部分代码表达方式

Author: Jesse205

scripts/build_app.py

@@ -40,20 +40,25 @@ def build_with_pdm_packer():
     print("Building with pdm-packer...")
     ensure_dist_dir()
     os.environ["PYTHONOPTIMIZE"] = "2"
-    result = subprocess.run([
-        shutil.which("pdm"),
-        "pack",
-        "-m", "vcf_generator_lite.__main__:main",
-        "-o", os.path.join("dist", OUTPUT_BASE_NAME_TEMPLATE.format(
-            version=APP_VERSION,
-            platform=PLATFORM_PYTHON,
-            distribution="zipapp"
-        ) + ".pyzw"),
-        "--interpreter", f"/usr/bin/env python{PYTHON_VERSION}",
-        "--compile",
-        "--compress",
-        "--no-py",
-    ])
+    result = subprocess.run(
+        [
+            shutil.which("pdm"),
+            "pack",
+            "-m",
+            "vcf_generator_lite.__main__:main",
+            "-o",
+            os.path.join(
+                "dist",
+                OUTPUT_BASE_NAME_TEMPLATE.format(version=APP_VERSION, platform=PLATFORM_PYTHON, distribution="zipapp")
+                + ".pyzw",
+            ),
+            "--interpreter",
+            f"/usr/bin/env python{PYTHON_VERSION}",
+            "--compile",
+            "--compress",
+            "--no-py",
+        ]
+    )
     print("Building finished.")
     return result.returncode
 
@@ -66,29 +71,32 @@ def pack_with_innosetup() -> int:
             return result
 
     os.environ["PATH"] += os.pathsep + "C:\\Program Files (x86)\\Inno Setup 6\\"
-    result = subprocess.run([
-        shutil.which("iscc"),
-        "/D" + f"OutputBaseFilename={OUTPUT_BASE_NAME_TEMPLATE.format(
+    result = subprocess.run(
+        [
+            shutil.which("iscc"),
+            "/D"
+            + f"OutputBaseFilename={OUTPUT_BASE_NAME_TEMPLATE.format(
             version=APP_VERSION,
             platform=PLATFORM_NATIVE,
             distribution="setup"
         )}",
-        "/D" + f"MyAppCopyright={APP_COPYRIGHT}",
-        "/D" + f"MyAppVersion={APP_VERSION}",
-        os.path.abspath('setup.iss'),
-    ])
+            "/D" + f"MyAppCopyright={APP_COPYRIGHT}",
+            "/D" + f"MyAppVersion={APP_VERSION}",
+            os.path.abspath("setup.iss"),
+        ]
+    )
     print("Packaging finished.")
     return result.returncode
 
 
 def pack_with_zipfile():
     print("Packaging with ZipFile...")
     require_pyinstaller_output()
-    zip_path = os.path.join("dist", OUTPUT_BASE_NAME_TEMPLATE.format(
-        version=APP_VERSION,
-        platform=PLATFORM_NATIVE,
-        distribution="portable"
-    ) + ".zip")
+    zip_path = os.path.join(
+        "dist",
+        OUTPUT_BASE_NAME_TEMPLATE.format(version=APP_VERSION, platform=PLATFORM_NATIVE, distribution="portable")
+        + ".zip",
+    )
     with ZipFile(zip_path, "w") as zip_file:
         for path, dirs, files in os.walk(os.path.join("dist", "vcf_generator_lite")):
             for file_path in [os.path.join(path, file) for file in files]:
@@ -99,11 +107,12 @@ def pack_with_zipfile():
 def main() -> int:
     parser = argparse.ArgumentParser()
     parser.add_argument(
-        "-t", "--type",
+        "-t",
+        "--type",
         type=str,
         default="installer",
         choices=["installer", "portable", "zipapp"],
-        help="应用打包类型（默认：%(default)s）"
+        help="应用打包类型（默认：%(default)s）",
     )
     args = parser.parse_args()
 

scripts/docs/generate_os_notices.py

@@ -17,9 +17,7 @@
     },
 )
 
-NoticesConfig = TypedDict(
-    "NoticesConfig", {"template": str, "output": str, "notices": list[Notice]}
-)
+NoticesConfig = TypedDict("NoticesConfig", {"template": str, "output": str, "notices": list[Notice]})
 
 
 def format_url(url: str, notice: Notice) -> str:
@@ -29,10 +27,7 @@ def format_url(url: str, notice: Notice) -> str:
 
 
 def generate_notices(config: NoticesConfig):
-    return [
-        {**notice, "license-url": format_url(notice["license-url"], notice=notice)}
-        for notice in config["notices"]
-    ]
+    return [{**notice, "license-url": format_url(notice["license-url"], notice=notice)} for notice in config["notices"]]
 
 
 def main() -> int:

scripts/prepare_innosetup_extensions.py

@@ -4,10 +4,16 @@
 
 import requests
 
-URL_CHINESE_SIMPLIFIED_ISL_URL = "https://raw.github.com/jrsoftware/issrc/main/Files/Languages/Unofficial/ChineseSimplified.isl"
-URL_CHINESE_SIMPLIFIED_ISL_LATEST = "https://github.com/kira-96/Inno-Setup-Chinese-Simplified-Translation/raw/refs/heads/main/ChineseSimplified.isl"
+URL_CHINESE_SIMPLIFIED_ISL_URL = (
+    "https://raw.github.com/jrsoftware/issrc/main/Files/Languages/Unofficial/ChineseSimplified.isl"
+)
+URL_CHINESE_SIMPLIFIED_ISL_LATEST = (
+    "https://github.com/kira-96/Inno-Setup-Chinese-Simplified-Translation/raw/refs/heads/main/ChineseSimplified.isl"
+)
 # 国内使用 GitCode 加速下载
-URL_CHINESE_SIMPLIFIED_ISL_GITCODE = "https://raw.gitcode.com/gh_mirrors/is/issrc/raw/main/Files/Languages/Unofficial/ChineseSimplified.isl"
+URL_CHINESE_SIMPLIFIED_ISL_GITCODE = (
+    "https://raw.gitcode.com/gh_mirrors/is/issrc/raw/main/Files/Languages/Unofficial/ChineseSimplified.isl"
+)
 
 PATH_INNOSETUP_EXTENSION = "./.innosetup"
 PATH_CHINESE_SIMPLIFIED = os.path.join(PATH_INNOSETUP_EXTENSION, "Languages", "ChineseSimplified.isl")
@@ -33,11 +39,12 @@ def prepare_innosetup_extensions(download_url: str) -> int:
 def main() -> int:
     parser = argparse.ArgumentParser()
     parser.add_argument(
-        "-m", "--mirror",
+        "-m",
+        "--mirror",
         type=str,
         default="latest",
         choices=["github", "gitcode", "latest"],
-        help="文件下载镜像（默认：%(default)s）"
+        help="文件下载镜像（默认：%(default)s）",
     )
     args = parser.parse_args()
     match args.mirror:

scripts/version.py

@@ -15,11 +15,7 @@ def get_exe_style_version(version: str):
 
 
 def change_version(
-    file_name: str,
-    content_pattern: Pattern[str],
-    content_formatter: str,
-    version: str,
-    encoding="utf-8"
+    file_name: str, content_pattern: Pattern[str], content_formatter: str, version: str, encoding="utf-8"
 ):
     with open(file_name, "r", encoding=encoding) as f:
         origin_content = f.read()
@@ -34,27 +30,26 @@ def change_pyproject_version(version: str):
         file_name="pyproject.toml",
         content_pattern=re.compile(r'^ *version *= *".*" *$', flags=re.M),
         content_formatter='version = "%s"',
-        version=version
+        version=version,
     )
 
 
 def change_version_info(version: str):
     pyinstaller_versionfile.create_versionfile_from_input_file(
-        output_file="versionfile.txt",
-        input_file="metadata.yml",
-        version=get_exe_style_version(version)
+        output_file="versionfile.txt", input_file="metadata.yml", version=get_exe_style_version(version)
     )
     print("Change version to %s in %s." % (version, "versionfile.txt"))
 
 
 def print_version():
     from vcf_generator_lite.__version__ import __version__
+
     print(__version__)
 
 
 def main() -> int:
     parser = argparse.ArgumentParser()
-    parser.add_argument("version", nargs='?', type=str)
+    parser.add_argument("version", nargs="?", type=str)
     args = parser.parse_args()
 
     version = args.version

src/vcf_generator_lite/__main__.py

@@ -11,7 +11,7 @@ def fix_home_env():
     """
     修复 Tkinter 在 Windows 中无法获取 HOME 的问题
     """
-    os.environ['HOME'] = os.path.expanduser("~")
+    os.environ["HOME"] = os.path.expanduser("~")
 
 
 def setup_logging():

src/vcf_generator_lite/constants.py

@@ -9,6 +9,8 @@
 URL_REPOSITORY = "https://gitee.com/HelloTool/VCFGeneratorLiteForTkinter"
 URL_REPORT = "https://gitee.com/HelloTool/VCFGeneratorLiteForTkinter/issues/new/choose"
 URL_LICENSE = f"https://gitee.com/HelloTool/VCFGeneratorLiteForTkinter/blob/{SOURCE_REFERENCE}/LICENSE"
-URL_OS_NOTICES = f"https://gitee.com/HelloTool/VCFGeneratorLiteForTkinter/blob/{SOURCE_REFERENCE}/docs/legal/os_notices.md"
+URL_OS_NOTICES = (
+    f"https://gitee.com/HelloTool/VCFGeneratorLiteForTkinter/blob/{SOURCE_REFERENCE}/docs/legal/os_notices.md"
+)
 
 EMAIL_JESSE205 = "[email protected]"

src/vcf_generator_lite/layouts/vertical_dialog_layout.py

@@ -22,13 +22,10 @@ def _create_widgets(self, parent: Misc):
             footer.pack(fill=X, side=BOTTOM)
 
     @abstractmethod
-    def _create_header(self, parent: Misc) -> Optional[Widget]:
-        ...
+    def _create_header(self, parent: Misc) -> Optional[Widget]: ...
 
     @abstractmethod
-    def _create_content(self, parent: Misc) -> Optional[Widget]:
-        ...
+    def _create_content(self, parent: Misc) -> Optional[Widget]: ...
 
     @abstractmethod
-    def _create_actions(self, parent: Misc) -> Optional[Widget]:
-        ...
+    def _create_actions(self, parent: Misc) -> Optional[Widget]: ...

src/vcf_generator_lite/models/contact.py

@@ -23,7 +23,7 @@ def parse_contact(person_text: str):
         if is_china_mobile_phone(part):
             phone = part
             name = " ".join(parts[:i])
-            note_parts = parts[i + 1:]
+            note_parts = parts[i + 1 :]
             note = " ".join(note_parts) if note_parts else None
             break
     else:

src/vcf_generator_lite/services/vcf_generator.py

@@ -40,7 +40,7 @@ def serialize_to_vcard(contact: Contact):
     items: list[str] = [
         "VERSION:2.1",
         f"FN;CHARSET=UTF-8;ENCODING=QUOTED-PRINTABLE:{utf8_to_qp(contact.name)}",
-        f"TEL;CELL:{contact.phone}"
+        f"TEL;CELL:{contact.phone}",
     ]
     if contact.note:
         items.append(f"NOTE;CHARSET=UTF-8;ENCODING=QUOTED-PRINTABLE:{utf8_to_qp(contact.note)}")
@@ -55,19 +55,13 @@ def __init__(
         executor: ThreadPoolExecutor,
         progress_listener: Optional[Callable[[float, bool], None]],
         input_text: str,
-        output_io: IO
+        output_io: IO,
     ):
         self._executor = executor
         self._progress_listener = progress_listener
         self._input_text = input_text
         self._output_io = output_io
-        self._state = VCardGeneratorState(
-            total=0,
-            processed=0,
-            progress=0.0,
-            invalid_lines=[],
-            exceptions=[]
-        )
+        self._state = VCardGeneratorState(total=0, processed=0, progress=0.0, invalid_lines=[], exceptions=[])
         self._write_queue = Queue()
 
     def start(self) -> Future[GenerateResult]:
@@ -84,10 +78,7 @@ def _process(self) -> GenerateResult:
             for future in done:
                 if exception := future.exception():
                     self._state.exceptions.append(exception)
-        return GenerateResult(
-            invalid_lines=self._state.invalid_lines,
-            exceptions=self._state.exceptions
-        )
+        return GenerateResult(invalid_lines=self._state.invalid_lines, exceptions=self._state.exceptions)
 
     def _parse_input(self):
         lines = [line.strip() for line in self._input_text.split("\n")]

src/vcf_generator_lite/themes/__init__.py

@@ -7,7 +7,9 @@
 def create_platform_theme() -> EnhancedTheme:
     if is_windows:
         from vcf_generator_lite.themes.widows_theme import WindowsTheme
+
         return WindowsTheme()
 
     from vcf_generator_lite.themes.clam_theme import ClamTheme
+
     return ClamTheme()