Better growl support

couchpotato/core/notifications/growl/__init__.py

@@ -15,17 +15,9 @@ config = [{
                     'default': 0,
                     'type': 'enabler',
                 },
-                {
-                    'name': 'host',
-                    'default': 'localhost',
-                },
-                {
-                    'name': 'password',
-                    'type': 'password',
-                },
                 {
                     'name': 'on_snatch',
-                    'default': 0,
+                    'default': False,
                     'type': 'bool',
                     'advanced': True,
                     'description': 'Also send message when movie is snatched.',

couchpotato/core/notifications/growl/growl.py

@@ -1,111 +0,0 @@
-# Based on netprowl by the following authors.
-
-# Altered 1st October 2010 - Tim Child.
-# Have added the ability for the command line arguments to take a password.
-
-# Altered 1-17-2010 - Tanner Stokes - www.tannr.com
-# Added support for command line arguments
-
-# ORIGINAL CREDITS
-# """Growl 0.6 Network Protocol Client for Python"""
-# __version__ = "0.6.3"
-# __author__ = "Rui Carmo (http://the.taoofmac.com)"
-# __copyright__ = "(C) 2004 Rui Carmo. Code under BSD License."
-# __contributors__ = "Ingmar J Stein (Growl Team), John Morrissey (hashlib patch)"
-
-import struct
-
-try:
-    import hashlib
-    md5_constructor = hashlib.md5
-except ImportError:
-    import md5
-    md5_constructor = md5.new
-
-GROWL_UDP_PORT = 9887
-GROWL_PROTOCOL_VERSION = 1
-GROWL_TYPE_REGISTRATION = 0
-GROWL_TYPE_NOTIFICATION = 1
-
-
-class GrowlRegistrationPacket(object):
-    """Builds a Growl Network Registration packet.
-    Defaults to emulating the command-line growlnotify utility."""
-
-    def __init__(self, application = "CouchPotato", password = None):
-        self.notifications = []
-        self.defaults = [] # array of indexes into notifications
-        self.application = application.encode("utf-8")
-        self.password = password
-
-    def addNotification(self, notification = "General Notification", enabled = True):
-        """Adds a notification type and sets whether it is enabled on the GUI"""
-
-        self.notifications.append(notification)
-        if enabled:
-            self.defaults.append(len(self.notifications) - 1)
-
-    def payload(self):
-        """Returns the packet payload."""
-        self.data = struct.pack("!BBH",
-            GROWL_PROTOCOL_VERSION,
-            GROWL_TYPE_REGISTRATION,
-            len(self.application)
-        )
-        self.data += struct.pack("BB",
-            len(self.notifications),
-            len(self.defaults)
-        )
-        self.data += self.application
-        for notification in self.notifications:
-            encoded = notification.encode("utf-8")
-            self.data += struct.pack("!H", len(encoded))
-            self.data += encoded
-        for default in self.defaults:
-            self.data += struct.pack("B", default)
-        self.checksum = md5_constructor()
-        self.checksum.update(self.data)
-        if self.password:
-            self.checksum.update(self.password)
-        self.data += self.checksum.digest()
-        return self.data
-
-class GrowlNotificationPacket(object):
-    """Builds a Growl Network Notification packet.
-    Defaults to emulating the command-line growlnotify utility."""
-
-    def __init__(self, application = "CouchPotato",
-                             notification = "General Notification", title = "Title",
-                             description = "Description", priority = 0, sticky = False, password = None):
-
-        self.application = application.encode("utf-8")
-        self.notification = notification.encode("utf-8")
-        self.title = title.encode("utf-8")
-        self.description = description.encode("utf-8")
-        flags = (priority & 0x07) * 2
-        if priority < 0:
-            flags |= 0x08
-        if sticky:
-            flags = flags | 0x0100
-        self.data = struct.pack("!BBHHHHH",
-            GROWL_PROTOCOL_VERSION,
-            GROWL_TYPE_NOTIFICATION,
-            flags,
-            len(self.notification),
-            len(self.title),
-            len(self.description),
-            len(self.application)
-        )
-        self.data += self.notification
-        self.data += self.title
-        self.data += self.description
-        self.data += self.application
-        self.checksum = md5_constructor()
-        self.checksum.update(self.data)
-        if password:
-            self.checksum.update(password)
-        self.data += self.checksum.digest()
-
-    def payload(self):
-        """Returns the packet payload."""
-        return self.data

couchpotato/core/notifications/growl/main.py

@@ -1,31 +1,46 @@
 from couchpotato.core.logger import CPLog
 from couchpotato.core.notifications.base import Notification
-from couchpotato.core.notifications.growl.growl import GROWL_UDP_PORT, \
-    GrowlRegistrationPacket, GrowlNotificationPacket
-from socket import AF_INET, SOCK_DGRAM, socket
+from gntp import notifier
+import logging
 
 log = CPLog(__name__)
 
 
 class Growl(Notification):
 
+    def __init__(self):
+        super(Growl, self).__init__()
+
+        logger = logging.getLogger('gntp.notifier')
+        logger.disabled = True
+
+        try:
+            self.growl = notifier.GrowlNotifier(
+                applicationName = 'CouchPotato',
+                notifications = ["Updates"],
+                defaultNotifications = ["Updates"],
+                applicationIcon = 'http://couchpotatoapp.com/media/images/couch.png',
+            )
+            self.growl.register()
+        except:
+            pass
+
     def notify(self, type = '', message = '', data = {}):
         if self.isDisabled(): return
 
-        hosts = [x.strip() for x in self.conf('host').split(",")]
-        password = self.conf('password')
-
-        for curHost in hosts:
-            addr = (curHost, GROWL_UDP_PORT)
-
-            s = socket(AF_INET, SOCK_DGRAM)
-            p = GrowlRegistrationPacket(password = password)
-            p.addNotification()
-            s.sendto(p.payload(), addr)
-
-            # send notification
-            p = GrowlNotificationPacket(title = self.default_title, description = message, priority = 0, sticky = False, password = password)
-            s.sendto(p.payload(), addr)
-            s.close()
+        try:
+            self.growl.notify(
+                noteType = "Updates",
+                title = self.default_title,
+                description = message,
+                sticky = False,
+                priority = 1,
+            )
 
             log.info('Growl notifications sent.')
+            return True
+        except:
+            log.error('Failed growl notification.')
+
+        return False
+