diff --git a/gui/slick/images/providers/nzb_abbeygirl.png b/gui/slick/images/providers/anonzbs.png similarity index 100% rename from gui/slick/images/providers/nzb_abbeygirl.png rename to gui/slick/images/providers/anonzbs.png diff --git a/gui/slick/images/providers/nzb_abbeygirl_co_uk.png b/gui/slick/images/providers/anonzbs_com.png similarity index 100% rename from gui/slick/images/providers/nzb_abbeygirl_co_uk.png rename to gui/slick/images/providers/anonzbs_com.png diff --git a/sickbeard/helpers.py b/sickbeard/helpers.py index 53d973c22a1caf36f39345ea8556c9f938cc8791..e496bbdc12a519cedd10cf1c80366877c6fc589f 100644 --- a/sickbeard/helpers.py +++ b/sickbeard/helpers.py @@ -143,9 +143,11 @@ def remove_non_release_groups(name): '\[silv4\]$': 'searchre', '\[Seedbox\]$': 'searchre', '\[AndroidTwoU\]$': 'searchre', + ' \[1044\]$': 'searchre', '\.RiPSaLoT$': 'searchre', - '\.GiuseppeTnT$': 'searchre', + '\.GiuseppeTnT$': 'searchre', '-NZBGEEK$': 'searchre', + '-Siklopentan$': 'searchre', '-RP$': 'searchre', '-20-40$': 'searchre', '\.\[www\.usabit\.com\]$': 'searchre', diff --git a/sickbeard/metadata/generic.py b/sickbeard/metadata/generic.py index f3e2d4df55c907855bc510ff64539a0b35201613..204855b213d2b5e251c70ddd2d82b8530072c322 100644 --- a/sickbeard/metadata/generic.py +++ b/sickbeard/metadata/generic.py @@ -505,7 +505,7 @@ class GenericMetadata(): thumb_data = metadata_helpers.getShowImage(thumb_url) - result = self._write_image(thumb_data, file_path) + result = self._write_image(thumb_data, file_path, ep_obj) if not result: return False @@ -532,7 +532,7 @@ class GenericMetadata(): logger.log(u"No fanart image was retrieved, unable to write fanart", logger.DEBUG) return False - return self._write_image(fanart_data, fanart_path) + return self._write_image(fanart_data, fanart_path, show_obj) def save_poster(self, show_obj, which=None): """ @@ -551,7 +551,7 @@ class GenericMetadata(): logger.log(u"No show poster image was retrieved, unable to write poster", logger.DEBUG) return False - return self._write_image(poster_data, poster_path) + return self._write_image(poster_data, poster_path, show_obj) def save_banner(self, show_obj, which=None): """ @@ -570,7 +570,7 @@ class GenericMetadata(): logger.log(u"No show banner image was retrieved, unable to write banner", logger.DEBUG) return False - return self._write_image(banner_data, banner_path) + return self._write_image(banner_data, banner_path, show_obj) def save_season_posters(self, show_obj, season): """ @@ -612,7 +612,7 @@ class GenericMetadata(): logger.log(u"No season poster data available, skipping this season", logger.DEBUG) continue - result = result + [self._write_image(seasonData, season_poster_file_path)] + result = result + [self._write_image(seasonData, season_poster_file_path, show_obj)] if result: return all(result) @@ -661,7 +661,7 @@ class GenericMetadata(): logger.log(u"No season banner data available, skipping this season", logger.DEBUG) continue - result = result + [self._write_image(seasonData, season_banner_file_path)] + result = result + [self._write_image(seasonData, season_banner_file_path, show_obj)] if result: return all(result) @@ -680,7 +680,7 @@ class GenericMetadata(): logger.log(u"No show poster image was retrieved, unable to write season all poster", logger.DEBUG) return False - return self._write_image(poster_data, poster_path) + return self._write_image(poster_data, poster_path, show_obj) def save_season_all_banner(self, show_obj, which=None): # use the default season all banner name @@ -692,9 +692,9 @@ class GenericMetadata(): logger.log(u"No show banner image was retrieved, unable to write season all banner", logger.DEBUG) return False - return self._write_image(banner_data, banner_path) + return self._write_image(banner_data, banner_path, show_obj) - def _write_image(self, image_data, image_path): + def _write_image(self, image_data, image_path, obj = None): """ Saves the data in image_data to the location image_path. Returns True/False to represent success or failure. @@ -711,7 +711,7 @@ class GenericMetadata(): image_dir = ek.ek(os.path.dirname, image_path) if not image_data: - logger.log(u"Unable to retrieve image to save in %s, skipping" % ek.ss(image_dir), logger.WARNING) + logger.log(u"Unable to retrieve image to %s to save in %s, skipping" % ( ek.ss(obj.prettyName()), ek.ss(image_dir) ), logger.WARNING) return False try: diff --git a/sickbeard/notifiers/plex.py b/sickbeard/notifiers/plex.py index fccaa1db4f25482878cd0bea095531271f858304..3996b5d005215745c1426419a681b10f3c4838f2 100644 --- a/sickbeard/notifiers/plex.py +++ b/sickbeard/notifiers/plex.py @@ -197,7 +197,7 @@ class PLEXNotifier: req.add_header('Authorization', authheader) req.add_header('X-Plex-Device-Name', 'SickRage') req.add_header('X-Plex-Product', 'SickRage Notifier') - req.add_header('X-Plex-Client-Identifier', sickbeard.CUR_COMMIT_HASH) + req.add_header('X-Plex-Client-Identifier', sickbeard.common.USER_AGENT) req.add_header('X-Plex-Version', '1.0') try: diff --git a/sickbeard/providers/newznab.py b/sickbeard/providers/newznab.py index 6b346c3d6301e2d44b5e1efc18b41e8d4e09a46b..da66aadef3bcc91877837a8df4167c537235906b 100644 --- a/sickbeard/providers/newznab.py +++ b/sickbeard/providers/newznab.py @@ -132,6 +132,8 @@ class NewznabProvider(generic.NZBProvider): to_return = [] cur_params = {} + if not ep_obj: + return to_return cur_params['maxage'] = (datetime.datetime.now() - datetime.datetime.combine(ep_obj.airdate, datetime.datetime.min.time())).days + 1 @@ -149,7 +151,6 @@ class NewznabProvider(generic.NZBProvider): cur_params['rid'] = rid params['attrs'] = "rageid" to_return.append(dict(cur_params)) - #return to_return if 'rid' in cur_params: cur_params.pop('rid') @@ -173,7 +174,7 @@ class NewznabProvider(generic.NZBProvider): params = {} if not ep_obj: - return params + return to_return params['maxage'] = (datetime.datetime.now() - datetime.datetime.combine(ep_obj.airdate, datetime.datetime.min.time())).days + 1 @@ -191,7 +192,6 @@ class NewznabProvider(generic.NZBProvider): params['rid'] = rid params['attrs'] = "rageid" to_return.append(dict(params)) - #return to_return if 'rid' in params: params.pop('rid')