Skip to content

Commit

Permalink
Merge pull request #395 from EstrellaXD/3.0-dev
Browse files Browse the repository at this point in the history
3.0.11
  • Loading branch information
EstrellaXD authored Jul 15, 2023
2 parents 191a833 + 766bcb1 commit 967f10a
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 21 deletions.
28 changes: 12 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@

本项目是基于 [Mikan Project](https://mikanani.me)[qBittorrent](https://qbittorrent.org) 的全自动追番整理下载工具。只需要在 [Mikan Project](https://mikanani.me) 上订阅番剧,就可以全自动追番。并且整理完成的名称和目录可以直接被 [Plex]()[Jellyfin]() 等媒体库软件识别,无需二次刮削。

[主项目地址](https://www.github.com/EstrellaXD/Auto_Bangumi)
/ [WebUI 仓库](https://github.com/Rewrite0/Auto_Bangumi_WebUI)
/ [Wiki 说明](https://www.github.com/EstrellaXD/Auto_Bangumi/wiki)

## AutoBangumi 功能说明

- 简易单次配置就能持续使用
Expand Down Expand Up @@ -59,12 +55,10 @@
- 内置 TDMB 解析器,可以直接生成完整的 TMDB 格式的文件以及番剧信息。
- 对于 Mikan RSS 的反代支持。

## 如何开始
## [快速开始](https://www.autobangumi.org/deploy/quick-start.html)

- **[部署说明 (Official)](https://github.com/EstrellaXD/Auto_Bangumi/wiki)**
- **[2.6版本更新说明](https://github.com/EstrellaXD/Auto_Bangumi/wiki/2.6更新说明)**
- **[3.0版本更新说明](https://github.com/EstrellaXD/Auto_Bangumi/wiki/3.0更新说明)**
- **[部署说明 (手把手)](https://www.himiku.com/archives/auto-bangumi.html)**
- **[项目官网](https://autobangumi.org)**
- **[3.0 更新说明](https://www.autobangumi.org/changelog/3.0.html)**

## 相关群组

Expand All @@ -82,18 +76,20 @@

- 对其他站点种子的解析归类。
- 本地化番剧订阅方式。
- Transmission & Aria2 的支持。
- Transmission 的支持。

# 声明
## Star History

## 致谢
[![Star History Chart](https://api.star-history.com/svg?repos=EstrellaXD/Auto_Bangumi&type=Date)](https://star-history.com/#EstrellaXD/Auto_Bangumi)

感谢 [Sean](https://github.com/findix) 提供的大量帮助
感谢 [Rewrite0](https://github.com/Rewrite0) 开发的 WebUI
## 贡献

## Star History
欢迎提供 ISSUE 或者 PR, 贡献代码前建议阅读 [CONTRIBUTING.md](CONTRIBUTING.md)

贡献者名单请见:

<a href="https://github.com/EstrellaXD/Auto_Bangumi/graphs/contributors"><img src="https://contrib.rocks/image?repo=EstrellaXD/Auto_Bangumi"></a>

[![Star History Chart](https://api.star-history.com/svg?repos=EstrellaXD/Auto_Bangumi&type=Date)](https://star-history.com/#EstrellaXD/Auto_Bangumi)

## Licence

Expand Down
7 changes: 4 additions & 3 deletions backend/src/module/downloader/download_client.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import logging
import re

from .path import TorrentPath

Expand Down Expand Up @@ -55,9 +56,8 @@ def check_host(self):
def init_downloader(self):
prefs = {
"rss_auto_downloading_enabled": True,
"rss_max_articles_per_feed": 500,
"rss_max_articles_per_feed": 5000,
"rss_processing_enabled": True,
"rss_refresh_interval": 30,
}
self.client.prefs_init(prefs=prefs)
try:
Expand All @@ -71,9 +71,10 @@ def init_downloader(self):
def set_rule(self, data: BangumiData):
data.rule_name = self._rule_name(data)
data.save_path = self._gen_save_path(data)
raw_title = re.escape(data.title_raw)
rule = {
"enable": True,
"mustContain": data.title_raw,
"mustContain": raw_title,
"mustNotContain": "|".join(data.filter),
"useRegex": True,
"episodeFilter": "",
Expand Down
4 changes: 2 additions & 2 deletions backend/src/module/parser/analyser/raw_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def name_process(name: str):
split_space = split[0].split(" ")
language_pattern = []
for item in split_space:
if re.search(r"^[\u4e00-\u9fa5]{2,}", item) is not None:
if re.search(r"[\u4e00-\u9fa5]{2,}", item) is not None:
language_pattern.append(1)
elif re.search(r"[a-zA-Z]{2,}", item) is not None:
language_pattern.append(0)
Expand All @@ -107,7 +107,7 @@ def name_process(name: str):
# 如果当前字符串的语言与上一个字符串的语言相同
if language_pattern[i] == language_pattern[i - 1]:
# 合并这两个字符串
split[-1] += ' ' + split_space[i]
split[-1] += " " + split_space[i]
else:
# 否则,将当前字符串添加到结果列表中
split.append(split_space[i])
Expand Down

0 comments on commit 967f10a

Please sign in to comment.