Merge remote-tracking branch 'upstream/main'

SubConv · Mar 24, 2024 · 3448068 · 3448068
2 parents ff0ed2a + 90fb201
commit 3448068
Show file tree

Hide file tree

Showing 11 changed files with 51 additions and 49 deletions.
diff --git a/api.py b/api.py
@@ -26,9 +26,11 @@ class GenerateConfigAction(argparse.Action):
         def __call__(self, parser, namespace, values, option_string=None):
             yaml.SafeDumper.ignore_aliases = lambda *args : True
             if values == "default":
-                print(yaml.safe_dump(config_template.template_default, allow_unicode=True, sort_keys=False))
+                with open("config.yaml", "w", encoding="utf-8") as f:
+                    f.write(yaml.safe_dump(config_template.template_default, allow_unicode=True, sort_keys=False))
             elif values == "zju":
-                print(yaml.safe_dump(config_template.template_zju, allow_unicode=True, sort_keys=False))
+                with open("config.yaml", "w", encoding="utf-8") as f:
+                    f.write(yaml.safe_dump(config_template.template_zju, allow_unicode=True, sort_keys=False))
             parser.exit()
 
     # parse arguments

diff --git a/config.yaml b/config.yaml
@@ -257,4 +257,3 @@ CUSTOM_PROXY_GROUP:
   type: url-test
   rule: false
   regex: 🇺🇸|US|America|United.*?States|美|波特兰|达拉斯|俄勒冈|凤凰城|费利蒙|硅谷|拉斯维加斯|洛杉矶|圣何塞|圣克拉拉|西雅图|芝加哥
-
diff --git a/mainpage/index.html b/mainpage/index.html
@@ -5,7 +5,7 @@
     <link rel="icon" href="/favicon.png">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/[email protected]/css/all.min.css" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Element Plus Vite Starter</title>
+    <title>SubConv</title>
     <!-- element css cdn, if you use custom theme, remove it. -->
     <!-- <link
       rel="stylesheet"

diff --git a/modules/config.py b/modules/config.py
@@ -36,7 +36,7 @@ class Config(YamlBaseSettings):
     configInstance = Config("config.yaml")
 except FileNotFoundError:
     print(f"config.yaml not found or empty, please run {sys.argv[0]} -h to see how to generate a default config file")
-    exit(1)
+    sys.exit(1)
 except Exception as e:
     print(f"Error: {e}")
-    exit(1)
+    sys.exit(1)
diff --git a/modules/pack.py b/modules/pack.py
@@ -62,6 +62,7 @@ async def pack(url: list, urlstandalone: list, urlstandby:list, urlstandbystanda
                         "type": "http",
                         "url": url[u],
                         "interval": int(interval),
+                        "path": "./sub/subscription{}.yaml".format(u),
                         "health-check": {
                             "enable": True,
                             "interval": 60,

diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
-fastapi==0.109.2
-httpx==0.26.0
+fastapi==0.110.0
+httpx==0.27.0
 PyYAML==6.0.1
-uvicorn==0.27.1
+uvicorn==0.29.0
 pydantic-settings-yaml==0.2.0
diff --git a/static/assets/index-BcYWinaI.js b/static/assets/index-BcYWinaI.js
diff --git a/static/assets/index-C8CYsfRt.css b/static/assets/index-C8CYsfRt.css
diff --git a/static/assets/index-CHhnTzuz.js b/static/assets/index-CHhnTzuz.js
diff --git a/static/assets/index-De_DoMt5.css b/static/assets/index-De_DoMt5.css
diff --git a/static/index.html b/static/index.html
@@ -5,14 +5,14 @@
     <link rel="icon" href="/favicon.png">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/[email protected]/css/all.min.css" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Element Plus Vite Starter</title>
+    <title>SubConv</title>
     <!-- element css cdn, if you use custom theme, remove it. -->
     <!-- <link
       rel="stylesheet"
       href="https://cdn.jsdelivr.net/npm/element-plus/dist/index.css"
     /> -->
-    <script type="module" crossorigin src="/assets/index-BcYWinaI.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-De_DoMt5.css">
+    <script type="module" crossorigin src="/assets/index-CHhnTzuz.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-C8CYsfRt.css">
   </head>
   <body>
     <div id="app"></div>