diff --git a/Contents/Code/__init__.py b/Contents/Code/__init__.py index eb8e585..16bc1b1 100644 --- a/Contents/Code/__init__.py +++ b/Contents/Code/__init__.py @@ -7,7 +7,7 @@ def ValidatePrefs(): pass def Start(): - Log('======================[Shoko Relay Agent v1.2.4]=======================') + Log('======================[Shoko Relay Agent v1.2.5]=======================') 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 @@ -366,7 +366,6 @@ def Update(self, metadata, media, lang, force): for season in seasons: if int(season_num) == season['SeasonNumber']: self.image_add(metadata.seasons[season_num].posters, try_get(season['Images'], 'Posters', [])) - self.image_add(metadata.seasons[season_num].posters, try_get(series_data['Images'], 'Posters', [])) # Add the preferred main series poster as a fallback in case of bad season posters break """ Enable if Plex fixes blocking legacy agent issue @@ -411,11 +410,13 @@ def image_add(self, meta, images): del meta[key] def summary_sanitizer(summary): - summary = re.sub(r'https?:\/\/\w+.\w+(?:\/?\w+)? \[([^\]]+)\]', r'\1', summary) # Replace links with text if Prefs['sanitizeSummary'] != 'Allow Both Types': if Prefs['sanitizeSummary'] != 'Allow Info Lines' : summary = re.sub(r'\n(Source|Note|Summary):.*', '', summary, flags=re.S) # Remove the line if it starts with ("Source: ", "Note: ", "Summary: ") if Prefs['sanitizeSummary'] != 'Allow Misc. Lines' : summary = re.sub(ur'^(\*|\u2014|--|~) .*', '', summary, flags=re.M | re.U) # Remove the line if it starts with ("* ", "— ", "-- ", "~ ") - summary = re.sub(r'\n\n+', r'\n\n', summary, flags=re.S) # Condense stacked empty lines + summary = re.sub(r'https?:\/\/\w+.\w+(?:\/?\w+)? \[([^\]]+)\]', r'\1', summary) # Replace links with text + summary = re.sub(r'\[i\].*\[\/i\]', '', summary, flags=re.S) # Remove leftover BBCode [i] tags + summary = re.sub(r'\n\n+', r'\n\n', summary, flags=re.S) # Condense stacked empty lines + summary = re.sub(r' +', ' ', summary) # Remove double spaces return summary.strip(' \n') def title_case(text): diff --git a/Contents/Info.plist b/Contents/Info.plist index e11ea90..5501ee5 100644 --- a/Contents/Info.plist +++ b/Contents/Info.plist @@ -5,7 +5,7 @@ CFBundleName Shoko Relay CFBundleVersion - 1.2.4 + 1.2.5 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 1b4a6db..4ee0704 100644 --- a/Contents/Scanners/Series/Shoko Relay Scanner.py +++ b/Contents/Scanners/Series/Shoko Relay Scanner.py @@ -75,7 +75,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.4]' + '=' * 245) + Log.info('===========================[Shoko Relay Scanner v1.2.5]' + '=' * 245) if files: # Scan for video files diff --git a/README.md b/README.md index 33d14b3..0a1d1b8 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.101+) 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.104+) 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`