0

main_gui.py

@@ -682,13 +682,11 @@ class MainTab(QWidget):
     def run_module(self, args):
         try:
             # 正确导入repo_sync模块的main函数
-            from repo_sync.repo_sync import RepoSync
+            from repo_sync import main
             self.running = True
             return_code = 0
             try:
-                # 直接创建RepoSync实例并运行
-                rs = RepoSync(args)
-                rs.run()
+                main(args)
             except SystemExit as e:
                 return_code = e.code if isinstance(e.code, int) else 1
             except Exception as e:

repo_sync/__init__.py

@@ -1,6 +1,6 @@
 from .repo_sync import RepoSync
 from .version import __version__
-from .options import parser_args
+from .options import parser_args, only_combine_conf
 from .utils.logger import logger
 import sys
 
@@ -9,7 +9,7 @@ def main(argv=None):
     try:
         # 如果argv是字典类型，直接使用这些参数
         if isinstance(argv, dict):
-            args = argv
+            args= only_combine_conf(argv)
         else:
             args = parser_args(argv)
             

repo_sync/options.py

@@ -57,10 +57,18 @@ def parser_args(overrideArguments=None):
     system_conf.update(command_line_conf)
     system_conf.update(custom_conf)
     if args.command == None and args.extractor == None:
-        raise 'Error, please input cmd and extractor params11'
+        raise 'Error, please input cmd and extractor params'
     return system_conf
 
 
+def only_combine_conf(args:dict):
+    system_conf = user_conf = custom_conf = OrderedDict()
+    user_conf = _read_custom_platform_conf("config.yml", args['platform'])
+    system_conf.update(user_conf)
+    system_conf.update(custom_conf)
+    system_conf.update(args)
+    return system_conf
+
 def _read_user_conf() -> OrderedDict:
     """读取用户配置文件: .env 文件"""
     user_conf = OrderedDict()