monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2025-01-07 10:33:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'hotfix/0.15.1'

Browse source
This commit is contained in:
JackDandy 2018-03-23 23:04:11 +00:00
commit b4f8eab008
3 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CHANGES.md
View file

@ -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 showRSS torrent provider
* Add choice to delete watched episodes from a list of played media at Kodi, Emby, and/or Plex, * Add choice to delete watched episodes from a list of played media at Kodi, Emby, and/or Plex,

7
sickbeard/notifiers/growl.py
View file

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

2
sickbeard/tv.py
View file

@ -557,7 +557,7 @@ class TVShow(object):
except (InvalidNameException, InvalidShowException): except (InvalidNameException, InvalidShowException):
pass 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( logger.log(
'Name %s gave release group of %s, seems valid' % (ep_file_name ,parse_result.release_group), 'Name %s gave release group of %s, seems valid' % (ep_file_name ,parse_result.release_group),
logger.DEBUG) logger.DEBUG)