perf: simplify and enhance config initialization

msclock · msclock · commit 0454a461bdee · 2025-03-09T13:58:33.000+08:00
Signed-off-by: l.feng &lt;43399351+msclock@users.noreply.github.com&gt;
diff --git a/src/_core/include/pysubconverter.hpp b/src/_core/include/pysubconverter.hpp
@@ -5,7 +5,7 @@
 
 namespace _core {
 
-void init_config(const std::string &configDir);
+void init_config();
 
 void update_config(const std::map<std::string, std::string> &arguments);
 
diff --git a/src/_core/src/pybind.cpp b/src/_core/src/pybind.cpp
@@ -27,7 +27,6 @@ PYBIND11_MODULE(_core, m) {
 
     m.def("init_config",
           _core::init_config,
-          py::arg("dir"),
           py::doc(R"pbdoc(initialize the configuration directory from subconverter.)pbdoc"));
 
     m.def("subconverter", _core::subconverter, py::arg("arguments"), py::doc(R"pbdoc(convert to subscription format
diff --git a/src/_core/src/pysubconverter.cpp b/src/_core/src/pysubconverter.cpp
@@ -10,17 +10,7 @@
 namespace fs = std::filesystem;
 
 namespace _core {
-void cd(const std::string &dir) {
-    try {
-        fs::current_path(fs::canonical(dir));
-    }
-    catch (const fs::filesystem_error &e) {
-        throw std::runtime_error(e.what());
-    }
-}
-
-void init_config(const std::string &configDir) {
-    cd(configDir);
+void init_config() {
     if (!fileExist(global.prefPath)) {
         if (fileExist("pref.toml"))
             global.prefPath = "pref.toml";
diff --git a/src/_core/tests/test_core.cpp b/src/_core/tests/test_core.cpp
@@ -14,7 +14,8 @@ using _core_rc_test = test::utils::rc_dir_test;
 
 TEST_F(_core_rc_test, subconverter) {
     auto config_dir = this->test_data_dir_ / "config";
-    _core::init_config(config_dir.string());
+    std::filesystem::current_path(config_dir);
+    _core::init_config();
     std::vector<std::string> urls = {
         "ss://YWVzLTI1Ni1nY206VEV6amZBWXEySWp0dW9T@127.0.0.1:0123#fake 1",
         "ss://YWVzLTI1Ni1nY206VEV6amZBWXEySWp0dW9T@127.0.0.1:0123#fake 2",
diff --git a/src/pysubconverter/__init__.py b/src/pysubconverter/__init__.py
@@ -6,6 +6,7 @@
 
 from __future__ import annotations
 
+import os
 import shutil
 from contextlib import contextmanager
 from pathlib import Path
@@ -62,21 +63,47 @@ def config_context(
     renew: bool = False,
 ) -> Generator[None, Any, None]:
     """
-    A context manager to initialize and configure the config directory.
+    Context manager for initializing and configuring the config directory with enhanced safety.
+
+    Args:
+        cache_dir: Directory path for caching configurations
+        renew: Force renew configuration files when True
+
+    Yields:
+        None: Context manager protocol
+
+    Raises:
+        FileNotFoundError: If package config directory not found
+        RuntimeError: If directory operations fail
     """
     config_lock = FileLock(Path(cache_dir) / "config.lock")
     config_dir = Path(cache_dir) / "config"
+
     with config_lock:
-        pkg_config = distribution(__package__).locate_file(__package__) / "config"
-        if not config_dir.exists():
-            shutil.copytree(str(pkg_config), config_dir)
+        try:
+            pkg_config = distribution(__package__).locate_file(__package__) / "config"
+            if not pkg_config.exists():
+                raise FileNotFoundError(
+                    "Package config directory not found at" + str(pkg_config)
+                )
 
-        if renew:
-            shutil.rmtree(config_dir)
-            shutil.copytree(str(pkg_config), config_dir)
+            if renew and config_dir.exists():
+                shutil.rmtree(config_dir)
 
-        init_config(str(config_dir))
-        try:
-            yield
-        finally:
-            pass
+            if not config_dir.exists():
+                shutil.copytree(str(pkg_config), config_dir)
+
+            origin_dir = Path.cwd().resolve()
+            try:
+                os.chdir(config_dir)
+                init_config()
+                yield
+            except Exception as e:
+                raise RuntimeError(
+                    "Failed to initialize config in " + str(config_dir) + " : " + str(e)
+                ) from e
+            finally:
+                os.chdir(origin_dir)
+
+        except (shutil.Error, OSError) as e:
+            raise RuntimeError("Configuration management failed: " + str(e)) from e
diff --git a/src/pysubconverter/_core.pyi b/src/pysubconverter/_core.pyi
@@ -63,7 +63,7 @@ def get_ruleset(arguments: dict[str, str]) -> str:
     get the ruleset from subconverter.
     """
 
-def init_config(dir: str) -> None:
+def init_config() -> None:
     """
     initialize the configuration directory from subconverter.
     """
