feat：目录结构重大调整，谨慎更新到dev

app/chain/download.py

@@ -14,6 +14,8 @@ from app.core.meta import MetaBase
 from app.core.metainfo import MetaInfo
 from app.db.downloadhistory_oper import DownloadHistoryOper
 from app.db.mediaserver_oper import MediaServerOper
+from app.helper.directory import DirectoryHelper
+from app.helper.message import MessageHelper
 from app.helper.torrent import TorrentHelper
 from app.log import logger
 from app.schemas import ExistMediaInfo, NotExistMediaInfo, DownloadingTorrent, Notification
@@ -32,6 +34,8 @@ class DownloadChain(ChainBase):
         self.torrent = TorrentHelper()
         self.downloadhis = DownloadHistoryOper()
         self.mediaserver = MediaServerOper()
+        self.directoryhelper = DirectoryHelper()
+        self.messagehelper = MessageHelper()
 
     def post_download_message(self, meta: MetaBase, mediainfo: MediaInfo, torrent: TorrentInfo,
                               channel: MessageChannel = None, userid: str = None, username: str = None,
@@ -227,35 +231,23 @@ class DownloadChain(ChainBase):
 
         # 下载目录
         if not save_path:
-            if settings.DOWNLOAD_CATEGORY and _media and _media.category:
+            # 获取下载目录
+            dir_info = self.directoryhelper.get_download_dir(_media)
+            if not dir_info or not dir_info.path:
+                logger.error(f"未找到下载目录：{_media.type.value} {_media.title_year}")
+                self.messagehelper.put(f"{_media.type.value} {_media.title_year} 未找到下载目录！",
+                                       title="下载失败", role="system")
+                return None
+
+            if (dir_info.category or dir_info.auto_category) and _media and _media.category:
                 # 开启下载二级目录
-                if _media.type != MediaType.TV:
-                    # 电影
-                    download_dir = settings.SAVE_MOVIE_PATH / _media.category
-                else:
-                    if _media.genre_ids \
-                            and set(_media.genre_ids).intersection(set(settings.ANIME_GENREIDS)):
-                        # 动漫
-                        download_dir = settings.SAVE_ANIME_PATH / _media.category
-                    else:
-                        # 电视剧
-                        download_dir = settings.SAVE_TV_PATH / _media.category
+                download_dir = Path(dir_info.path) / _media.category
             elif _media:
                 # 未开启下载二级目录
-                if _media.type != MediaType.TV:
-                    # 电影
-                    download_dir = settings.SAVE_MOVIE_PATH
-                else:
-                    if _media.genre_ids \
-                            and set(_media.genre_ids).intersection(set(settings.ANIME_GENREIDS)):
-                        # 动漫
-                        download_dir = settings.SAVE_ANIME_PATH
-                    else:
-                        # 电视剧
-                        download_dir = settings.SAVE_TV_PATH
+                download_dir = Path(dir_info.path)
             else:
                 # 未识别
-                download_dir = settings.SAVE_PATH
+                download_dir = Path(dir_info.path)
         else:
             # 自定义下载目录
             download_dir = Path(save_path)

app/chain/media.py

@@ -34,7 +34,7 @@ class MediaChain(ChainBase, metaclass=Singleton):
         # 识别媒体信息
         mediainfo: MediaInfo = self.recognize_media(meta=metainfo)
         if not mediainfo:
-            # 偿试使用辅助识别，如果有注册响应事件的话
+            # 尝试使用辅助识别，如果有注册响应事件的话
             if eventmanager.check(EventType.NameRecognize):
                 logger.info(f'请求辅助识别，标题：{title} ...')
                 mediainfo = self.recognize_help(title=title, org_meta=metainfo)
@@ -143,7 +143,7 @@ class MediaChain(ChainBase, metaclass=Singleton):
         # 识别媒体信息
         mediainfo = self.recognize_media(meta=file_meta)
         if not mediainfo:
-            # 偿试使用辅助识别，如果有注册响应事件的话
+            # 尝试使用辅助识别，如果有注册响应事件的话
             if eventmanager.check(EventType.NameRecognize):
                 logger.info(f'请求辅助识别，标题：{file_path.name} ...')
                 mediainfo = self.recognize_help(title=path, org_meta=file_meta)

app/chain/subscribe.py

@@ -600,11 +600,11 @@ class SubscribeChain(ChainBase):
 
                     # 先判断是否有没识别的种子
                     if not torrent_mediainfo or (not torrent_mediainfo.tmdb_id and not torrent_mediainfo.douban_id):
-                        logger.info(f'{torrent_info.site_name} - {torrent_info.title} 订阅缓存为未识别状态，偿试重新识别...')
+                        logger.info(f'{torrent_info.site_name} - {torrent_info.title} 订阅缓存为未识别状态，尝试重新识别...')
                         # 重新识别（不使用缓存）
                         torrent_mediainfo = self.recognize_media(meta=torrent_meta, cache=False)
                         if not torrent_mediainfo:
-                            logger.warn(f'{torrent_info.site_name} - {torrent_info.title} 重新识别失败，偿试通过标题匹配...')
+                            logger.warn(f'{torrent_info.site_name} - {torrent_info.title} 重新识别失败，尝试通过标题匹配...')
                             if self.torrenthelper.match_torrent(mediainfo=mediainfo,
                                                                 torrent_meta=torrent_meta,
                                                                 torrent=torrent_info):

app/chain/transfer.py

@@ -357,7 +357,7 @@ class TransferChain(ChainBase):
                     transferinfo=transferinfo
                 )
                 # 刮削单个文件
-                if settings.SCRAP_METADATA:
+                if transferinfo.need_scrape:
                     self.scrape_metadata(path=transferinfo.target_path,
                                          mediainfo=file_mediainfo,
                                          transfer_type=transfer_type,