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, 25 insertions, 22 deletions

diff --git a/pyload/plugin/addon/DeleteFinished.py b/pyload/plugin/addon/DeleteFinished.py
index 59f2e3321..aad05891e 100644
--- a/pyload/plugin/addon/DeleteFinished.py
+++ b/pyload/plugin/addon/DeleteFinished.py
@@ -7,10 +7,11 @@ from pyload.plugin.Addon import Addon
 class DeleteFinished(Addon):
     __name__    = "DeleteFinished"
     __type__    = "addon"
-    __version__ = "1.11"
+    __version__ = "1.12"
 
-    __config__ = [('interval'  , 'int' , 'Delete every (hours)'              , '72'   ),
-                ('deloffline', 'bool', 'Delete packages with offline links', 'False')]
+    __config__ = [("activated" , "bool", "Activated"                         , "False"),
+                  ("interval"  , "int" , "Delete every (hours)"              , "72"   ),
+                  ("deloffline", "bool", "Delete packages with offline links", "False")]
 
     __description__ = """Automatically delete all finished packages from queue"""
     __license__     = "GPLv3"
@@ -19,8 +20,15 @@ class DeleteFinished(Addon):
 
     # event_list = ["pluginConfigChanged"]
 
+    MIN_CHECK_INTERVAL = 1 * 60 * 60  #: 1 hour
+
 
     ## overwritten methods ##
+    def setup(self):
+        self.info     = {}  #@TODO: Remove in 0.4.10
+        self.interval = self.MIN_CHECK_INTERVAL
+
+
     def periodical(self):
         if not self.info['sleep']:
             deloffline = self.getConfig('deloffline')
@@ -32,20 +40,21 @@ class DeleteFinished(Addon):
             self.addEvent('packageFinished', self.wakeup)
 
 
-    def pluginConfigChanged(self, plugin, name, value):
-        if name == "interval" and value != self.interval:
-            self.interval = value * 3600
-            self.initPeriodical()
+    # def pluginConfigChanged(self, plugin, name, value):
+        # if name == "interval" and value != self.interval:
+            # self.interval = value * 3600
+            # self.initPeriodical()
 
 
     def deactivate(self):
-        self.removeEvent('packageFinished', self.wakeup)
+        self.manager.removeEvent('packageFinished', self.wakeup)
 
 
     def activate(self):
-        self.info = {'sleep': True}
-        interval = self.getConfig('interval')
-        self.pluginConfigChanged(self.__name__, 'interval', interval)
+        self.info['sleep'] = True
+        # interval = self.getConfig('interval')
+        # self.pluginConfigChanged(self.__name__, 'interval', interval)
+        self.interval = max(self.MIN_CHECK_INTERVAL, self.getConfig('interval') * 60 * 60)
         self.addEvent('packageFinished', self.wakeup)
 
 
@@ -57,23 +66,17 @@ class DeleteFinished(Addon):
 
 
     def wakeup(self, pypack):
-        self.removeEvent('packageFinished', self.wakeup)
+        self.manager.removeEvent('packageFinished', self.wakeup)
         self.info['sleep'] = False
 
 
     ## event managing ##
     def addEvent(self, event, func):
         """Adds an event listener for event name"""
-        if event in self.m.events:
-            if func in self.m.events[event]:
+        if event in self.manager.events:
+            if func in self.manager.events[event]:
                 self.logDebug("Function already registered", func)
             else:
-                self.m.events[event].append(func)
+                self.manager.events[event].append(func)
         else:
-            self.m.events[event] = [func]
-
-
-    def setup(self):
-        self.interval = 0
-        self.m = self.manager
-        self.removeEvent = self.m.removeEvent
+            self.manager.events[event] = [func]