From 852a255eaf32eb1ecdd0c6efaf0a8cf3b6789ba9 Mon Sep 17 00:00:00 2001 From: jxxghp Date: Wed, 7 Jun 2023 18:28:54 +0800 Subject: [PATCH] fix bug --- app/chain/__init__.py | 3 ++- app/chain/transfer.py | 7 +++++-- app/modules/__init__.py | 5 +++-- app/modules/emby/emby.py | 5 +++++ app/modules/indexer/__init__.py | 10 ++++++---- app/modules/indexer/spider.py | 3 ++- app/modules/indexer/tnode.py | 4 +++- app/modules/indexer/torrentleech.py | 4 +++- app/modules/jellyfin/jellyfin.py | 5 +++++ app/modules/plex/plex.py | 5 +++++ 10 files changed, 39 insertions(+), 12 deletions(-) diff --git a/app/chain/__init__.py b/app/chain/__init__.py index a4428e34..6bdc2ead 100644 --- a/app/chain/__init__.py +++ b/app/chain/__init__.py @@ -1,3 +1,4 @@ +import traceback from abc import abstractmethod from typing import Optional, Any @@ -54,5 +55,5 @@ class _ChainBase(AbstractSingleton, metaclass=Singleton): if temp: result = temp except Exception as err: - logger.error(f"运行模块出错：{module.__class__.__name__} - {err}") + logger.error(f"运行模块 {method} 出错：{module.__class__.__name__} - {err}\n{traceback.print_exc()}") return result diff --git a/app/chain/transfer.py b/app/chain/transfer.py index 94bc20fd..c01dba37 100644 --- a/app/chain/transfer.py +++ b/app/chain/transfer.py @@ -27,11 +27,14 @@ class TransferChain(_ChainBase): for torrent in torrents: # 识别元数据 meta = MetaInfo(torrent.get("title")) + if not meta.get_name(): + logger.warn(f'未识别到元数据，标题：{torrent.get("title")}') + continue # 识别媒体信息 mediainfo: MediaInfo = self.run_module('recognize_media', meta=meta) if not mediainfo: logger.warn(f'未识别到媒体信息，标题：{torrent.get("title")}') - return False + continue logger.info(f"{torrent.get('title')} 识别为：{mediainfo.type.value} {mediainfo.get_title_string()}") # 更新媒体图片 self.run_module("obtain_image", mediainfo=mediainfo) @@ -39,7 +42,7 @@ class TransferChain(_ChainBase): dest_path: Path = self.run_module("transfer", mediainfo=mediainfo, path=torrent.get("path")) if not dest_path: logger.warn(f"{torrent.get('title')} 转移失败") - return False + continue # 刮剥 self.run_module("scrape_metadata", path=dest_path, mediainfo=mediainfo) diff --git a/app/modules/__init__.py b/app/modules/__init__.py index 7bdb2535..20894d37 100644 --- a/app/modules/__init__.py +++ b/app/modules/__init__.py @@ -3,6 +3,7 @@ from pathlib import Path from typing import Optional, List, Tuple, Union, Set from fastapi import Request +from ruamel.yaml import CommentedMap from app.core.context import MediaInfo, TorrentInfo from app.core.meta import MetaBase @@ -93,7 +94,7 @@ class _ModuleBase(metaclass=ABCMeta): """ pass - def search_torrents(self, mediainfo: Optional[MediaInfo], sites: List[dict], + def search_torrents(self, mediainfo: Optional[MediaInfo], sites: List[CommentedMap], keyword: str = None) -> Optional[List[TorrentInfo]]: """ 搜索站点，多个站点需要多线程处理 @@ -104,7 +105,7 @@ class _ModuleBase(metaclass=ABCMeta): """ pass - def refresh_torrents(self, sites: List[dict]) -> Optional[List[TorrentInfo]]: + def refresh_torrents(self, sites: List[CommentedMap]) -> Optional[List[TorrentInfo]]: """ 获取站点最新一页的种子，多个站点需要多线程处理 :param sites: 站点列表 diff --git a/app/modules/emby/emby.py b/app/modules/emby/emby.py index 6c9f6dac..24d58d5c 100644 --- a/app/modules/emby/emby.py +++ b/app/modules/emby/emby.py @@ -14,6 +14,11 @@ class Emby(metaclass=Singleton): def __init__(self): self._host = settings.EMBY_HOST + if self._host: + if not self._host.endswith("/"): + self._host += "/" + if not self._host.startswith("http"): + self._host = "http://" + self._host self._apikey = settings.EMBY_API_KEY self._user = self.get_user() self._folders = self.get_emby_folders() diff --git a/app/modules/indexer/__init__.py b/app/modules/indexer/__init__.py index d49dcc97..105516ba 100644 --- a/app/modules/indexer/__init__.py +++ b/app/modules/indexer/__init__.py @@ -3,6 +3,8 @@ from concurrent.futures import ThreadPoolExecutor, as_completed from datetime import datetime from typing import List, Optional, Tuple, Union +from ruamel.yaml import CommentedMap + from app.core import MediaInfo, TorrentInfo from app.log import logger from app.modules import _ModuleBase @@ -23,7 +25,7 @@ class IndexerModule(_ModuleBase): def init_setting(self) -> Tuple[str, Union[str, bool]]: return "INDEXER", "builtin" - def search_torrents(self, mediainfo: Optional[MediaInfo], sites: List[dict], + def search_torrents(self, mediainfo: Optional[MediaInfo], sites: List[CommentedMap], keyword: str = None) -> Optional[List[TorrentInfo]]: """ 搜索站点，多个站点需要多线程处理 @@ -54,7 +56,7 @@ class IndexerModule(_ModuleBase): # 返回 return results - def __search(self, mediainfo: MediaInfo, site: dict, + def __search(self, mediainfo: MediaInfo, site: CommentedMap, keyword: str = None) -> Optional[List[TorrentInfo]]: """ 搜索一个站点 @@ -111,7 +113,7 @@ class IndexerModule(_ModuleBase): **result) for result in result_array] @staticmethod - def __spider_search(indexer: dict, + def __spider_search(indexer: CommentedMap, keyword: str = None, mtype: MediaType = None, page: int = None, timeout: int = 30) -> (bool, List[dict]): @@ -145,7 +147,7 @@ class IndexerModule(_ModuleBase): _spider.torrents_info_array.clear() return result_flag, result_array - def refresh_torrents(self, sites: List[dict]) -> Optional[List[TorrentInfo]]: + def refresh_torrents(self, sites: List[CommentedMap]) -> Optional[List[TorrentInfo]]: """ 获取站点最新一页的种子，多个站点需要多线程处理 :param sites: 站点列表 diff --git a/app/modules/indexer/spider.py b/app/modules/indexer/spider.py index 26e7be8d..483c7a33 100644 --- a/app/modules/indexer/spider.py +++ b/app/modules/indexer/spider.py @@ -7,6 +7,7 @@ import feapder from feapder.utils.tools import urlencode from jinja2 import Template from pyquery import PyQuery +from ruamel.yaml import CommentedMap from app.core import settings from app.log import logger @@ -81,7 +82,7 @@ class TorrentSpider(feapder.AirSpider): # 种子列表 torrents_info_array: list = [] - def setparam(self, indexer, + def setparam(self, indexer: CommentedMap, keyword: [str, list] = None, page=None, referer=None, diff --git a/app/modules/indexer/tnode.py b/app/modules/indexer/tnode.py index a8c60c6c..085cb7a8 100644 --- a/app/modules/indexer/tnode.py +++ b/app/modules/indexer/tnode.py @@ -1,6 +1,8 @@ import re from typing import Tuple, List +from ruamel.yaml import CommentedMap + from app.core import settings from app.log import logger from app.utils.http import RequestUtils @@ -20,7 +22,7 @@ class TNodeSpider: _downloadurl = "%sapi/torrent/download/%s" _pageurl = "%storrent/info/%s" - def __init__(self, indexer: dict): + def __init__(self, indexer: CommentedMap): if indexer: self._indexerid = indexer.get('id') self._domain = indexer.get('domain') diff --git a/app/modules/indexer/torrentleech.py b/app/modules/indexer/torrentleech.py index 2983e925..064974c9 100644 --- a/app/modules/indexer/torrentleech.py +++ b/app/modules/indexer/torrentleech.py @@ -1,6 +1,8 @@ from typing import List, Tuple from urllib.parse import quote +from ruamel.yaml import CommentedMap + from app.core import settings from app.log import logger from app.utils.http import RequestUtils @@ -16,7 +18,7 @@ class TorrentLeech: _downloadurl = "%sdownload/%s/%s" _pageurl = "%storrent/%s" - def __init__(self, indexer: dict): + def __init__(self, indexer: CommentedMap): self._indexer = indexer if indexer.get('proxy'): self._proxy = settings.PROXY diff --git a/app/modules/jellyfin/jellyfin.py b/app/modules/jellyfin/jellyfin.py index e62b3dbd..790e3696 100644 --- a/app/modules/jellyfin/jellyfin.py +++ b/app/modules/jellyfin/jellyfin.py @@ -12,6 +12,11 @@ class Jellyfin(metaclass=Singleton): def __init__(self): self._host = settings.JELLYFIN_HOST + if self._host: + if not self._host.endswith("/"): + self._host += "/" + if not self._host.startswith("http"): + self._host = "http://" + self._host self._apikey = settings.JELLYFIN_API_KEY self._user = self.get_user() self._serverid = self.get_server_id() diff --git a/app/modules/plex/plex.py b/app/modules/plex/plex.py index 8f3dd909..641a661f 100644 --- a/app/modules/plex/plex.py +++ b/app/modules/plex/plex.py @@ -14,6 +14,11 @@ class Plex(metaclass=Singleton): def __init__(self): self._host = settings.PLEX_HOST + if self._host: + if not self._host.endswith("/"): + self._host += "/" + if not self._host.startswith("http"): + self._host = "http://" + self._host self._token = settings.PLEX_TOKEN if self._host and self._token: try: