From e2ca5ede76f141cdc4f3d1caa6b6171249afca6e Mon Sep 17 00:00:00 2001 From: EstrellaXD Date: Thu, 2 Jun 2022 14:43:09 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AutoBangumi/app/{docker_main.py => app.py} | 4 +- ...ollect_bangumi_info.py => collect_info.py} | 1 - AutoBangumi/app/env.py | 4 +- .../{get_full_season.py => eps_complete.py} | 0 .../app/{auto_set_rule.py => set_rule.py} | 0 Windows/.gitconfig | 2 - Windows/config.json | 47 --- Windows/win_main.py | 272 ------------------ test.py | 4 - 9 files changed, 5 insertions(+), 329 deletions(-) rename AutoBangumi/app/{docker_main.py => app.py} (92%) rename AutoBangumi/app/{collect_bangumi_info.py => collect_info.py} (99%) rename AutoBangumi/app/{get_full_season.py => eps_complete.py} (100%) rename AutoBangumi/app/{auto_set_rule.py => set_rule.py} (100%) delete mode 100644 Windows/.gitconfig delete mode 100644 Windows/config.json delete mode 100644 Windows/win_main.py delete mode 100644 test.py diff --git a/AutoBangumi/app/docker_main.py b/AutoBangumi/app/app.py similarity index 92% rename from AutoBangumi/app/docker_main.py rename to AutoBangumi/app/app.py index cb43bf26..144461b9 100644 --- a/AutoBangumi/app/docker_main.py +++ b/AutoBangumi/app/app.py @@ -3,8 +3,8 @@ import time import json import logging -from collect_bangumi_info import CollectRSS -from auto_set_rule import SetRule +from collect_info import CollectRSS +from set_rule import SetRule from rename_qb import qBittorrentRename from env import EnvInfo diff --git a/AutoBangumi/app/collect_bangumi_info.py b/AutoBangumi/app/collect_info.py similarity index 99% rename from AutoBangumi/app/collect_bangumi_info.py rename to AutoBangumi/app/collect_info.py index e37acb2b..c9ca6fc1 100644 --- a/AutoBangumi/app/collect_bangumi_info.py +++ b/AutoBangumi/app/collect_info.py @@ -1,6 +1,5 @@ # -*- coding: UTF-8 -*- import os -import sys import logging import requests from bs4 import BeautifulSoup diff --git a/AutoBangumi/app/env.py b/AutoBangumi/app/env.py index 7ddab44b..bf9b9aec 100644 --- a/AutoBangumi/app/env.py +++ b/AutoBangumi/app/env.py @@ -19,6 +19,7 @@ class EnvInfo: rule_path = "/config/clean_rule.json" not_contain = os.environ["NOT_CONTAIN"] get_rule_debug = os.getenv("RULE_DEBUG", 'False').lower() in ('true', '1', 't') + enable_eps_complete = os.getenv("EP_COMPLETE", 'False').lower() in ('true', '1', 't') else: # Debug ENV host_ip = "localhost:8181" @@ -30,9 +31,10 @@ class EnvInfo: method = "pn" enable_group_tag = True info_path = "../config/bangumi.json" - rule_path = "../config/rule.json" + rule_path = "../config/rule_beta.json" not_contain = "720" get_rule_debug = True + enable_eps_complete = True # Static ENV rule_url = "https://raw.githubusercontent.com/EstrellaXD/Bangumi_Auto_Collector/main/AutoBangumi/config/rule.json" diff --git a/AutoBangumi/app/get_full_season.py b/AutoBangumi/app/eps_complete.py similarity index 100% rename from AutoBangumi/app/get_full_season.py rename to AutoBangumi/app/eps_complete.py diff --git a/AutoBangumi/app/auto_set_rule.py b/AutoBangumi/app/set_rule.py similarity index 100% rename from AutoBangumi/app/auto_set_rule.py rename to AutoBangumi/app/set_rule.py diff --git a/Windows/.gitconfig b/Windows/.gitconfig deleted file mode 100644 index 2a55b910..00000000 --- a/Windows/.gitconfig +++ /dev/null @@ -1,2 +0,0 @@ -[credential] -helper = store -–file .git-credentials diff --git a/Windows/config.json b/Windows/config.json deleted file mode 100644 index 03f2237c..00000000 --- a/Windows/config.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "host_ip": "localhost:8080", - "user_name": "admin", - "password": "adminadmin", - "method": "pn", - "rss_link": "https://mikanani.me/RSS/MyBangumi?token=qTxKo48gH1SrFNy8X%2fCfQUoeElNsgKNWFNzNieKwBH8%3d", - "download_path": "/downloads/Bangumi", - "time": 10, - "bangumi_info": [ - { - "title": "Gaikotsu Kishi-sama", - "season": "" - }, - { - "title": "Paripi Koumei", - "season": "" - }, - { - "title": "Tate no Yuusha no Nariagari", - "season": "S02" - }, - { - "title": "Yuusha Yamemasu", - "season": "" - }, - { - "title": "Honzuki no Gekokujou", - "season": "" - }, - { - "title": "SPYxFAMILY", - "season": "" - }, - { - "title": "Machikado Mazoku", - "season": "S2" - }, - { - "title": "Kaguya-sama wa Kokurasetai", - "season": "S03" - }, - { - "title": "Date A Live", - "season": "S4" - } - ] -} \ No newline at end of file diff --git a/Windows/win_main.py b/Windows/win_main.py deleted file mode 100644 index d3eab462..00000000 --- a/Windows/win_main.py +++ /dev/null @@ -1,272 +0,0 @@ -import os -import re -import sys -import time -import json -import logging - -import qbittorrentapi -import requests -from bs4 import BeautifulSoup - -import requests.packages.urllib3.util.ssl_ - -requests.packages.urllib3.util.ssl_.DEFAULT_CIPHERS = 'ALL' - -logger = logging.getLogger(__name__) - -class EnvInfo: - if getattr(sys, 'frozen', False): - application_path = os.path.dirname(sys.executable) - elif __file__: - application_path = os.path.dirname(__file__) - path = os.path.join(application_path, 'config.json') - with open(path) as f: - data = f.read() - info = json.loads(data) - host_ip = info["host_ip"] - sleep_time = float(info["time"]) - user_name = info["user_name"] - password = info["password"] - rss_link = info["rss_link"] - download_path = info["download_path"] - method = info["method"] - # rss_link = "https://mikanani.me/RSS/MyBangumi?token=Td8ceWZZv3s2OZm5ji9RoMer8vk5VS3xzC1Hmg8A26E%3d" - rule_url = "https://raw.githubusercontent.com/EstrellaXD/Bangumi_Auto_Collector/main/AutoBangumi/config/rule.json" - bangumi_info = info["bangumi_info"] - - -class SetRule: - def __init__(self): - self.bangumi_info = EnvInfo.bangumi_info - self.rss_link = EnvInfo.rss_link - self.host_ip = EnvInfo.host_ip - self.user_name = EnvInfo.user_name - self.password = EnvInfo.password - self.download_path = EnvInfo.download_path - self.qb = qbittorrentapi.Client(host=self.host_ip, username=self.user_name, password=self.password) - try: - self.qb.auth_log_in() - except qbittorrentapi.LoginFailed as e: - logger.exception(e) - - def set_rule(self, bangumi_name, season): - rule = { - 'enable': True, - 'mustContain': bangumi_name, - 'mustNotContain': '720', - 'useRegx': True, - 'episodeFilter': '', - 'smartFilter': False, - 'previouslyMatchedEpisodes': [], - 'affectedFeeds': [self.rss_link], - 'ignoreDays': 0, - 'lastMatch': '', - 'addPaused': False, - 'assignedCategory': 'Bangumi', - 'savePath': str(os.path.join(self.download_path, bangumi_name, season)) - } - self.qb.rss_set_rule(rule_name=bangumi_name, rule_def=rule) - - def rss_feed(self): - try: - self.qb.rss_remove_item(item_path="Mikan_RSS") - self.qb.rss_add_feed(url=self.rss_link, item_path="Mikan_RSS") - logger.debug("Successes adding RSS Feed." + "\n") - except ConnectionError: - logger.debug("Error with adding RSS Feed." + "\n") - except qbittorrentapi.exceptions.Conflict409Error: - logger.debug("RSS Already exists." + "\n") - - def run(self): - logger.debug("Start adding rules." + "\n") - for info in self.bangumi_info: - self.set_rule(info["title"], info["season"]) - logger.debug("Finished." + "\n") - - -class MatchRule: - split_rule = r"\[|\]|\【|\】|\★|\（|\）|\(|\)" - last_rule = r"(.*)( \-)" - sub_title = r"[^\x00-\xff]{1,}| \d{1,2}^.*|\·" - match_rule = r"(S\d{1,2}(.*))" - season_match = r"(.*)(Season \d{1,2}|S\d{1,2}|第.*季|第.*期)" - - -class CollectRSS: - def __init__(self): - self.bangumi_list = [] - try: - self.rules = requests.get(EnvInfo.rule_url).json() - except ConnectionError: - logger.debug(" Get rules Erroe=r") - rss = requests.get(EnvInfo.rss_link, 'utf-8') - soup = BeautifulSoup(rss.text, 'xml') - self.items = soup.find_all('item') - self.info = EnvInfo.bangumi_info - - def get_info_list(self): - for item in self.items: - name = item.title.string - # debug 用 - # print(name) - exit_flag = False - for rule in self.rules: - for group in rule["group_name"]: - if re.search(group, name): - exit_flag = True - n = re.split(MatchRule.split_rule, name) - while '' in n: - n.remove('') - while ' ' in n: - n.remove(' ') - try: - bangumi_title = n[rule['name_position']].strip() - except IndexError: - continue - sub_title = re.sub(MatchRule.sub_title, "", bangumi_title) - b = re.split(r"\/|\_", sub_title) - while '' in b: - b.remove('') - pre_name = max(b, key=len, default='').strip() - if len(pre_name.encode()) > 3: - bangumi_title = pre_name - for i in range(2): - match_obj = re.match(MatchRule.last_rule, bangumi_title, re.I) - if match_obj is not None: - bangumi_title = match_obj.group(1).strip() - match_obj = re.match(MatchRule.match_rule, bangumi_title, re.I) - if match_obj is not None: - bangumi_title = match_obj.group(2).strip() - if bangumi_title not in self.bangumi_list: - self.bangumi_list.append(bangumi_title) - # debug - # print(bangumi_title) - break - if exit_flag: - break - if not exit_flag: - logger.debug("ERROR Not match with {name}") - - def put_info_json(self): - had_data = [] - for data in self.info: - had_data.append(data["title"]) - for title in self.bangumi_list: - match_title_season = re.match(MatchRule.season_match, title, re.I) - if match_title_season is not None: - json_title = match_title_season.group(1).strip() - json_season = match_title_season.group(2) - else: - json_season = '' - json_title = title - if json_title not in had_data: - self.info.append({ - "title": json_title, - "season": json_season - }) - logger.debug("add {json_title} {json_season}" + "\n") - EnvInfo.info["bangumi_info"] = self.info - with open(EnvInfo.path, 'w', encoding='utf8') as f: - data = json.dumps(EnvInfo.info, indent=4, separators=(',', ': '), ensure_ascii=False) - f.write(data) - - def run(self): - self.get_info_list() - self.put_info_json() - - -class qBittorrentRename: - - def __init__(self): - self.qbt_client = qbittorrentapi.Client(host=EnvInfo.host_ip, - username=EnvInfo.user_name, - password=EnvInfo.password) - try: - self.qbt_client.auth_log_in() - except qbittorrentapi.LoginFailed as e: - logger.debug(e) - self.recent_info = self.qbt_client.torrents_info(status_filter='completed', category="Bangumi") - self.hash = None - self.name = None - self.new_name = None - self.path_name = None - self.count = 0 - self.rename_count = 0 - self.torrent_count = len(self.recent_info) - self.rules = [r'(.*)\[(\d{1,3}|\d{1,3}\.\d{1,2})(?:v\d{1,2})?(?:END)?\](.*)', - r'(.*)\[E(\d{1,3}|\d{1,3}\.\d{1,2})(?:v\d{1,2})?(?:END)?\](.*)', - r'(.*)\[第(\d*\.*\d*)话(?:END)?\](.*)', - r'(.*)\[第(\d*\.*\d*)話(?:END)?\](.*)', - r'(.*)第(\d*\.*\d*)话(?:END)?(.*)', - r'(.*)第(\d*\.*\d*)話(?:END)?(.*)', - r'(.*)- (\d{1,3}|\d{1,3}\.\d{1,2})(?:v\d{1,2})?(?:END)? (.*)'] - - def rename_normal(self, idx): - self.name = self.recent_info[idx].name - self.hash = self.recent_info[idx].hash - self.path_name = self.recent_info[idx].content_path.split("/")[-1] - file_name = self.name - for rule in self.rules: - matchObj = re.match(rule, file_name, re.I) - if matchObj is not None: - self.new_name = f'{matchObj.group(1).strip()} E{matchObj.group(2)}{matchObj.group(3)}' - - def rename_pn(self, idx): - self.name = self.recent_info[idx].name - self.hash = self.recent_info[idx].hash - self.path_name = self.recent_info[idx].content_path.split("/")[-1] - n = re.split(r'\[|\]', self.name) - file_name = self.name.replace(f'[{n[1]}]', '') - for rule in self.rules: - matchObj = re.match(rule, file_name, re.I) - if matchObj is not None: - self.new_name = re.sub(r'\[|\]', '', f'{matchObj.group(1).strip()} E{matchObj.group(2)}{n[-1]}') - - def rename(self): - if self.path_name != self.new_name: - self.qbt_client.torrents_rename_file(torrent_hash=self.hash, old_path=self.path_name, - new_path=self.new_name) - logger.debug(f"{self.path_name} >> {self.new_name}") - self.count += 1 - else: - return - - def clear_info(self): - self.name = None - self.hash = None - self.new_name = None - self.path_name = None - - def print_result(self): - logger.debug("已完成对{self.torrent_count}个文件的检查") - logger.debug("已对其中{self.count}个文件进行重命名") - logger.debug("完成") - - def run(self): - if EnvInfo.method not in ['pn', 'normal']: - logger.error('error method') - elif EnvInfo.method == 'normal': - for i in range(0, self.torrent_count + 1): - try: - self.rename_normal(i) - self.rename() - self.clear_info() - except: - self.print_result() - elif EnvInfo.method == 'pn': - for i in range(0, self.torrent_count + 1): - try: - self.rename_pn(i) - self.rename() - self.clear_info() - except: - self.print_result() - - -if __name__ == "__main__": - while True: - CollectRSS().run() - SetRule().run() - qBittorrentRename().run() - time.sleep(EnvInfo.sleep_time) diff --git a/test.py b/test.py deleted file mode 100644 index 8aca906d..00000000 --- a/test.py +++ /dev/null @@ -1,4 +0,0 @@ -import json - -with open("AutoBangumi/config/rule.json") as f: - print(json.load(f)) \ No newline at end of file