Merge branch 'jxxghp:master' into master

skyfish2023 · Jan 25, 2023 · b52808d · b52808d
2 parents c869bc3 + e92f6ae
commit b52808d
Show file tree

Hide file tree

Showing 143 changed files with 6,839 additions and 3,765 deletions.
diff --git a/.github/workflows/build-beta.yml b/.github/workflows/build-beta.yml
@@ -51,4 +51,4 @@ jobs:
             linux/arm64
           push: true
           tags: |
-            ${{ secrets.DOCKER_USERNAME }}/nas-tools:${{ env.app_version }}-beta
+            ${{ secrets.DOCKER_USERNAME }}/nas-tools:${{ env.app_version }}-beta
diff --git a/README.md b/README.md
@@ -48,7 +48,7 @@ docker pull jxxghp/nas-tools:latest
 教程见 [这里](docker/readme.md) ，如无法连接Github，注意不要开启自动更新开关(NASTOOL_AUTO_UPDATE=false)。
 
 ### 2、本地运行
-python3版本，如发现缺少依赖包需额外安装
+python3.10版本或以上，需要预安装cython，如发现缺少依赖包需额外安装
 ```
 git clone -b master https://github.com/jxxghp/nas-tools --recurse-submodule 
 python3 -m pip install -r requirements.txt
@@ -216,18 +216,15 @@ https://spk7.imnks.com/
 * Docker版本，宿主机上运行以下命令，nas-tools修改为你的docker名称，修改源目录和目的目录参数。
    ```
    docker exec -it nas-tools sh
-   python3 -m pip install -r third_party.txt
    python3 /nas-tools/app/filetransfer.py -m link -s /from/path -d /to/path
    ```
 * 群晖套件版本，ssh到后台运行以下命令，同样修改配置文件路径以及源目录、目的目录参数。
    ```
-   /var/packages/py3k/target/usr/local/bin/python3 -m pip install -r /var/packages/nastool/target/third_party.txt
-   export NASTOOL_CONFIG=/var/packages/nastool/target/config/config.yaml
-   /var/packages/py3k/target/usr/local/bin/python3 /var/packages/nastool/target/app/filetransfer.py -m link -s /from/path -d /to/path
+   export NASTOOL_CONFIG=/var/packages/NASTool/target/config/config.yaml
+   /var/packages/py3k/target/usr/local/bin/python3 /var/packages/NASTool/target/app/filetransfer.py -m link -s /from/path -d /to/path
    ```
 * 本地直接运行的，cd 到程序根目录，执行以下命令，修改配置文件、源目录和目的目录参数。
    ```
-   python3 -m pip install -r third_party.txt
    export NASTOOL_CONFIG=config/config.yaml
    python3 app/filetransfer.py -m link -s /from/path -d /to/path
    ```

diff --git a/app/brushtask.py b/app/brushtask.py
@@ -44,7 +44,8 @@ def init_config(self):
         try:
             if self._scheduler:
                 self._scheduler.remove_all_jobs()
-                self._scheduler.shutdown()
+                if self._scheduler.running:
+                    self._scheduler.shutdown()
                 self._scheduler = None
         except Exception as e:
             ExceptionUtils.exception_traceback(e)
@@ -194,8 +195,6 @@ def check_task_rss(self, taskid):
                 enclosure = res.get('enclosure')
                 # 种子页面
                 page_url = res.get('link')
-                # 副标题
-                description = res.get('description')
                 # 种子大小
                 size = res.get('size')
                 # 发布时间
@@ -210,7 +209,6 @@ def check_task_rss(self, taskid):
                 # 检查种子是否符合选种规则
                 if not self.__check_rss_rule(rss_rule=rss_rule,
                                              title=torrent_name,
-                                             description=description,
                                              torrent_url=page_url,
                                              torrent_size=size,
                                              pubdate=pubdate,
@@ -660,7 +658,6 @@ def __download_torrent(self,
     def __check_rss_rule(self,
                          rss_rule,
                          title,
-                         description,
                          torrent_url,
                          torrent_size,
                          pubdate,
@@ -670,7 +667,6 @@ def __check_rss_rule(self,
         检查种子是否符合刷流过滤条件
         :param rss_rule: 过滤条件字典
         :param title: 种子名称
-        :param description: 种子副标题
         :param torrent_url: 种子页面地址
         :param torrent_size: 种子大小
         :param pubdate: 发布时间
@@ -702,12 +698,12 @@ def __check_rss_rule(self,
 
             # 检查包含规则
             if rss_rule.get("include"):
-                if not re.search(r"%s" % rss_rule.get("include"), "%s %s" % (title, description), re.IGNORECASE):
+                if not re.search(r"%s" % rss_rule.get("include"), title):
                     return False
 
             # 检查排除规则
             if rss_rule.get("exclude"):
-                if re.search(r"%s" % rss_rule.get("exclude"), "%s %s" % (title, description), re.IGNORECASE):
+                if re.search(r"%s" % rss_rule.get("exclude"), title):
                     return False
 
             torrent_attr = self.sites.check_torrent_attr(torrent_url=torrent_url, cookie=cookie, ua=ua)