add images for wiki 2.5

# Conflicts:
#	README.md

Contents/Code/support/items.py

@@ -260,7 +260,7 @@ def is_ignored(rating_key, item=None):
     :return:
     """
     # item in soft ignore list
-    if rating_key in ignore_list["videos"]:
+    if ignore_list["videos"] and rating_key in ignore_list["videos"]:
         Log.Debug("Item %s is in the soft ignore list" % rating_key)
         return True
 
@@ -268,17 +268,17 @@ def is_ignored(rating_key, item=None):
     kind = get_item_kind(item)
 
     # show in soft ignore list
-    if kind == "Episode" and item.show.rating_key in ignore_list["series"]:
+    if kind == "Episode" and ignore_list["series"] and item.show.rating_key in ignore_list["series"]:
         Log.Debug("Item %s's show is in the soft ignore list" % rating_key)
         return True
 
     # season in soft ignore list
-    if kind == "Episode" and item.season.rating_key in ignore_list["seasons"]:
+    if kind == "Episode" and ignore_list["seasons"] and item.season.rating_key in ignore_list["seasons"]:
         Log.Debug("Item %s's season is in the soft ignore list" % rating_key)
         return True
 
     # section in soft ignore list
-    if item.section.key in ignore_list["sections"]:
+    if ignore_list["sections"] and item.section.key in ignore_list["sections"]:
         Log.Debug("Item %s's section is in the soft ignore list" % rating_key)
         return True
 

Contents/Info.plist

@@ -13,7 +13,7 @@
         <key>CFBundleSignature</key>
         <string>????</string>
         <key>CFBundleVersion</key>
-        <string>2.5.0.2221</string>
+        <string>2.5.0.2241</string>
         <key>PlexFrameworkVersion</key>
         <string>2</string>
         <key>PlexPluginClass</key>
@@ -32,7 +32,7 @@
 
 &lt;h1&gt;Sub-Zero for Plex&lt;/h1&gt;&lt;i&gt;Subtitles done right&lt;/i&gt;
 
-Version 2.5.0.2221
+Version 2.5.0.2241
 
 Originally based on @bramwalet's awesome &lt;a href=&quot;https://github.com/bramwalet/Subliminal.bundle&quot;&gt;Subliminal.bundle&lt;/a&gt;
 

Contents/Libraries/Shared/subliminal_patch/core.py

@@ -42,8 +42,8 @@ DOWNLOAD_TRIES = 0
 DOWNLOAD_RETRY_SLEEP = 6
 
 # fixme: this may be overkill
-REMOVE_CRAP_FROM_FILENAME = re.compile(r"(?i)((?:[\s_-]+(?:obfuscated|scrambled|nzbgeek|chamele0n|buymore|xpost"
-                                       r"|postbot|asrequested))?(?:(?<=(?=[\s_-]*.+?))\[[^\[\]]*?\])?)(?:\.\w+|$)$")
+REMOVE_CRAP_FROM_FILENAME = re.compile(r"(?i)(?:([\s_-]+(?:obfuscated|scrambled|nzbgeek|chamele0n|buymore|xpost|postbot"
+                                       r"|asrequested)(?:\[.+\])?)|[\s_-]\w{2,}(\[.+\]))(?=\.\w+$|$)")
 
 SUBTITLE_EXTENSIONS = ('.srt', '.sub', '.smi', '.txt', '.ssa', '.ass', '.mpl', '.vtt')
 

README.md

@@ -69,84 +69,94 @@ Ever had broken music icons in a subtitle? Nordic characters like `Å` which tur
 Simply go to the Plex Channels in your Plex Media Server, search for Sub-Zero and install it.
 For further help or manual installation, [please go to the wiki](https://github.com/pannal/Sub-Zero.bundle/wiki).
 
+## Big thanks to the beta testing team (in no particular order)!
+the.vbm, mmgoodnow, Vertig0ne, thliu78, tattoomees, ostman, count_confucius, 
+eherberg, tywilliams_88, Swanny, Jippo, Joost1991 / joost, Marik, Jon, AmbyDK, 
+Clay, mmgoodnow, Abenlog, michael, smikwily, shoghicp, Zuikkis, Isilorn, 
+Jacob K, Ninjouz, chopeta, fvb
+
 ## Changelog
 
-2.5.0.2221
-refiners: add support for retrieving original filename from
-	- drone derivates: sonarr, radarr
-	- filebot
-	- symlinks
-    - file_info meta file lists (see wiki)
+2.5.0.2241
 
-providers: add subscene (disabled by default to not flood subscene on release)
+- fix issue when removing crap from filenames to not accidentally remove release group #436
+- fix initialization of soft ignore list after upgrade fron 2.0
+
+
+2.5.0.2221
+
+- refiners: add support for retrieving original filename from
+ 	- drone derivates: sonarr, radarr
+ 	- filebot
+ 	- symlinks
+    - file_info meta file lists (see wiki)
+ 
+- providers: add subscene (disabled by default to not flood subscene on release)
     - normal search
     - season pack search if season has concluded
+ 
+- core: add provider subtitle-archive/pack cache for retrieving single subtitles from previously downloaded (season-) packs (subscene)
+- core/agent: massive performance improvements over 2.0
+- core/agent/background-tasks: reduce memory usage to a fraction of 2.0
+- core/providers: add dynamic provider throttling when certain events occur (ServiceUnavailable, too many downloads, ...), to lighten the provider-load
+- core/agent/config: automatically extract embedded subtitles (and use them if no current subtitle)
+- core: fix internal subtitle info storage issues
+- core: always store internal subtitle information even if no subtitle was downloaded (fixes SearchAllRecentlyAddedMissing)
+- core: fix internal subtitle info storage on windows (gzip handling is broken there)
+- core: don't fail on missing logfile paths
+- core: fix default encoding order for non-script-serbian
+- core: improve logging
+- core: add AsRequested to cleanup garbage names
+- core: treat SDTV and HDTV the same when searching for subtitles
+- core: parse_video: trust PMS season and episode numbers
+- core: parse_video: add series year information from PMS if none found
+- core: upgrade dependencies
+- core: update subliminal to 62cdb3c
+- core: add new file based cache mechanism, rendering DBM/memory backends obsolete
+- core: treat 23.980 fps as 23.976 and vice-versa
+- core: add HTTP proxy support for querying the providers (supports credentials)
+- core: only compute file hashes for enabled providers
+- core: massive speedup; refine only when needed, exit early otherwise
+- core: store last modified timestamp in subtitle info storage
+- core: only write to subtitle info storage if we haven't had one or any subtitle was downloaded
+- core: only clean up the sub-folder if a subtitle-sub-folder has been selected, and not the parent one also
+- core: support for CP437 encoded filenames in ZIP-Archives
+- core: use scandir library instead of os.listdir if possible, reducing performance-impact
+- core: archives: support multi-episode subtitles (partly)
+- core: subtitle cleanup: add support for hi, cc, sdh secondary filename tags; don't autoclean .txt
+- core: increase request timeout by three times in case a proxy is being used
+- core: fix language=Unknown in Plex when "Restrict to one language"-setting is set
+- core: refining: re-add old detected title as alternative title after re-refining with plex metadata's title; fixes #428
+- core: implement advanced_settings.json (see advanced_settings.json.template for reference, copy to "Plug-in Support/Data/com.plexapp.agents.subzero" to use it)
+- core/tasks: fix search all recently added missing (the total number of items will change in the menu while running), reduces memory usage
+- core/menu: add support for extracting embedded subtitles using the builtin plex transcoder
+- core/menu: skip wrong season or episode in returned subtitle results
+- core/config: fix language handling if treat undefined as first language is set
+- providers: remove shooter.cn
+- providers: add support for zip/rar archives containing more than one subtitle file
+- submod: common: remove redundant interpunction ("Hello !!!" -> "Hello!")
+- submod: skip provider hashing when applying mods
+- submod: correctly drop empty line (fixing broken display)
+- submod: OCR: fix F'xxxxx -> Fxxxxx
+- submod: HI: improve bracket matching
+- submod: OCR: fix l/L instead of I more aggressively
+- submod: common: fix uppercase I's in lowercase words more aggressively
+- submod: HI: improve HI_before_colon
+- submod: common: be more aggressive when fixing numbers; correctly space out spaced ellipses; don't break spaced ellipses; handle multiple spaces in numbers
+- menu: add support for extracting embedded subtitles for a whole season
+- menu: add reapply mods to current subtitle
+- menu: pad titles for more submenus, resulting in detail view in PlexWeb
+- menu: add subtitle selection submenu (if multiple subtitles are inside the subtitle info storage; e.g. previously downloaded ones or extracted embedded)
+- menu: advanced: add skip findbettersubtitles menu item, which sets the last_run to now (for debugging purposes)
+- menu: ignore: add more natural title for seasons and episodes (kills your old ignore lists!)
+- config: skip provider hashing on low impact mode
+- config: add limit by air date setting to consider for FindBetterSubtitles task (default: 1 year)
+- advanced settings: define enabled-for media types per provider
+- advanced settings: define enabled-for languages per provider
+- advanced settings: add deep-clean option (clean up the subtitle-sub-folder and the parent one)
 
-core: add provider subtitle-archive/pack cache for retrieving single subtitles from previously downloaded (season-) packs (subscene)
-core/agent: massive performance improvements over 2.0
-core/agent/background-tasks: reduce memory usage to a fraction of 2.0
-core/providers: add dynamic provider throttling when certain events occur (ServiceUnavailable, too many downloads, ...), to lighten the provider-load
-core/agent/config: automatically extract embedded subtitles (and use them if no current subtitle)
-core: fix internal subtitle info storage issues
-core: always store internal subtitle information even if no subtitle was downloaded (fixes SearchAllRecentlyAddedMissing)
-core: fix internal subtitle info storage on windows (gzip handling is broken there)
-core: don't fail on missing logfile paths
-core: fix default encoding order for non-script-serbian
-core: improve logging
-core: add AsRequested to cleanup garbage names
-core: treat SDTV and HDTV the same when searching for subtitles
-core: parse_video: trust PMS season and episode numbers
-core: parse_video: add series year information from PMS if none found
-core: upgrade dependencies
-core: update subliminal to 62cdb3c
-core: add new file based cache mechanism, rendering DBM/memory backends obsolete
-core: treat 23.980 fps as 23.976 and vice-versa
-core: add HTTP proxy support for querying the providers (supports credentials)
-core: only compute file hashes for enabled providers
-core: massive speedup; refine only when needed, exit early otherwise
-core: store last modified timestamp in subtitle info storage
-core: only write to subtitle info storage if we haven't had one or any subtitle was downloaded
-core: only clean up the sub-folder if a subtitle-sub-folder has been selected, and not the parent one also
-core: support for CP437 encoded filenames in ZIP-Archives
-core: use scandir library instead of os.listdir if possible, reducing performance-impact
-core: archives: support multi-episode subtitles (partly)
-core: subtitle cleanup: add support for hi, cc, sdh secondary filename tags; don't autoclean .txt
-core: increase request timeout by three times in case a proxy is being used
-core: fix language=Unknown in Plex when "Restrict to one language"-setting is set
-core: refining: re-add old detected title as alternative title after re-refining with plex metadata's title; fixes #428
-core: implement advanced_settings.json (see advanced_settings.json.template for reference, copy to "Plug-in Support/Data/com.plexapp.agents.subzero" to use it)
-core/tasks: fix search all recently added missing (the total number of items will change in the menu while running), reduces memory usage
-core/menu: add support for extracting embedded subtitles using the builtin plex transcoder
-core/menu: skip wrong season or episode in returned subtitle results
-core/config: fix language handling if treat undefined as first language is set
-providers: remove shooter.cn
-providers: add support for zip/rar archives containing more than one subtitle file
-submod: common: remove redundant interpunction ("Hello !!!" -> "Hello!")
-submod: skip provider hashing when applying mods
-submod: correctly drop empty line (fixing broken display)
-submod: OCR: fix F'xxxxx -> Fxxxxx
-submod: HI: improve bracket matching
-submod: OCR: fix l/L instead of I more aggressively
-submod: common: fix uppercase I's in lowercase words more aggressively
-submod: HI: improve HI_before_colon
-submod: common: be more aggressive when fixing numbers; correctly space out spaced ellipses; don't break spaced ellipses; handle multiple spaces in numbers
-menu: add support for extracting embedded subtitles for a whole season
-menu: add reapply mods to current subtitle
-menu: pad titles for more submenus, resulting in detail view in PlexWeb
-menu: add subtitle selection submenu (if multiple subtitles are inside the subtitle info storage; e.g. previously downloaded ones or extracted embedded)
-menu: advanced: add skip findbettersubtitles menu item, which sets the last_run to now (for debugging purposes)
-menu: ignore: add more natural title for seasons and episodes (kills your old ignore lists!)
-config: skip provider hashing on low impact mode
-config: add limit by air date setting to consider for FindBetterSubtitles task (default: 1 year)
-advanced settings: define enabled-for media types per provider
-advanced settings: define enabled-for languages per provider
-advanced settings: add deep-clean option (clean up the subtitle-sub-folder and the parent one)
-
-
-
-Big thanks to the beta testing team! You know who you are!
 
 [older changes](CHANGELOG.md)
 
 
-Subtitles provided by [OpenSubtitles.org](http://www.opensubtitles.org/), [Podnapisi.NET](https://www.podnapisi.net/), [TVSubtitles.net](http://www.tvsubtitles.net/), [Addic7ed.com](http://www.addic7ed.com/), [Legendas TV](http://legendas.tv/), [Napi Projekt](http://www.napiprojekt.pl/), [Shooter](http://shooter.cn/), [Titlovi](http://titlovi.com)
+Subtitles provided by [OpenSubtitles.org](http://www.opensubtitles.org/), [Podnapisi.NET](https://www.podnapisi.net/), [TVSubtitles.net](http://www.tvsubtitles.net/), [Addic7ed.com](http://www.addic7ed.com/), [Legendas TV](http://legendas.tv/), [Napi Projekt](http://www.napiprojekt.pl/), [Shooter](http://shooter.cn/), [Titlovi](http://titlovi.com), [SubScene](https://subscene.com/)