diff --git a/app/core/meta/releasegroup.py b/app/core/meta/releasegroup.py index 77eab1e1..ad9fb42d 100644 --- a/app/core/meta/releasegroup.py +++ b/app/core/meta/releasegroup.py @@ -70,7 +70,7 @@ class ReleaseGroupsMatcher(metaclass=Singleton): "U2": [], "ultrahd": [], "others": ['B(?:MDru|eyondHD|TN)', 'C(?:fandora|trlhd|MRG)', 'DON', 'EVO', 'FLUX', 'HONE(?:|yG)', - 'N(?:oGroup|T(?:b|G))', 'PandaMoon', 'SMURF', 'T(?:EPES|aengoo|rollHD )'], + 'N(?:oGroup|T(?:b|G))', 'PandaMoon', 'SMURF', 'T(?:EPES|aengoo|rollHD )', 'UBWEB'], "anime": ['ANi', 'HYSUB', 'KTXP', 'LoliHouse', 'MCE', 'Nekomoe kissaten', 'SweetSub', 'MingY', '(?:Lilith|NC)-Raws', '织梦字幕组', '枫叶字幕组', '猎户手抄部', '喵萌奶茶屋', '漫猫字幕社', '霜庭云花Sub', '北宇治字幕组', '氢气烤肉架', '云歌字幕组', '萌樱字幕组', '极影字幕社', diff --git a/app/modules/emby/emby.py b/app/modules/emby/emby.py index e963c1e9..a3bf4508 100644 --- a/app/modules/emby/emby.py +++ b/app/modules/emby/emby.py @@ -155,7 +155,7 @@ class Emby: case "tvshows": library_type = MediaType.TV.value case _: - continue + library_type = MediaType.UNKNOWN.value image = self.__get_local_image_by_id(library.get("Id")) libraries.append( schemas.MediaServerLibrary( diff --git a/app/modules/jellyfin/jellyfin.py b/app/modules/jellyfin/jellyfin.py index 847f955f..d9fd9375 100644 --- a/app/modules/jellyfin/jellyfin.py +++ b/app/modules/jellyfin/jellyfin.py @@ -149,16 +149,18 @@ class Jellyfin: match library.get("CollectionType"): case "movies": library_type = MediaType.MOVIE.value + link = f"{self._playhost or self._host}web/index.html#!" \ + f"/movies.html?topParentId={library.get('Id')}" case "tvshows": library_type = MediaType.TV.value + link = f"{self._playhost or self._host}web/index.html#!" \ + f"/tv.html?topParentId={library.get('Id')}" case _: - continue + # FIXME + library_type = MediaType.UNKNOWN.value + link = f"{self._playhost or self._host}web/index.html#!" \ + f"/movies.html?topParentId={library.get('Id')}" image = self.__get_local_image_by_id(library.get("Id")) - link = f"{self._playhost or self._host}web/index.html#!" \ - f"/movies.html?topParentId={library.get('Id')}" \ - if library_type == MediaType.MOVIE.value \ - else f"{self._playhost or self._host}web/index.html#!" \ - f"/tv.html?topParentId={library.get('Id')}" libraries.append( schemas.MediaServerLibrary( server="jellyfin",