From e2e1c7642d39aac9dd27b09631754b2964c4516d Mon Sep 17 00:00:00 2001 From: jxxghp Date: Mon, 10 Jun 2024 09:38:12 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E8=AE=A2=E9=98=85=E9=87=8D=E7=BD=AE=20&?= =?UTF-8?q?=20TMDB=E7=94=B5=E8=A7=86=E5=89=A7=E6=A6=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/endpoints/subscribe.py | 3 ++- app/chain/subscribe.py | 2 +- app/helper/directory.py | 1 - app/modules/themoviedb/tmdbapi.py | 3 ++- app/modules/themoviedb/tmdbv3api/objs/discover.py | 8 ++++---- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/api/endpoints/subscribe.py b/app/api/endpoints/subscribe.py index 309c7607..18bb5a69 100644 --- a/app/api/endpoints/subscribe.py +++ b/app/api/endpoints/subscribe.py @@ -200,7 +200,8 @@ def reset_subscribes( subscribe = Subscribe.get(db, subid) if subscribe: subscribe.update(db, { - "note": None + "note": "", + "lack_episode": subscribe.total_episode }) return schemas.Response(success=True) return schemas.Response(success=False, message="订阅不存在") diff --git a/app/chain/subscribe.py b/app/chain/subscribe.py index 149cca5e..550f956e 100644 --- a/app/chain/subscribe.py +++ b/app/chain/subscribe.py @@ -156,7 +156,7 @@ class SubscribeChain(ChainBase): 'sites': self.__get_default_subscribe_config(mediainfo.type, "sites") or None if not kwargs.get( "sites") else kwargs.get("sites"), 'save_path': self.__get_default_subscribe_config(mediainfo.type, "save_path") if not kwargs.get( - "save_path") else kwargs.get("save_path"), + "save_path") else kwargs.get("save_path") }) sid, err_msg = self.subscribeoper.add(mediainfo=mediainfo, season=season, username=username, **kwargs) if not sid: diff --git a/app/helper/directory.py b/app/helper/directory.py index 19ac75e4..fae79237 100644 --- a/app/helper/directory.py +++ b/app/helper/directory.py @@ -7,7 +7,6 @@ from app.core.context import MediaInfo from app.db.systemconfig_oper import SystemConfigOper from app.log import logger from app.schemas.types import SystemConfigKey, MediaType -from app.utils.string import StringUtils from app.utils.system import SystemUtils diff --git a/app/modules/themoviedb/tmdbapi.py b/app/modules/themoviedb/tmdbapi.py index 7532835c..dc1bc8c0 100644 --- a/app/modules/themoviedb/tmdbapi.py +++ b/app/modules/themoviedb/tmdbapi.py @@ -1072,7 +1072,8 @@ class TmdbApi: return [] try: logger.debug(f"正在发现电视剧：{kwargs}...") - tmdbinfo = self.discover.discover_tv_shows(kwargs) + params_tuple = tuple(kwargs.items()) + tmdbinfo = self.discover.discover_tv_shows(params_tuple) if tmdbinfo: for info in tmdbinfo: info['media_type'] = MediaType.TV diff --git a/app/modules/themoviedb/tmdbv3api/objs/discover.py b/app/modules/themoviedb/tmdbv3api/objs/discover.py index 50fca6ef..a79891a5 100644 --- a/app/modules/themoviedb/tmdbv3api/objs/discover.py +++ b/app/modules/themoviedb/tmdbv3api/objs/discover.py @@ -17,18 +17,18 @@ class Discover(TMDb): def discover_movies(self, params_tuple): """ Discover movies by different types of data like average rating, number of votes, genres and certifications. - :param params: dict + :param params_tuple: dict :return: """ params = dict(params_tuple) return self._request_obj(self._urls["movies"], urlencode(params), key="results", call_cached=False) @cached(cache=TTLCache(maxsize=1, ttl=43200)) - def discover_tv_shows(self, params): + def discover_tv_shows(self, params_tuple): """ Discover TV shows by different types of data like average rating, number of votes, genres, the network they aired on and air dates. - :param params: dict + :param params_tuple: dict :return: """ - return self._request_obj(self._urls["tv"], urlencode(params), key="results", call_cached=False) + return self._request_obj(self._urls["tv"], urlencode(params_tuple), key="results", call_cached=False)