Update notifiers

4 files changed, 62 insertions, 50 deletions

diff --git a/module/plugins/hooks/AndroidPhoneNotify.py b/module/plugins/hooks/AndroidPhoneNotify.py
index cc7fe8d6b..5a5188365 100644
--- a/module/plugins/hooks/AndroidPhoneNotify.py
+++ b/module/plugins/hooks/AndroidPhoneNotify.py
@@ -6,19 +6,22 @@ from module.plugins.internal.Notifier import Notifier
 class AndroidPhoneNotify(Notifier):
     __name__    = "AndroidPhoneNotify"
     __type__    = "hook"
-    __version__ = "0.13"
+    __version__ = "0.15"
     __status__  = "testing"
 
-    __config__ = [("activated"      , "bool", "Activated"                                , False),
-                  ("apikey"         , "str" , "API key"                                  , ""   ),
-                  ("notifycaptcha"  , "bool", "Notify captcha request"                   , True ),
-                  ("notifypackage"  , "bool", "Notify package finished"                  , True ),
-                  ("notifyprocessed", "bool", "Notify packages processed"                , True ),
-                  ("notifyupdate"   , "bool", "Notify plugin updates"                    , True ),
-                  ("notifyexit"     , "bool", "Notify pyLoad shutdown"                   , True ),
-                  ("sendtimewait"   , "int" , "Timewait in seconds between notifications", 5    ),
-                  ("sendpermin"     , "int" , "Max notifications per minute"             , 12   ),
-                  ("ignoreclient"   , "bool", "Send notifications if client is connected", False)]
+    __config__ = [("activated"       , "bool", "Activated"                                , False),
+                  ("apikey"          , "str" , "API key"                                  , ""   ),
+                  ("captcha"         , "bool", "Notify captcha request"                   , True ),
+                  ("reconnection"    , "bool", "Notify reconnection request"              , False),
+                  ("downloadfinished", "bool", "Notify download finished"                 , True ),
+                  ("downloadfailed"  , "bool", "Notify download failed"                   , True ),
+                  ("packagefinished" , "bool", "Notify package finished"                  , True ),
+                  ("packagefailed"   , "bool", "Notify package failed"                    , True ),
+                  ("update"          , "bool", "Notify pyLoad update"                     , False),
+                  ("exit"            , "bool", "Notify pyLoad shutdown/restart"           , False),
+                  ("sendinterval"    , "int" , "Interval in seconds between notifications", 1    ),
+                  ("sendpermin"      , "int" , "Max notifications per minute"             , 60   ),
+                  ("ignoreclient"    , "bool", "Send notifications if client is connected", True )]
 
     __description__ = """Send push notifications to your Android Phone using notifymyandroid.com"""
     __license__     = "GPLv3"
@@ -27,7 +30,7 @@ class AndroidPhoneNotify(Notifier):
 
 
     def get_key(self):
-        return self.get_config('apikey')
+        return self.config.get('apikey')
 
 
     def send(self, event, msg, key):
diff --git a/module/plugins/hooks/PushBullet.py b/module/plugins/hooks/PushBullet.py
index 6cf7dc173..47a0f594e 100644
--- a/module/plugins/hooks/PushBullet.py
+++ b/module/plugins/hooks/PushBullet.py
@@ -9,19 +9,22 @@ from module.plugins.internal.Notifier import Notifier
 class PushBullet(Notifier):
     __name__    = "PushBullet"
     __type__    = "hook"
-    __version__ = "0.02"
+    __version__ = "0.04"
     __status__  = "testing"
 
-    __config__ = [("activated"      , "bool", "Activated"                                , False),
-                  ("tokenkey"       , "str" , "Access Token"                             , ""   ),
-                  ("notifycaptcha"  , "bool", "Notify captcha request"                   , True ),
-                  ("notifypackage"  , "bool", "Notify package finished"                  , True ),
-                  ("notifyprocessed", "bool", "Notify packages processed"                , True ),
-                  ("notifyupdate"   , "bool", "Notify plugin updates"                    , True ),
-                  ("notifyexit"     , "bool", "Notify pyLoad shutdown"                   , True ),
-                  ("sendtimewait"   , "int" , "Timewait in seconds between notifications", 5    ),
-                  ("sendpermin"     , "int" , "Max notifications per minute"             , 12   ),
-                  ("ignoreclient"   , "bool", "Send notifications if client is connected", False)]
+    __config__ = [("activated"       , "bool", "Activated"                                , False),
+                  ("tokenkey"        , "str" , "Access Token"                             , ""   ),
+                  ("captcha"         , "bool", "Notify captcha request"                   , True ),
+                  ("reconnection"    , "bool", "Notify reconnection request"              , False),
+                  ("downloadfinished", "bool", "Notify download finished"                 , True ),
+                  ("downloadfailed"  , "bool", "Notify download failed"                   , True ),
+                  ("packagefinished" , "bool", "Notify package finished"                  , True ),
+                  ("packagefailed"   , "bool", "Notify package failed"                    , True ),
+                  ("update"          , "bool", "Notify pyLoad update"                     , False),
+                  ("exit"            , "bool", "Notify pyLoad shutdown/restart"           , False),
+                  ("sendinterval"    , "int" , "Interval in seconds between notifications", 1    ),
+                  ("sendpermin"      , "int" , "Max notifications per minute"             , 60   ),
+                  ("ignoreclient"    , "bool", "Send notifications if client is connected", True )]
 
     __description__ = """Send push notifications to your phone using pushbullet.com"""
     __license__     = "GPLv3"
@@ -29,7 +32,7 @@ class PushBullet(Notifier):
 
 
     def get_key(self):
-        return self.get_config('tokenkey')
+        return self.config.get('tokenkey')
 
 
     def send(self, event, msg, key):
diff --git a/module/plugins/hooks/PushOver.py b/module/plugins/hooks/PushOver.py
index 5d5e927ac..418f7a133 100644
--- a/module/plugins/hooks/PushOver.py
+++ b/module/plugins/hooks/PushOver.py
@@ -8,20 +8,23 @@ from module.plugins.internal.Notifier import Notifier
 class PushOver(Notifier):
     __name__    = "PushOver"
     __type__    = "hook"
-    __version__ = "0.04"
+    __version__ = "0.06"
     __status__  = "testing"
 
-    __config__ = [("activated"      , "bool", "Activated"                                , False),
-                  ("tokenkey"       , "str" , "Token key"                                , ""   ),
-                  ("userkey"        , "str" , "User key"                                 , ""   ),
-                  ("notifycaptcha"  , "bool", "Notify captcha request"                   , True ),
-                  ("notifypackage"  , "bool", "Notify package finished"                  , True ),
-                  ("notifyprocessed", "bool", "Notify packages processed"                , True ),
-                  ("notifyupdate"   , "bool", "Notify plugin updates"                    , True ),
-                  ("notifyexit"     , "bool", "Notify pyLoad shutdown"                   , True ),
-                  ("sendtimewait"   , "int" , "Timewait in seconds between notifications", 5    ),
-                  ("sendpermin"     , "int" , "Max notifications per minute"             , 12   ),
-                  ("ignoreclient"   , "bool", "Send notifications if client is connected", False)]
+    __config__ = [("activated"       , "bool", "Activated"                                , False),
+                  ("tokenkey"        , "str" , "Token key"                                , ""   ),
+                  ("userkey"         , "str" , "User key"                                 , ""   ),
+                  ("captcha"         , "bool", "Notify captcha request"                   , True ),
+                  ("reconnection"    , "bool", "Notify reconnection request"              , False),
+                  ("downloadfinished", "bool", "Notify download finished"                 , True ),
+                  ("downloadfailed"  , "bool", "Notify download failed"                   , True ),
+                  ("packagefinished" , "bool", "Notify package finished"                  , True ),
+                  ("packagefailed"   , "bool", "Notify package failed"                    , True ),
+                  ("update"          , "bool", "Notify pyLoad update"                     , False),
+                  ("exit"            , "bool", "Notify pyLoad shutdown/restart"           , False),
+                  ("sendinterval"    , "int" , "Interval in seconds between notifications", 1    ),
+                  ("sendpermin"      , "int" , "Max notifications per minute"             , 60   ),
+                  ("ignoreclient"    , "bool", "Send notifications if client is connected", True )]
 
     __description__ = """Send push notifications to your phone using pushover.net"""
     __license__     = "GPLv3"
@@ -29,7 +32,7 @@ class PushOver(Notifier):
 
 
     def get_key(self):
-        return self.get_config('tokenkey'), self.get_config('userkey')
+        return self.config.get('tokenkey'), self.config.get('userkey')
 
 
     def send(self, event, msg, key):
diff --git a/module/plugins/hooks/WindowsPhoneNotify.py b/module/plugins/hooks/WindowsPhoneNotify.py
index cd5f5dea4..84d122811 100644
--- a/module/plugins/hooks/WindowsPhoneNotify.py
+++ b/module/plugins/hooks/WindowsPhoneNotify.py
@@ -9,20 +9,23 @@ from module.plugins.internal.Notifier import Notifier
 class WindowsPhoneNotify(Notifier):
     __name__    = "WindowsPhoneNotify"
     __type__    = "hook"
-    __version__ = "0.15"
+    __version__ = "0.17"
     __status__  = "testing"
 
-    __config__ = [("activated"      , "bool", "Activated"                                , False),
-                  ("push-id"        , "str" , "Push ID"                                  , ""   ),
-                  ("push-url"       , "str" , "Push url"                                 , ""   ),
-                  ("notifycaptcha"  , "bool", "Notify captcha request"                   , True ),
-                  ("notifypackage"  , "bool", "Notify package finished"                  , True ),
-                  ("notifyprocessed", "bool", "Notify packages processed"                , True ),
-                  ("notifyupdate"   , "bool", "Notify plugin updates"                    , True ),
-                  ("notifyexit"     , "bool", "Notify pyLoad shutdown"                   , True ),
-                  ("sendtimewait"   , "int" , "Timewait in seconds between notifications", 5    ),
-                  ("sendpermin"     , "int" , "Max notifications per minute"             , 12   ),
-                  ("ignoreclient"   , "bool", "Send notifications if client is connected", False)]
+    __config__ = [("activated"       , "bool", "Activated"                                , False),
+                  ("pushid"          , "str" , "Push ID"                                  , ""   ),
+                  ("pushurl"         , "str" , "Push url"                                 , ""   ),
+                  ("captcha"         , "bool", "Notify captcha request"                   , True ),
+                  ("reconnection"    , "bool", "Notify reconnection request"              , False),
+                  ("downloadfinished", "bool", "Notify download finished"                 , True ),
+                  ("downloadfailed"  , "bool", "Notify download failed"                   , True ),
+                  ("packagefinished" , "bool", "Notify package finished"                  , True ),
+                  ("packagefailed"   , "bool", "Notify package failed"                    , True ),
+                  ("update"          , "bool", "Notify pyLoad update"                     , False),
+                  ("exit"            , "bool", "Notify pyLoad shutdown/restart"           , False),
+                  ("sendinterval"    , "int" , "Interval in seconds between notifications", 1    ),
+                  ("sendpermin"      , "int" , "Max notifications per minute"             , 60   ),
+                  ("ignoreclient"    , "bool", "Send notifications if client is connected", True )]
 
     __description__ = """Send push notifications to Windows Phone"""
     __license__     = "GPLv3"
@@ -31,7 +34,7 @@ class WindowsPhoneNotify(Notifier):
 
 
     def get_key(self):
-        return self.get_config('push-id'), self.get_config('push-url')
+        return self.config.get('pushid'), self.config.get('pushurl')
 
 
     def format_request(self, msg):