diff --git a/Contents/Code/__init__.py b/Contents/Code/__init__.py index dc6170c..9385e17 100644 --- a/Contents/Code/__init__.py +++ b/Contents/Code/__init__.py @@ -6,7 +6,7 @@ def ValidatePrefs(): pass def Start(): - Log('======================[Shoko Relay Agent v1.2.10]======================') + Log('======================[Shoko Relay Agent v1.2.11]======================') HTTP.Headers['Accept'] = 'application/json' HTTP.ClearCache() # Clear the cache possibly removing stuck metadata HTTP.CacheTime = 0.1 # Reduce the cache time as much as possible since Shoko has all the metadata @@ -192,11 +192,8 @@ def Update(self, metadata, media, lang, force): # Get Posters & Backgrounds if Prefs['addEveryImage']: series_images = HttpReq('api/v3/Series/%s/Images?includeDisabled=false' % series_id) # http://127.0.0.1:8111/api/v3/Series/24/Images?includeDisabled=false - posters, backgrounds = try_get(series_images, 'Posters', []), try_get(series_images, 'Backdrops', []) - for poster in [p for p in posters if poster['Preferred']]: posters.insert(0, posters.pop(posters.index(poster))) # Move preferred poster to the top of the list - self.image_add(metadata.posters, posters, '(Poster): ') - for background in [b for b in backgrounds if backdrop['Preferred']]: backgrounds.insert(0, backgrounds.pop(backgrounds.index(background))) # Move preferred backdrop to the top of the list - self.image_add(metadata.art, backgrounds, '(Background): ') + self.image_add(metadata.posters, try_get(series_images, 'Posters', []), '(Poster): ') + self.image_add(metadata.art, try_get(series_images, 'Backdrops', []), '(Background): ') else: # Series data only contains the preferred image for each type self.image_add(metadata.posters, try_get(series_data['Images'], 'Posters', []), '(Poster): ') self.image_add(metadata.art, try_get(series_data['Images'], 'Backdrops', []), '(Background): ') diff --git a/Contents/DefaultPrefs.json b/Contents/DefaultPrefs.json index e35dd5e..7e04866 100644 --- a/Contents/DefaultPrefs.json +++ b/Contents/DefaultPrefs.json @@ -116,7 +116,7 @@ { "id": "sanitizeSummary", - "label": "The degree to which the summary is cleansed of extraneous info ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ This includes lines starting with general info (\"Source: \", \"Note: \", \"Summary: \"), as well as other miscellaneous lines (\"* \", \"— \", \"- \", \"~ \").", + "label": "The degree to which the summary is cleansed of extraneous info ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ This includes lines starting with general info (\"Source: \", \"Note: \", \"Summary: \"), as well as other miscellaneous lines (\"* \", \"— \", \"- \", \"~ \").", "type": "enum", "values" : ["Fully Sanitize", "Allow Info Lines", "Allow Misc. Lines", "Allow Both Types"], "default": "Fully Sanitize" diff --git a/Contents/Info.plist b/Contents/Info.plist index fdb00ce..311c9a3 100644 --- a/Contents/Info.plist +++ b/Contents/Info.plist @@ -5,7 +5,7 @@ CFBundleName Shoko Relay CFBundleVersion - 1.2.10 + 1.2.11 CFBundleIdentifier com.plexapp.agents.shokorelay PlexClientPlatforms diff --git a/Contents/Scanners/Series/Shoko Relay Scanner.py b/Contents/Scanners/Series/Shoko Relay Scanner.py index c8a71ab..5753330 100644 --- a/Contents/Scanners/Series/Shoko Relay Scanner.py +++ b/Contents/Scanners/Series/Shoko Relay Scanner.py @@ -73,7 +73,7 @@ def Scan(path, files, mediaList, subdirs, language=None, root=None): if files : Log.debug('[Files] %s' % ', '.join(files)) for subdir in subdirs: Log.debug('[Folder] %s' % os.path.relpath(subdir, root)) - Log.info('===========================[Shoko Relay Scanner v1.2.10]' + '=' * 244) + Log.info('===========================[Shoko Relay Scanner v1.2.11]' + '=' * 244) if files: # Scan for video files diff --git a/README.md b/README.md index 5eb38f3..720edd1 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![Shoko Relay Logo](https://github.com/natyusha/ShokoRelay.bundle/assets/985941/23bfd7c2-eb89-46d5-a7cb-558c374393d6 "Shoko Relay") ======================= -This is a bundle containing a Plex metadata agent, scanner, and automation scripts written to work with anything listed on AniDB. All you need to get started is a populated [Shoko Server](https://shokoanime.com/) (v4.2.2.161+) and [Plex Media Server](https://www.plex.tv/media-server-downloads/) (Not running on an Nvidia Shield). Unlike the original metadata bundle for Shoko this one does not include a movie scanner and is intended to work with series of all types within a single "TV Shows" library. +This is a bundle containing a Plex metadata agent, scanner, and automation scripts written to work with anything listed on AniDB. All you need to get started is a populated [Shoko Server](https://shokoanime.com/) (v4.2.2.176+) and [Plex Media Server](https://www.plex.tv/media-server-downloads/) (Not running on an Nvidia Shield). Unlike the original metadata bundle for Shoko this one does not include a movie scanner and is intended to work with series of all types within a single "TV Shows" library. ## Installation - Extract [the latest release](https://github.com/natyusha/ShokoRelay.bundle/releases/latest/download/ShokoRelay.bundle.zip) into your [Plex Media Server Plug-ins Folder](https://support.plex.tv/articles/201106098-how-do-i-find-the-plug-ins-folder/) `\Plex Media Server\Plug-ins`