Don't force register Growl

This commit is contained in:
Ruud committed 2012-02-12 11:02:44 +01:00
1 parent 0d7cf6f3a4
commit d4a4662e62
1 file changed
+10 -8
+10 -8
View File
@@ -3,8 +3,6 @@ from couchpotato.core.logger import CPLog
from couchpotato.core.notifications.base import Notification from couchpotato.core.notifications.base import Notification
from gntp import notifier from gntp import notifier
import logging import logging
import thread
import time
import traceback import traceback
log = CPLog(__name__) log = CPLog(__name__)
@@ -12,14 +10,18 @@ log = CPLog(__name__)
class Growl(Notification): class Growl(Notification):
registered = False
def __init__(self): def __init__(self):
super(Growl, self).__init__() super(Growl, self).__init__()
logging.getLogger('gntp').setLevel(logging.WARNING) logging.getLogger('gntp').setLevel(logging.WARNING)
try: if self.isEnabled():
def startGrowl(): self.register()
time.sleep(2)
def register(self):
if self.registered: return
try: try:
self.growl = notifier.GrowlNotifier( self.growl = notifier.GrowlNotifier(
applicationName = 'CouchPotato', applicationName = 'CouchPotato',
@@ -28,15 +30,15 @@ class Growl(Notification):
applicationIcon = '%s/static/images/couch.png' % fireEvent('app.api_url', single = True), applicationIcon = '%s/static/images/couch.png' % fireEvent('app.api_url', single = True),
) )
self.growl.register() self.growl.register()
self.registered = True
except: except:
log.error('Failed register of growl: %s' % traceback.format_exc()) log.error('Failed register of growl: %s' % traceback.format_exc())
thread.start_new_thread(startGrowl, ())
except:
pass
def notify(self, type = '', message = '', data = {}): def notify(self, type = '', message = '', data = {}):
if self.isDisabled(): return if self.isDisabled(): return
self.register()
try: try:
self.growl.notify( self.growl.notify(
noteType = "Updates", noteType = "Updates",