From 3ba61b4cbfe58e4bd279da82a1d8333c459397a6 Mon Sep 17 00:00:00 2001
From: Klesh Wong <klesh@qq.com>
Date: Sun, 28 Dec 2025 11:54:57 +0800
Subject: [PATCH] fix: core config apply not working

---
 ss/__main__.py        | 2 +-
 ss/corecfg_manager.py | 2 +-
 ss/service_manager.py | 4 +---
 test_upgrade.py       | 4 ++--
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/ss/__main__.py b/ss/__main__.py
index 0420d25..868127b 100644
--- a/ss/__main__.py
+++ b/ss/__main__.py
@@ -1,5 +1,5 @@
 """
-Entry point for python -m scientific_surfing
+Entry point for python -m ss
 """
 
 from .cli import main
diff --git a/ss/corecfg_manager.py b/ss/corecfg_manager.py
index 8251840..0190769 100644
--- a/ss/corecfg_manager.py
+++ b/ss/corecfg_manager.py
@@ -273,7 +273,7 @@ class CoreConfigManager:
 
     def apply(self) -> bool:
         """Apply active subscription to generate final config file."""
-        from scientific_surfing.subscription_manager import SubscriptionManager
+        from ss.subscription_manager import SubscriptionManager
 
         # Load current configuration
         config = self.load_config()
diff --git a/ss/service_manager.py b/ss/service_manager.py
index a1d165a..1c8537c 100644
--- a/ss/service_manager.py
+++ b/ss/service_manager.py
@@ -216,8 +216,6 @@ class WindowsServiceManager(ServiceManagerProtocol):
 
     def uninstall(self, name: str) -> None:
         """Uninstall a Windows service."""
-        import json
-        from pathlib import Path
 
         try:
             # Stop the service first
@@ -231,7 +229,7 @@ class WindowsServiceManager(ServiceManagerProtocol):
             self._run_as_admin(["sc", "delete", name], f"uninstall service '{name}'")
 
             # Clean up configuration file
-            config_dir = Path.home() / ".scientific_surfing" / "service_configs"
+            config_dir = self.config_dir
             config_file = config_dir / f"{name}_config.json"
             try:
                 config_file.unlink(missing_ok=True)
diff --git a/test_upgrade.py b/test_upgrade.py
index 441fe6e..0491289 100644
--- a/test_upgrade.py
+++ b/test_upgrade.py
@@ -7,7 +7,7 @@ import sys
 import os
 sys.path.insert(0, os.path.dirname(__file__))
 
-from scientific_surfing.corecfg_manager import CoreConfigManager
+from ss.corecfg_manager import CoreConfigManager
 
 def test_upgrade():
     """Test the upgrade method functionality."""
@@ -72,7 +72,7 @@ def test_upgrade():
         return False
 
     # Test 4: Test directory creation
-    from scientific_surfing.storage import StorageManager
+    from ss.storage import StorageManager
     storage = StorageManager()
     binary_dir = storage.config_dir / "bin"
     print(f"Binary directory: {binary_dir}")