Merge branch 'EstrellaXD:3.1-dev' into 3.1-dev

Author: KotaHv

.github/workflows/build.yml

@@ -12,7 +12,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python 3.11
         uses: actions/setup-python@v3
         with:
@@ -32,7 +32,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: If release
         id: release
         run: |
@@ -86,7 +86,7 @@ jobs:
         node-version: [ 18 ]
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - uses: pnpm/action-setup@v2
         with:
@@ -117,7 +117,7 @@ jobs:
     needs: [ build-webui, version-info ]
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Create Version info via tag
         working-directory: ./backend/src
@@ -224,7 +224,7 @@ jobs:
       version: ${{ needs.version-info.outputs.version }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download artifact webui
         uses: actions/download-artifact@v3

backend/src/module/api/rss.py

@@ -194,7 +194,7 @@ async def download_collection(data: Bangumi):
 @router.post(
     "/subscribe", response_model=APIResponse, dependencies=[Depends(get_current_user)]
 )
-async def subscribe(data: Bangumi):
+async def subscribe(data: Bangumi, rss: RSSItem):
     with SeasonCollector() as collector:
-        resp = collector.subscribe_season(data)
+        resp = collector.subscribe_season(data, parser=rss.parser)
         return u_response(resp)

backend/src/module/checker/checker.py

@@ -59,7 +59,8 @@ def check_downloader() -> bool:
                 else f"{settings.downloader.host}"
             )
             response = requests.get(url, timeout=2)
-            if settings.downloader.type in response.text.lower():
+            # if settings.downloader.type in response.text.lower():
+            if "qbittorrent" in response.text.lower() or "vuetorrent" in response.text.lower():
                 with DownloadClient() as client:
                     if client.authed:
                         return True

backend/src/module/manager/collector.py

@@ -46,12 +46,15 @@ def collect_season(self, bangumi: Bangumi, link: str = None):
                 )
 
     @staticmethod
-    def subscribe_season(data: Bangumi):
+    def subscribe_season(data: Bangumi, parser: str = "mikan"):
         with RSSEngine() as engine:
             data.added = True
             data.eps_collect = True
             engine.add_rss(
-                rss_link=data.rss_link, name=data.official_title, aggregate=False
+                rss_link=data.rss_link,
+                name=data.official_title,
+                aggregate=False,
+                parser=parser,
             )
             engine.bangumi.add(data)
             result = engine.download_bangumi(data)

backend/src/module/models/config.py

@@ -1,7 +1,7 @@
 from os.path import expandvars
 from typing import Literal
 
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, validator
 
 
 class Program(BaseModel):
@@ -102,6 +102,12 @@ class ExperimentalOpenAI(BaseModel):
         "", description="Azure OpenAI deployment id, ignored when api type is openai"
     )
 
+    @validator("api_base")
+    def validate_api_base(cls, value: str):
+        if value == "https://api.openai.com/":
+            return "https://api.openai.com/v1"
+        return value
+
 
 class Config(BaseModel):
     program: Program = Program()

backend/src/module/parser/analyser/raw_parser.py

@@ -131,7 +131,7 @@ def clean_sub(sub: str | None) -> str | None:
 
 
 def process(raw_title: str):
-    raw_title = raw_title.strip()
+    raw_title = raw_title.strip().replace("\n", "")
     content_title = pre_process(raw_title)
     # 预处理标题
     group = get_group(content_title)

backend/src/module/parser/analyser/torrent_parser.py

@@ -69,36 +69,37 @@ def torrent_parser(
     file_type: str = "media",
 ) -> EpisodeFile | SubtitleFile:
     media_path = get_path_basename(torrent_path)
-    for rule in RULES:
-        if torrent_name:
-            match_obj = re.match(rule, torrent_name, re.I)
-        else:
-            match_obj = re.match(rule, media_path, re.I)
-        if match_obj:
-            group, title = get_group(match_obj.group(1))
-            if not season:
-                title, season = get_season_and_title(title)
-            else:
-                title, _ = get_season_and_title(title)
-            episode = int(match_obj.group(2))
-            suffix = Path(torrent_path).suffix
-            if file_type == "media":
-                return EpisodeFile(
-                    media_path=torrent_path,
-                    group=group,
-                    title=title,
-                    season=season,
-                    episode=episode,
-                    suffix=suffix,
-                )
-            elif file_type == "subtitle":
-                language = get_subtitle_lang(media_path)
-                return SubtitleFile(
-                    media_path=torrent_path,
-                    group=group,
-                    title=title,
-                    season=season,
-                    language=language,
-                    episode=episode,
-                    suffix=suffix,
-                )
+    match_names = [torrent_name, media_path]
+    if torrent_name is None:
+        match_names = match_names[1:]
+    for match_name in match_names:
+        for rule in RULES:
+            match_obj = re.match(rule, match_name, re.I)
+            if match_obj:
+                group, title = get_group(match_obj.group(1))
+                if not season:
+                    title, season = get_season_and_title(title)
+                else:
+                    title, _ = get_season_and_title(title)
+                episode = int(match_obj.group(2))
+                suffix = Path(torrent_path).suffix
+                if file_type == "media":
+                    return EpisodeFile(
+                        media_path=torrent_path,
+                        group=group,
+                        title=title,
+                        season=season,
+                        episode=episode,
+                        suffix=suffix,
+                    )
+                elif file_type == "subtitle":
+                    language = get_subtitle_lang(media_path)
+                    return SubtitleFile(
+                        media_path=torrent_path,
+                        group=group,
+                        title=title,
+                        season=season,
+                        language=language,
+                        episode=episode,
+                        suffix=suffix,
+                    )

backend/src/test/models/test_config.py

@@ -0,0 +1,14 @@
+from module.models.config import ExperimentalOpenAI
+
+
+def test_experimental_openai_validate_api_base():
+    config = ExperimentalOpenAI(api_type="openai", api_base="https://api.openai.com/")
+    assert config.api_base == "https://api.openai.com/v1"
+
+    config = ExperimentalOpenAI(api_base="https://api.openai.com/")
+    assert config.api_base == "https://api.openai.com/v1"
+
+    config = ExperimentalOpenAI(
+        api_type="azure", api_base="https://custom-api-base.com"
+    )
+    assert config.api_base == "https://custom-api-base.com"

docs/config/proxy.md

@@ -31,3 +31,55 @@ AB 支持 HTTP 代理和 SOCKS5 代理，通过设置代理可以解决一些网
 | port     | 代理端口   | 整数   | 代理端口       |
 | username | 代理用户名  | 字符串  | 代理用户名      |
 | password | 代理密码   | 字符串  | 代理密码       |
+
+## 反向代理
+
+- 使用蜜柑计划的新域名 `mikanime.tv` 替换rss订阅中 `mikanani.me` 部分
+- 使用 CloudFlare Worker 进行反代，并且替换 RSS 中所有的 `mikanani.me` 域名。
+
+## CloudFlare Workers
+
+根据 OpenAI 被墙的经验，我们也可以通过反向代理的方式解决。具体如何申请域名绑定 CloudFlare 在此不再赘述。在 Workers 中添加如下代码即可以用你自己的域名访问蜜柑计划并且解析下载 RSS 链接中的种子。
+
+```js
+const TELEGRAPH_URL = 'https://mikanani.me';
+const MY_DOMAIN = 'https://yourdomain.com'
+
+addEventListener('fetch', event => {
+  event.respondWith(handleRequest(event.request))
+})
+
+async function handleRequest(request) {
+  const url = new URL(request.url);
+  url.host = TELEGRAPH_URL.replace(/^https?:\/\//, '');
+
+  const modifiedRequest = new Request(url.toString(), {
+    headers: request.headers,
+    method: request.method,
+    body: request.body,
+    redirect: 'manual'
+  });
+
+  const response = await fetch(modifiedRequest);
+  const contentType = response.headers.get('Content-Type') || '';
+
+  // 如果内容类型是 RSS，才进行替换操作
+  if (contentType.includes('application/xml')) {
+    const text = await response.text();
+    const replacedText = text.replace(/https?:\/\/mikanani\.me/g, MY_DOMAIN);
+    const modifiedResponse = new Response(replacedText, response);
+
+    // 添加允许跨域访问的响应头
+    modifiedResponse.headers.set('Access-Control-Allow-Origin', '*');
+
+    return modifiedResponse;
+  } else {
+    const modifiedResponse = new Response(response.body, response);
+
+    // 添加允许跨域访问的响应头
+    modifiedResponse.headers.set('Access-Control-Allow-Origin', '*');
+
+    return modifiedResponse;
+  }
+}
+```

webui/.vscode/settings.json

@@ -2,5 +2,6 @@
   "i18n-ally.localesPaths": ["src/i18n"],
   "commentTranslate.targetLanguage": "zh-CN",
   "i18n-ally.sourceLanguage": "en",
-  "typescript.tsdk": "node_modules/typescript/lib"
+  "typescript.tsdk": "node_modules/typescript/lib",
+  "i18n-ally.keystyle": "nested"
 }

webui/package.json

@@ -48,14 +48,13 @@
     "@unocss/preset-rem-to-px": "^0.51.13",
     "@unocss/reset": "^0.51.13",
     "@vitejs/plugin-vue": "^4.2.0",
+    "@vitejs/plugin-vue-jsx": "^3.1.0",
     "@vue/runtime-dom": "^3.3.4",
     "eslint": "^8.41.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-storybook": "^0.6.12",
     "husky": "^8.0.3",
     "prettier": "^2.8.8",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
     "sass": "^1.62.1",
     "storybook": "^7.0.12",
     "typescript": "^4.9.5",