Merge branch 'stable' into 0.4.10

Conflicts:
	module/plugins/hooks/MultihostersComHook.py
	module/plugins/hooks/PutdriveComHook.py
	module/plugins/internal/CaptchaService.py
	pyload/plugin/account/OboomCom.py
	pyload/plugin/account/SmoozedCom.py
	pyload/plugin/addon/AntiVirus.py
	pyload/plugin/addon/ExternalScripts.py
	pyload/plugin/addon/ExtractArchive.py
	pyload/plugin/addon/RestartSlow.py
	pyload/plugin/crypter/CrockoCom.py
	pyload/plugin/crypter/DepositfilesCom.py
	pyload/plugin/crypter/FshareVn.py
	pyload/plugin/crypter/LinkdecrypterCom.py
	pyload/plugin/crypter/MegaRapidCz.py
	pyload/plugin/crypter/PastebinCom.py
	pyload/plugin/hoster/CatShareNet.py
	pyload/plugin/hoster/EdiskCz.py
	pyload/plugin/hoster/ExtabitCom.py
	pyload/plugin/hoster/GigapetaCom.py
	pyload/plugin/hoster/GooIm.py
	pyload/plugin/hoster/IfolderRu.py
	pyload/plugin/hoster/LuckyShareNet.py
	pyload/plugin/hoster/MegasharesCom.py
	pyload/plugin/hoster/MovReelCom.py
	pyload/plugin/hoster/NarodRu.py
	pyload/plugin/hoster/NowDownloadSx.py
	pyload/plugin/hoster/NowVideoSx.py
	pyload/plugin/hoster/QuickshareCz.py
	pyload/plugin/hoster/RemixshareCom.py
	pyload/plugin/hoster/RgHostNet.py
	pyload/plugin/hoster/SendspaceCom.py
	pyload/plugin/hoster/UlozTo.py
	pyload/plugin/hoster/UnibytesCom.py
	pyload/plugin/hoster/UploadingCom.py
	pyload/plugin/hoster/WrzucTo.py
	pyload/plugin/internal/MultiHook.py
	pyload/plugin/internal/SimpleHoster.py

1 files changed, 0 insertions, 57 deletions

diff --git a/pyload/plugin/addon/RestartSlow.py b/pyload/plugin/addon/RestartSlow.py
deleted file mode 100644
index 34416e79a..000000000
--- a/pyload/plugin/addon/RestartSlow.py
+++ /dev/null
@@ -1,57 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import pycurl
-
-from pyload.plugin.Addon import Addon
-
-
-class RestartSlow(Addon):
-    __name__    = "RestartSlow"
-    __type__    = "addon"
-    __version__ = "0.04"
-
-    __config__ = [("free_limit"   , "int" ,  "Transfer speed threshold in kilobytes"                     , 100 ),
-                ("free_time"    , "int" ,  "Sample interval in minutes"                                , 5   ),
-                ("premium_limit", "int" ,  "Transfer speed threshold for premium download in kilobytes", 300 ),
-                ("premium_time" , "int" ,  "Sample interval for premium download in minutes"           , 2   ),
-                ("safe_mode"    , "bool",  "Don't restart if download is not resumable"                , True)]
-
-    __description__ = """Restart slow downloads"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
-
-
-    event_list = ["downloadStarts"]
-
-
-    def setup(self):
-        self.info = {'chunk': {}}
-
-
-    def periodical(self):
-        if not self.pyfile.plugin.req.dl:
-            return
-
-        if self.getConfig('safe_mode') and not self.pyfile.plugin.resumeDownload:
-            time  = 30
-            limit = 5
-        else:
-            type  = "premium" if self.pyfile.plugin.premium else "free"
-            time  = max(30, self.getConfig('%s_time' % type) * 60)
-            limit = max(5, self.getConfig('%s_limit' % type) * 1024)
-
-        chunks = [chunk for chunk in self.pyfile.plugin.req.dl.chunks \
-                  if chunk.id not in self.info['chunk'] or self.info['chunk'][chunk.id] is not (time, limit)]
-
-        for chunk in chunks:
-            chunk.c.setopt(pycurl.LOW_SPEED_TIME , time)
-            chunk.c.setopt(pycurl.LOW_SPEED_LIMIT, limit)
-
-            self.info['chunk'][chunk.id] = (time, limit)
-
-
-    def downloadStarts(self, pyfile, url, filename):
-        if self.cb or (self.getConfig('safe_mode') and not pyfile.plugin.resumeDownload):
-            return
-        self.pyfile = pyfile
-        self.initPeriodical()