codfrm/MoviePilot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
jxxghp
2023-09-30 20:40:48 +08:00
parent f78df58906
commit ba27d02854
6 changed files with 47 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/modules/emby/__init__.py
View File

@ -1,5 +1,5 @@
from pathlib import Path from pathlib import Path
from typing import Optional, Tuple, Union, Any, List, Generator from typing import Optional, Tuple, Union, Any, List
from app import schemas from app import schemas
from app.core.context import MediaInfo from app.core.context import MediaInfo

12
app/modules/emby/emby.py
View File

@ -235,7 +235,15 @@ class Emby(metaclass=Singleton):
""" """
if not self._host or not self._apikey: if not self._host or not self._apikey:
return None return None
req_url = "%semby/Items?IncludeItemTypes=Series&Fields=ProductionYear&StartIndex=0&Recursive=true&SearchTerm=%s&Limit=10&IncludeSearchTypes=false&api_key=%s" % ( req_url = ("%semby/Items?"
"IncludeItemTypes=Series"
"&Fields=ProductionYear"
"&StartIndex=0"
"&Recursive=true"
"&SearchTerm=%s"
"&Limit=10"
"&IncludeSearchTypes=false"
"&api_key=%s") % (
self._host, name, self._apikey) self._host, name, self._apikey)
try: try:
res = RequestUtils().get_res(req_url) res = RequestUtils().get_res(req_url)
@ -334,7 +342,7 @@ class Emby(metaclass=Singleton):
if tmdb_id and item_info.tmdbid: if tmdb_id and item_info.tmdbid:
if str(tmdb_id) != str(item_info.tmdbid): if str(tmdb_id) != str(item_info.tmdbid):
return None, {} return None, {}
# /Shows/Id/Episodes 查集的信息 # 查集的信息
if not season: if not season:
season = "" season = ""
try: try:

2
app/modules/jellyfin/__init__.py
View File

@ -1,5 +1,5 @@
from pathlib import Path from pathlib import Path
from typing import Optional, Tuple, Union, Any, List, Generator from typing import Optional, Tuple, Union, Any, List
from app import schemas from app import schemas
from app.core.context import MediaInfo from app.core.context import MediaInfo

6
app/modules/jellyfin/jellyfin.py
View File

@ -210,7 +210,8 @@ class Jellyfin(metaclass=Singleton):
""" """
if not self._host or not self._apikey or not self.user: if not self._host or not self._apikey or not self.user:
return None return None
req_url = "%sUsers/%s/Items?api_key=%s&searchTerm=%s&IncludeItemTypes=Series&Limit=10&Recursive=true" % ( req_url = ("%sUsers/%s/Items?"
"api_key=%s&searchTerm=%s&IncludeItemTypes=Series&Limit=10&Recursive=true") % (
self._host, self.user, self._apikey, name) self._host, self.user, self._apikey, name)
try: try:
res = RequestUtils().get_res(req_url) res = RequestUtils().get_res(req_url)
@ -239,7 +240,8 @@ class Jellyfin(metaclass=Singleton):
""" """
if not self._host or not self._apikey or not self.user: if not self._host or not self._apikey or not self.user:
return None return None
req_url = "%sUsers/%s/Items?api_key=%s&searchTerm=%s&IncludeItemTypes=Movie&Limit=10&Recursive=true" % ( req_url = ("%sUsers/%s/Items?"
"api_key=%s&searchTerm=%s&IncludeItemTypes=Movie&Limit=10&Recursive=true") % (
self._host, self.user, self._apikey, title) self._host, self.user, self._apikey, title)
try: try:
res = RequestUtils().get_res(req_url) res = RequestUtils().get_res(req_url)

2
app/modules/plex/__init__.py
View File

@ -1,5 +1,5 @@
from pathlib import Path from pathlib import Path
from typing import Optional, Tuple, Union, Any, List, Generator from typing import Optional, Tuple, Union, Any, List
from app import schemas from app import schemas
from app.core.context import MediaInfo from app.core.context import MediaInfo

43
app/modules/plex/plex.py
View File

@ -118,14 +118,20 @@ class Plex(metaclass=Singleton):
return None return None
ret_movies = [] ret_movies = []
if year: if year:
movies = self._plex.library.search(title=title, year=year, libtype="movie") movies = self._plex.library.search(title=title,
year=year,
libtype="movie")
# 根据原标题再查一遍 # 根据原标题再查一遍
if original_title and str(original_title) != str(title): if original_title and str(original_title) != str(title):
movies.extend(self._plex.library.search(title=original_title, year=year, libtype="movie")) movies.extend(self._plex.library.search(title=original_title,
year=year,
libtype="movie"))
else: else:
movies = self._plex.library.search(title=title, libtype="movie") movies = self._plex.library.search(title=title,
libtype="movie")
if original_title and str(original_title) != str(title): if original_title and str(original_title) != str(title):
movies.extend(self._plex.library.search(title=original_title, libtype="movie")) movies.extend(self._plex.library.search(title=original_title,
libtype="movie"))
for item in set(movies): for item in set(movies):
ids = self.__get_ids(item.guids) ids = self.__get_ids(item.guids)
if tmdb_id and ids['tmdb_id']: if tmdb_id and ids['tmdb_id']:
@ -174,9 +180,15 @@ class Plex(metaclass=Singleton):
videos = self._plex.fetchItem(item_id) videos = self._plex.fetchItem(item_id)
else: else:
# 根据标题和年份模糊搜索，该结果不够准确 # 根据标题和年份模糊搜索，该结果不够准确
videos = self._plex.library.search(title=title, year=year, libtype="show") videos = self._plex.library.search(title=title,
if not videos and original_title and str(original_title) != str(title): year=year,
videos = self._plex.library.search(title=original_title, year=year, libtype="show") libtype="show")
if (not videos
and original_title
and str(original_title) != str(title)):
videos = self._plex.library.search(title=original_title,
year=year,
libtype="show")
if not videos: if not videos:
return None, {} return None, {}
if isinstance(videos, list): if isinstance(videos, list):
@ -206,9 +218,11 @@ class Plex(metaclass=Singleton):
return None return None
try: try:
if image_type == "Poster": if image_type == "Poster":
images = self._plex.fetchItems('/library/metadata/%s/posters' % item_id, cls=media.Poster) images = self._plex.fetchItems('/library/metadata/%s/posters' % item_id,
cls=media.Poster)
else: else:
images = self._plex.fetchItems('/library/metadata/%s/arts' % item_id, cls=media.Art) images = self._plex.fetchItems('/library/metadata/%s/arts' % item_id,
cls=media.Art)
for image in images: for image in images:
if hasattr(image, 'key') and image.key.startswith('http'): if hasattr(image, 'key') and image.key.startswith('http'):
return image.key return image.key
@ -410,7 +424,7 @@ class Plex(metaclass=Singleton):
"parentTitle": "Combat Shadow Fighting Saga / Great Prison Battle Saga", "parentTitle": "Combat Shadow Fighting Saga / Great Prison Battle Saga",
"originalTitle": "Baki Hanma", "originalTitle": "Baki Hanma",
"contentRating": "TV-MA", "contentRating": "TV-MA",
"summary": "The world is shaken by news of a man taking down a monstrous elephant with his bare hands. Back in Japan, Baki is confronted by a knife-wielding child.", "summary": "The world is shaken by news",
"index": 1, "index": 1,
"parentIndex": 1, "parentIndex": 1,
"audienceRating": 8.5, "audienceRating": 8.5,
@ -492,14 +506,17 @@ class Plex(metaclass=Singleton):
eventItem.season_id = message.get('Metadata', {}).get('parentIndex') eventItem.season_id = message.get('Metadata', {}).get('parentIndex')
eventItem.episode_id = message.get('Metadata', {}).get('index') eventItem.episode_id = message.get('Metadata', {}).get('index')
if message.get('Metadata', {}).get('summary') and len(message.get('Metadata', {}).get('summary')) > 100: if (message.get('Metadata', {}).get('summary')
and len(message.get('Metadata', {}).get('summary')) > 100):
eventItem.overview = str(message.get('Metadata', {}).get('summary'))[:100] + "..." eventItem.overview = str(message.get('Metadata', {}).get('summary'))[:100] + "..."
else: else:
eventItem.overview = message.get('Metadata', {}).get('summary') eventItem.overview = message.get('Metadata', {}).get('summary')
else: else:
eventItem.item_type = "MOV" if message.get('Metadata', {}).get('type') == 'movie' else "SHOW" eventItem.item_type = "MOV" if message.get('Metadata',
{}).get('type') == 'movie' else "SHOW"
eventItem.item_name = "%s %s" % ( eventItem.item_name = "%s %s" % (
message.get('Metadata', {}).get('title'), "(" + str(message.get('Metadata', {}).get('year')) + ")") message.get('Metadata', {}).get('title'),
"(" + str(message.get('Metadata', {}).get('year')) + ")")
eventItem.item_id = message.get('Metadata', {}).get('ratingKey') eventItem.item_id = message.get('Metadata', {}).get('ratingKey')
if len(message.get('Metadata', {}).get('summary')) > 100: if len(message.get('Metadata', {}).get('summary')) > 100:
eventItem.overview = str(message.get('Metadata', {}).get('summary'))[:100] + "..." eventItem.overview = str(message.get('Metadata', {}).get('summary'))[:100] + "..."