fix #406 支持QB分类自动管理模式

app/modules/qbittorrent/__init__.py

@@ -37,13 +37,14 @@ class QbittorrentModule(_ModuleBase):
             self.qbittorrent = Qbittorrent()
 
     def download(self, torrent_path: Path, download_dir: Path, cookie: str,
-                 episodes: Set[int] = None) -> Optional[Tuple[Optional[str], str]]:
+                 episodes: Set[int] = None, category: str = None) -> Optional[Tuple[Optional[str], str]]:
         """
         根据种子文件，选择并添加下载任务
         :param torrent_path:  种子文件地址
         :param download_dir:  下载目录
         :param cookie:  cookie
         :param episodes:  需要下载的集数
+        :param category:  分类
         :return: 种子Hash，错误信息
         """
         if not torrent_path or not torrent_path.exists():
@@ -61,7 +62,8 @@ class QbittorrentModule(_ModuleBase):
                                              download_dir=str(download_dir),
                                              is_paused=is_paused,
                                              tag=tags,
-                                             cookie=cookie)
+                                             cookie=cookie,
+                                             category=category)
         if not state:
             return None, f"添加种子任务失败：{torrent_path}"
         else:

app/modules/qbittorrent/qbittorrent.py

@@ -177,6 +177,7 @@ class Qbittorrent(metaclass=Singleton):
                     is_paused: bool = False,
                     download_dir: str = None,
                     tag: Union[str, list] = None,
+                    category: str = None,
                     cookie=None
                     ) -> bool:
         """
@@ -184,6 +185,7 @@ class Qbittorrent(metaclass=Singleton):
         :param content: 种子urls或文件内容
         :param is_paused: 添加后暂停
         :param tag: 标签
+        :param category: 种子分类
         :param download_dir: 下载路径
         :param cookie: 站点Cookie用于辅助下载种子
         :return: bool
@@ -191,6 +193,7 @@ class Qbittorrent(metaclass=Singleton):
         if not self.qbc or not content:
             return False
 
+        # 下载内容
         if isinstance(content, str):
             urls = content
             torrent_files = None
@@ -198,20 +201,26 @@ class Qbittorrent(metaclass=Singleton):
             urls = None
             torrent_files = content
 
+        # 保存目录
         if download_dir:
             save_path = download_dir
-            is_auto = False
         else:
             save_path = None
-            is_auto = None
 
+        # 标签
         if tag:
             tags = tag
         else:
             tags = None
 
-        try:
+        # 分类自动管理
+        if category and settings.QB_CATEGORY:
+            is_auto = True
+        else:
+            is_auto = False
+            category = None
 
+        try:
             # 添加下载
             qbc_ret = self.qbc.torrents_add(urls=urls,
                                             torrent_files=torrent_files,
@@ -220,7 +229,8 @@ class Qbittorrent(metaclass=Singleton):
                                             tags=tags,
                                             use_auto_torrent_management=is_auto,
                                             is_sequential_download=True,
-                                            cookie=cookie)
+                                            cookie=cookie,
+                                            category=category)
             return True if qbc_ret and str(qbc_ret).find("Ok") != -1 else False
         except Exception as err:
             logger.error(f"添加种子出错：{err}")