Merge branch 'stable' into 0.4.10

Conflicts:
	module/plugins/accounts/Keep2ShareCc.py
	module/plugins/captcha/OCR.py
	module/plugins/captcha/captcha.py
	module/plugins/crypter/DailymotionBatch.py
	module/plugins/crypter/DailymotionComFolder.py
	module/plugins/crypter/YoutubeBatch.py
	module/plugins/crypter/YoutubeComFolder.py
	module/plugins/internal/CaptchaService.py
	pyload/plugin/Extractor.py
	pyload/plugin/OCR.py
	pyload/plugin/account/DebridItaliaCom.py
	pyload/plugin/account/MegaRapidCz.py
	pyload/plugin/account/NoPremiumPl.py
	pyload/plugin/account/RapideoPl.py
	pyload/plugin/addon/AndroidPhoneNotify.py
	pyload/plugin/addon/Checksum.py
	pyload/plugin/addon/ClickAndLoad.py
	pyload/plugin/addon/DeleteFinished.py
	pyload/plugin/addon/DownloadScheduler.py
	pyload/plugin/addon/ExternalScripts.py
	pyload/plugin/addon/ExtractArchive.py
	pyload/plugin/addon/HotFolder.py
	pyload/plugin/addon/IRCInterface.py
	pyload/plugin/addon/JustPremium.py
	pyload/plugin/addon/MergeFiles.py
	pyload/plugin/addon/MultiHome.py
	pyload/plugin/addon/RestartFailed.py
	pyload/plugin/addon/RestartSlow.py
	pyload/plugin/addon/SkipRev.py
	pyload/plugin/addon/UnSkipOnFail.py
	pyload/plugin/addon/UpdateManager.py
	pyload/plugin/addon/WindowsPhoneNotify.py
	pyload/plugin/crypter/DDLMusicOrg.py
	pyload/plugin/crypter/DailymotionBatch.py
	pyload/plugin/crypter/DevhostSt.py
	pyload/plugin/crypter/EmbeduploadCom.py
	pyload/plugin/crypter/MultiloadCz.py
	pyload/plugin/crypter/YoutubeBatch.py
	pyload/plugin/extractor/SevenZip.py
	pyload/plugin/extractor/UnRar.py
	pyload/plugin/extractor/UnZip.py
	pyload/plugin/hook/BypassCaptcha.py
	pyload/plugin/hook/Captcha9Kw.py
	pyload/plugin/hook/CaptchaBrotherhood.py
	pyload/plugin/hook/DeathByCaptcha.py
	pyload/plugin/hook/ExpertDecoders.py
	pyload/plugin/hook/ImageTyperz.py
	pyload/plugin/hook/XFileSharingPro.py
	pyload/plugin/hoster/AlldebridCom.py
	pyload/plugin/hoster/CzshareCom.py
	pyload/plugin/hoster/EuroshareEu.py
	pyload/plugin/hoster/FastixRu.py
	pyload/plugin/hoster/FastshareCz.py
	pyload/plugin/hoster/GooIm.py
	pyload/plugin/hoster/MediafireCom.py
	pyload/plugin/hoster/MegaDebridEu.py
	pyload/plugin/hoster/NitroflareCom.py
	pyload/plugin/hoster/OverLoadMe.py
	pyload/plugin/hoster/PremiumTo.py
	pyload/plugin/hoster/PremiumizeMe.py
	pyload/plugin/hoster/RapidgatorNet.py
	pyload/plugin/hoster/RealdebridCom.py
	pyload/plugin/hoster/SimplyPremiumCom.py
	pyload/plugin/hoster/SimplydebridCom.py
	pyload/plugin/hoster/SmoozedCom.py
	pyload/plugin/hoster/SoundcloudCom.py
	pyload/plugin/hoster/UlozTo.py
	pyload/plugin/hoster/UploadableCh.py
	pyload/plugin/hoster/UploadedTo.py
	pyload/plugin/hoster/UploadheroCom.py
	pyload/plugin/hoster/VeehdCom.py
	pyload/plugin/hoster/VimeoCom.py
	pyload/plugin/hoster/ZeveraCom.py
	pyload/plugin/hoster/ZippyshareCom.py
	pyload/plugin/internal/BasePlugin.py
	pyload/plugin/internal/MultiHoster.py
	pyload/plugin/internal/SimpleDereferer.py
	pyload/plugin/internal/SimpleHoster.py
	pyload/plugin/internal/XFSHoster.py
	pyload/plugin/ocr/GigasizeCom.py
	pyload/plugin/ocr/LinksaveIn.py
	pyload/plugin/ocr/NetloadIn.py
	pyload/plugin/ocr/ShareonlineBiz.py

1 files changed, 64 insertions, 29 deletions

diff --git a/pyload/plugin/addon/AndroidPhoneNotify.py b/pyload/plugin/addon/AndroidPhoneNotify.py
index 2b4f8fcca..53af8aa1c 100644
--- a/pyload/plugin/addon/AndroidPhoneNotify.py
+++ b/pyload/plugin/addon/AndroidPhoneNotify.py
@@ -1,55 +1,74 @@
 # -*- coding: utf-8 -*-
 
-from time import time
+import time
 
 from pyload.network.RequestFactory import getURL
-from pyload.plugin.Addon import Addon
+from pyload.plugin.Addon import Addon, Expose
 
 
 class AndroidPhoneNotify(Addon):
     __name__    = "AndroidPhoneNotify"
     __type__    = "addon"
-    __version__ = "0.05"
+    __version__ = "0.07"
 
     __config__ = [("apikey"         , "str" , "API key"                                  , ""   ),
                   ("notifycaptcha"  , "bool", "Notify captcha request"                   , True ),
                   ("notifypackage"  , "bool", "Notify package finished"                  , True ),
-                  ("notifyprocessed", "bool", "Notify processed packages status"         , True ),
-                  ("timeout"        , "int" , "Timeout between captchas in seconds"      , 5    ),
-                  ("force"          , "bool", "Send notifications if client is connected", False)]
-
-    __description__ = """Send push notifications to your Android Phone using notifymyandroid.com"""
+                  ("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)]
+
+    __description__ = """Send push notifications to your Android Phone (using notifymyandroid.com)"""
     __license__     = "GPLv3"
-    __authors__     = [("Steven Kosyra", "steven.kosyra@gmail.com"),
-                       ("Walter Purcaro", "vuolter@gmail.com")]
+    __authors__     = [("Steven Kosyra" , "steven.kosyra@gmail.com"),
+                       ("Walter Purcaro", "vuolter@gmail.com"      )]
 
 
-    event_list = ["allDownloadsProcessed"]
+    event_list = ["allDownloadsProcessed", "plugin_updated"]
+    interval   = 0  #@TODO: Remove in 0.4.10
 
 
     def setup(self):
-        self.info        = {}  #@TODO: Remove in 0.4.10
-        self.last_notify = 0
+        self.info          = {}  #@TODO: Remove in 0.4.10
+        self.last_notify   = 0
+        self.notifications = 0
 
 
-    def newCaptchaTask(self, task):
-        if not self.getConfig("notifycaptcha"):
-            return False
+    def plugin_updated(self, type_plugins):
+        if not self.getConfig('notifyupdate'):
+            return
+
+        self.notify(_("Plugins updated"), str(type_plugins))
+
+
+    def coreExiting(self):
+        if not self.getConfig('notifyexit'):
+            return
+
+        if self.core.do_restart:
+            self.notify(_("Restarting pyLoad"))
+        else:
+            self.notify(_("Exiting pyLoad"))
 
-        if time() - self.last_notify < self.getConf("timeout"):
-            return False
+
+    def newCaptchaTask(self, task):
+        if not self.getConfig('notifycaptcha'):
+            return
 
         self.notify(_("Captcha"), _("New request waiting user input"))
 
 
     def packageFinished(self, pypack):
-        if self.getConfig("notifypackage"):
+        if self.getConfig('notifypackage'):
             self.notify(_("Package finished"), pypack.name)
 
 
     def allDownloadsProcessed(self):
-        if not self.getConfig("notifyprocessed"):
-            return False
+        if not self.getConfig('notifyprocessed'):
+            return
 
         if any(True for pdata in self.core.api.getQueue() if pdata.linksdone < pdata.linkstotal):
             self.notify(_("Package failed"), _("One or more packages was not completed successfully"))
@@ -57,19 +76,35 @@ class AndroidPhoneNotify(Addon):
             self.notify(_("All packages finished"))
 
 
-    def notify(self, event, msg=""):
-        apikey = self.getConfig("apikey")
+    @Expose
+    def notify(self,
+               event,
+               msg="",
+               key=self.getConfig('apikey')):
+
+        if not key:
+            return
+
+        if self.core.isClientConnected() and not self.getConfig('ignoreclient'):
+            return
+
+        elapsed_time = time.time() - self.last_notify
+
+        if elapsed_time < self.getConf("sendtimewait"):
+            return
+
+        if elapsed_time > 60:
+            self.notifications = 0
 
-        if not apikey:
-            return False
+        elif self.notifications >= self.getConf("sendpermin"):
+            return
 
-        if self.core.isClientConnected() and not self.getConfig("force"):
-            return False
 
         getURL("http://www.notifymyandroid.com/publicapi/notify",
-               get={'apikey'     : apikey,
+               get={'apikey'     : key,
                     'application': "pyLoad",
                     'event'      : event,
                     'description': msg})
 
-        self.last_notify = time()
+        self.last_notify    = time.time()
+        self.notifications += 1