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

fix webhook

Browse Source
This commit is contained in:
thsrite 2023-10-31 15:37:39 +08:00
parent b23f78e94d
commit c07e12cc5a
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -244,7 +244,7 @@ class Emby(metaclass=Singleton):
"&Limit=10" "&Limit=10"
"&IncludeSearchTypes=false" "&IncludeSearchTypes=false"
"&api_key=%s") % ( "&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)
if res: if res:
@ -803,7 +803,9 @@ class Emby(metaclass=Singleton):
logger.debug(f"接收到emby webhook：{message}") logger.debug(f"接收到emby webhook：{message}")
eventItem = schemas.WebhookEventInfo(event=eventType, channel="emby") eventItem = schemas.WebhookEventInfo(event=eventType, channel="emby")
if message.get('Item'): if message.get('Item'):
if message.get('Item', {}).get('Type') == 'Episode': if message.get('Item', {}).get('Type') == 'Episode' \
or message.get('Item', {}).get('Type') == 'Series' \
or message.get('Item', {}).get('Type') == 'Season':
eventItem.item_type = "TV" eventItem.item_type = "TV"
if message.get('Item', {}).get('SeriesName') \ if message.get('Item', {}).get('SeriesName') \
and message.get('Item', {}).get('ParentIndexNumber') \ and message.get('Item', {}).get('ParentIndexNumber') \

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

@ -212,7 +212,7 @@ class Jellyfin(metaclass=Singleton):
return None return None
req_url = ("%sUsers/%s/Items?" req_url = ("%sUsers/%s/Items?"
"api_key=%s&searchTerm=%s&IncludeItemTypes=Series&Limit=10&Recursive=true") % ( "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)
if res: if res:
@ -227,8 +227,8 @@ class Jellyfin(metaclass=Singleton):
return None return None
return "" return ""
def get_movies(self, def get_movies(self,
title: str, title: str,
year: str = None, year: str = None,
tmdb_id: int = None) -> Optional[List[schemas.MediaServerItem]]: tmdb_id: int = None) -> Optional[List[schemas.MediaServerItem]]:
""" """
@ -242,7 +242,7 @@ class Jellyfin(metaclass=Singleton):
return None return None
req_url = ("%sUsers/%s/Items?" req_url = ("%sUsers/%s/Items?"
"api_key=%s&searchTerm=%s&IncludeItemTypes=Movie&Limit=10&Recursive=true") % ( "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)
if res: if res:
@ -466,7 +466,9 @@ class Jellyfin(metaclass=Singleton):
eventItem.device_name = message.get('DeviceName') eventItem.device_name = message.get('DeviceName')
eventItem.user_name = message.get('NotificationUsername') eventItem.user_name = message.get('NotificationUsername')
eventItem.client = message.get('ClientName') eventItem.client = message.get('ClientName')
if message.get("ItemType") == "Episode": if message.get("ItemType") == "Episode" \
or message.get("ItemType") == "Series" \
or message.get("ItemType") == "Season":
# 剧集 # 剧集
eventItem.item_type = "TV" eventItem.item_type = "TV"
eventItem.season_id = message.get('SeasonNumber') eventItem.season_id = message.get('SeasonNumber')