From 6162df93a38b410042af07f341f491857d78e81f Mon Sep 17 00:00:00 2001 From: EstrellaXD Date: Tue, 17 May 2022 21:28:33 +0800 Subject: [PATCH] fix some bugs --- AutoBangumi2.0/Dockerfile | 3 ++- AutoBangumi2.0/app/auto_set_rule.py | 2 +- AutoBangumi2.0/app/collect_bangumi_info.py | 5 ++++- AutoBangumi2.0/requirements.txt | 4 ++-- test/test.py | 5 ++++- 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/AutoBangumi2.0/Dockerfile b/AutoBangumi2.0/Dockerfile index 0897bcd4..eed0d858 100644 --- a/AutoBangumi2.0/Dockerfile +++ b/AutoBangumi2.0/Dockerfile @@ -2,7 +2,8 @@ FROM python:3.10-slim-buster WORKDIR /auto-bangumi COPY requirements.txt . -RUN pip3 install -r requirements.txt + +RUN pip install -r requirements.txt COPY ./app /app diff --git a/AutoBangumi2.0/app/auto_set_rule.py b/AutoBangumi2.0/app/auto_set_rule.py index cd89bae0..b3eed5ed 100644 --- a/AutoBangumi2.0/app/auto_set_rule.py +++ b/AutoBangumi2.0/app/auto_set_rule.py @@ -21,7 +21,7 @@ class SetRule: def set_rule(self, bangumi_name, season): rule = { - 'enable': False, + 'enable': True, 'mustContain': bangumi_name, 'mustNotContain': '720', 'useRegx': True, diff --git a/AutoBangumi2.0/app/collect_bangumi_info.py b/AutoBangumi2.0/app/collect_bangumi_info.py index ace30c43..e9e9f51f 100644 --- a/AutoBangumi2.0/app/collect_bangumi_info.py +++ b/AutoBangumi2.0/app/collect_bangumi_info.py @@ -35,7 +35,10 @@ class CollectRSS: parrten = r'\[|\]|\u3010|\u3011|\★|\*|\(|\)|\(|\)' for i in range(2): n = re.split(parrten, name) - name = re.sub(f'\[{n[1]}\]|【{n[1]}】|★{n[1]}★', '', name) + try: + name = re.sub(f'\[{n[1]}\]|【{n[1]}】|★{n[1]}★', '', name) + except: + name = name for rule in episode_rules: matchObj = re.match(rule, name, re.I) if matchObj is not None: diff --git a/AutoBangumi2.0/requirements.txt b/AutoBangumi2.0/requirements.txt index dd08288c..231b30ba 100644 --- a/AutoBangumi2.0/requirements.txt +++ b/AutoBangumi2.0/requirements.txt @@ -1,5 +1,5 @@ qbittorrent-api==2022.4.30 -requests-html==0.10.0 -requests-oauthlib==1.3.1 +bs4 requests==2.27.1 +lxml diff --git a/test/test.py b/test/test.py index 1021bf21..85f2681c 100644 --- a/test/test.py +++ b/test/test.py @@ -18,7 +18,10 @@ name = "[NC-Raws] 小书痴的下克上:为了成为图书管理员不择手 parrten = r'\[|\]|\u3010|\u3011|\★|\*|\(|\)|\(|\)' for i in range(2): n = re.split(parrten, name) - name = re.sub(f'\[{n[1]}\]|【{n[1]}】|★{n[1]}★', '', name) + try: + name = re.sub(f'\[{n[1]}\]|【{n[1]}】|★{n[1]}★', '', name) + except: + name = name for rule in episode_rules: matchObj = re.match(rule, name, re.I) if matchObj is not None: