also discard provider

(cherry picked from commit 8b91093)

Contents/Code/support/localmedia.py

@@ -56,7 +56,7 @@ def find_subtitles(part):
             global_folders.append(global_subtitle_folder)
 
     # normalize all paths
-    paths = [os.path.normpath(os.path.realpath(helpers.unicodize(path))) for path in paths]
+    paths = [os.path.normpath(helpers.unicodize(path)) for path in paths]
 
     # We start by building a dictionary of files to their absolute paths. We also need to know
     # the number of media files that are actually present, in case the found local media asset

Contents/Info.plist

@@ -13,7 +13,7 @@
         <key>CFBundleSignature</key>
         <string>????</string>
         <key>CFBundleVersion</key>
-        <string>1.4.27.973</string>
+        <string>1.4.27.980</string>
         <key>PlexFrameworkVersion</key>
         <string>2</string>
         <key>PlexPluginClass</key>
@@ -23,7 +23,7 @@
         <key>PlexPluginConsoleLogging</key>
         <string>0</string>
         <key>PlexPluginDevMode</key>
-        <string>1</string>
+        <string>0</string>
          <key>PlexPluginCodePolicy</key>
             <!-- this allows channels to access some python methods which are otherwise blocked, as well as import external code libraries, and interact with the PMS HTTP API -->
             <string>Elevated</string>
@@ -32,7 +32,7 @@
 
 &lt;h1&gt;Sub-Zero for Plex&lt;/h1&gt;&lt;i&gt;Subtitles done right&lt;/i&gt;
 
-Version 1.4.27.973 DEV
+Version 1.4.27.980
 
 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/patch_provider_pool.py

@@ -15,7 +15,7 @@ from subliminal_patch.patch_subtitle import compute_score
 logger = logging.getLogger(__name__)
 
 DOWNLOAD_TRIES = 0
-DOWNLOAD_RETRY_SLEEP = 2
+DOWNLOAD_RETRY_SLEEP = 5
 
 
 class OldToNewProvider(object):
@@ -213,12 +213,16 @@ class PatchedProviderPool(ProviderPool):
             try:
                 self[subtitle.provider_name].download_subtitle(subtitle)
                 break
-            except (requests.Timeout, socket.timeout):
-                logger.error('Provider %r timed out', subtitle.provider_name)
-            except ProviderError:
-                logger.error('Unexpected error in provider %r, Traceback: %s', subtitle.provider_name, traceback.format_exc())
+            except (requests.ConnectionError,
+                    requests.exceptions.ProxyError,
+                    requests.exceptions.SSLError,
+                    requests.Timeout,
+                    socket.timeout):
+                logger.error('Provider %r connection error', subtitle.provider_name)
             except:
                 logger.exception('Unexpected error in provider %r, Traceback: %s', subtitle.provider_name, traceback.format_exc())
+                self.discarded_providers.add(subtitle.provider_name)
+                return False
 
             if tries == DOWNLOAD_TRIES:
                 self.discarded_providers.add(subtitle.provider_name)

README.md

@@ -10,6 +10,14 @@ Checkout **[the Sub-Zero Wiki](https://github.com/pannal/Sub-Zero.bundle/wiki)**
 
 ## Changelog
 
+1.4.27.980
+- core: don't retry if the subtitle downloading failed and the issue was not the connection (#277)
+
+
+1.4.27.974
+- core: fix duplicate subtitles issue on QNAP/Synology/libraries with symlinks (#215)
+
+
 1.4.27.973
 - core: ignore "obfuscated" and "scrambled" tags in filenames when searching for subtitles
 - core: exotic embedded subtitles are now also considered when searching (and when the option is enabled); fixes #264
@@ -27,3 +35,5 @@ Checkout **[the Sub-Zero Wiki](https://github.com/pannal/Sub-Zero.bundle/wiki)**
 
 
 If you like this, buy me a beer: [![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=G9VKR2B8PMNKG)
+
+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/).