Merge branch 'hotfix/0.15.1'

CHANGES.md

@@ -1,4 +1,10 @@
-### 0.15.0 (2018-03-22 00:00:00 UTC)
+### 0.15.1 (2018-03-23 22:30:00 UTC)
+
+* Fix overwriting repack where renamed filename has '-' in title
+* Fix Growl display correct message on test notification success + change notification icon
+
+
+### 0.15.0 (2018-03-22 00:00:00 UTC)
 
 * Add showRSS torrent provider
 * Add choice to delete watched episodes from a list of played media at Kodi, Emby, and/or Plex,

sickbeard/notifiers/growl.py

@@ -32,8 +32,6 @@ class GrowlNotifier(Notifier):
     def __init__(self):
         super(GrowlNotifier, self).__init__()
 
-        self.sg_logo_file = 'apple-touch-icon-72x72.png'
-
     def _send_growl_msg(self, options, message=None):
 
         # Send Notification
@@ -53,8 +51,7 @@ class GrowlNotifier(Notifier):
         if options['priority']:
             notice.add_header('Notification-Priority', options['priority'])
         if options['icon']:
-            notice.add_header('Notification-Icon',
-                              'https://raw.github.com/SickGear/SickGear/master/gui/slick/images/sickgear.png')
+            notice.add_header('Notification-Icon', self._sg_logo_url)
 
         if message:
             notice.add_header('Notification-Text', message)
@@ -139,7 +136,7 @@ class GrowlNotifier(Notifier):
         self._testing = True
         self._send_registration(host, password)
         return ('Success, registered and tested', 'Failed registration and testing')[
-                   True is not super(GrowlNotifier, self).test_notify(name='Test', host=host, password=password)] + \
+                   'sent' not in super(GrowlNotifier, self).test_notify(name='Test', host=host, password=password)] + \
                (urllib.unquote_plus(host) + ' with password: ' + password, '')[password in (None, '')]
 
 

sickbeard/tv.py

@@ -557,7 +557,7 @@ class TVShow(object):
             except (InvalidNameException, InvalidShowException):
                 pass
 
-            if ep_file_name and parse_result and None is not parse_result.release_group:
+            if ep_file_name and parse_result and None is not parse_result.release_group and not curEpisode.release_name:
                 logger.log(
                     'Name %s gave release group of %s, seems valid' % (ep_file_name ,parse_result.release_group),
                     logger.DEBUG)