Merge pull request #814 from JackDandy/feature/FixTVDbImageErrors

Fix "error trying to retrieve image" from TVDb due to attempts made w…

CHANGES.md

@@ -218,6 +218,7 @@
 * Change image cache processing for browse Trakt page
 * Change logging for newznab response code 910 and add check for empty response data
 * Change improve reverse proxy web_root support
+* Fix "error trying to retrieve image" from tvdb due to there is no image to fetch
 
 
 ### 0.11.16 (2016-10-16 17:30:00 UTC)

lib/tvdb_api/tvdb_api.py

@@ -864,7 +864,7 @@ class Tvdb:
 
                     if None is not v:
                         if 'filename' == k:
-                            v = self.config['url_artworkPrefix'] % v
+                            v = v and (self.config['url_artworkPrefix'] % v) or v
                         else:
                             v = self._clean_data(v)
 

sickbeard/providers/omgwtfnzbs.py

@@ -99,8 +99,11 @@ class OmgwtfnzbsProvider(generic.NZBProvider):
             data = self.get_url(url, timeout=90)
             if not data:
                 return result
+            if '<strong>Limit Reached</strong>' in data:
+                logger.log('Daily Nzb Download limit reached', logger.DEBUG)
+                return result
             if '</nzb>' not in data or 'seem to be logged in' in data:
-                logger.log(u'Failed nzb data response: %s' % data, logger.DEBUG)
+                logger.log('Failed nzb data response: %s' % data, logger.DEBUG)
                 return result
             result = classes.NZBDataSearchResult(episodes)
             result.extraInfo += [data]