diff --git a/app/modules/themoviedb/tmdbapi.py b/app/modules/themoviedb/tmdbapi.py index 7368b1d3..9bc6e377 100644 --- a/app/modules/themoviedb/tmdbapi.py +++ b/app/modules/themoviedb/tmdbapi.py @@ -222,7 +222,11 @@ class TmdbHelper: return {} else: # 按年份降序排列 - movies = sorted(movies, key=lambda x: x.get('release_date'), reverse=True) + movies = sorted( + movies, + key=lambda x: x.get('release_date') or '0000-00-00', + reverse=True + ) for movie in movies: # 年份 movie_year = movie.get('release_date')[0:4] if movie.get('release_date') else None @@ -266,7 +270,11 @@ class TmdbHelper: return {} else: # 按年份降序排列 - tvs = sorted(tvs, key=lambda x: x.get('first_air_date'), reverse=True) + tvs = sorted( + tvs, + key=lambda x: x.get('first_air_date') or '0000-00-00', + reverse=True + ) for tv in tvs: tv_year = tv.get('first_air_date')[0:4] if tv.get('first_air_date') else None if year and tv_year != year: @@ -324,7 +332,11 @@ class TmdbHelper: return {} else: # 按年份降序排列 - tvs = sorted(tvs, key=lambda x: x.get('first_air_date'), reverse=True) + tvs = sorted( + tvs, + key=lambda x: x.get('first_air_date') or '0000-00-00', + reverse=True + ) for tv in tvs: # 年份 tv_year = tv.get('first_air_date')[0:4] if tv.get('first_air_date') else None @@ -398,7 +410,12 @@ class TmdbHelper: if len(multis) == 0: logger.debug(f"{name} 未找到相关媒体息!") else: - # 匹配标题、原标题 + # 按年份降序排列 + multis = sorted( + multis, + key=lambda x: x.get('release_date') or x.get('first_air_date') or '0000-00-00', + reverse=True + ) for multi in multis: if multi.get("media_type") == "movie": if self.__compare_names(name, multi.get('title')) \