Merge branch 'stable' into 0.4.10

Conflicts:
	module/plugins/hoster/NowDownloadEu.py
	module/plugins/hoster/NowDownloadSx.py
	module/plugins/hoster/NowVideoAt.py
	module/plugins/hoster/NowVideoSx.py
	pyload/plugins/account/RapidshareCom.py
	pyload/plugins/addon/ExtractArchive.py
	pyload/plugins/addon/HotFolder.py
	pyload/plugins/addon/UpdateManager.py
	pyload/plugins/hook/Captcha9kw.py
	pyload/plugins/hook/DebridItaliaCom.py
	pyload/plugins/hoster/DebridItaliaCom.py
	pyload/plugins/hoster/Keep2shareCc.py
	pyload/plugins/hoster/NetloadIn.py
	pyload/plugins/hoster/NowDownloadEu.py
	pyload/plugins/hoster/NowVideoAt.py
	pyload/plugins/hoster/RapidshareCom.py
	pyload/plugins/hoster/ShareonlineBiz.py
	pyload/plugins/internal/MultiHoster.py
	pyload/plugins/internal/SimpleHoster.py

1 files changed, 81 insertions, 0 deletions

diff --git a/module/plugins/hooks/SkipRev.py b/module/plugins/hooks/SkipRev.py
new file mode 100644
index 000000000..76a48a255
--- /dev/null
+++ b/module/plugins/hooks/SkipRev.py
@@ -0,0 +1,81 @@
+# -*- coding: utf-8 -*-
+
+import re
+
+from urllib import unquote
+from urlparse import urljoin, urlparse
+
+from module.plugins.Hook import Hook
+from module.plugins.Plugin import SkipDownload
+
+
+class SkipRev(Hook):
+    __name__    = "SkipRev"
+    __type__    = "hook"
+    __version__ = "0.13"
+
+    __config__ = [("auto",   "bool", "Automatically keep all rev files needed by package", True),
+                  ("tokeep", "int" , "Min number of rev files to keep for package"       ,    1),
+                  ("unskip", "bool", "Restart a skipped rev when download fails"         , True)]
+
+    __description__ = """Skip files ending with extension rev"""
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+
+
+    def _setup(self):
+        super(self.pyfile.plugin, self).setup()
+        if self.pyfile.hasStatus("skipped"):
+            raise SkipDownload(self.pyfile.getStatusName() or self.pyfile.pluginname)
+
+
+    def pyname(self, pyfile):
+        url    = pyfile.url
+        plugin = pyfile.plugin
+
+        if hasattr(plugin, "info") and 'name' in plugin.info and plugin.info['name']:
+            name = plugin.info['name']
+
+        elif hasattr(plugin, "parseInfo"):
+            name = next(plugin.parseInfo([url]))['name']
+
+        elif hasattr(plugin, "getInfo"):  #@NOTE: if parseInfo was not found, getInfo should be missing too
+            name = plugin.getInfo(url)['name']
+
+        else:
+            self.logWarning("Unable to grab file name")
+            name = urlparse(unquote(url)).path.split('/')[-1])
+
+        return name
+
+
+    def downloadPreparing(self, pyfile):
+        if pyfile.getStatusName() is "unskipped" or not pyname(pyfile).endswith(".rev"):
+            return
+
+        tokeep = self.getConfig("tokeep")
+
+        if tokeep > 0:
+            saved = [True for link in pyfile.package().getChildren() \
+                     if link.name.endswith(".rev") and (link.hasStatus("finished") or link.hasStatus("downloading"))].count(True)
+
+            if saved < tokeep:
+                return
+
+        pyfile.setCustomStatus("SkipRev", "skipped")
+        pyfile.plugin.setup = _setup  #: work-around: inject status checker inside the preprocessing routine of the plugin
+
+
+    def downloadFailed(self, pyfile):
+        if self.getConfig("auto") is False:
+
+            if self.getConfig("unskip") is False:
+                return
+
+            if not pyfile.name.endswith(".rev"):
+                return
+
+        for link in pyfile.package().getChildren():
+            if link.hasStatus("skipped") and link.name.endswith(".rev"):
+                link.setCustomStatus("unskipped", "queued")
+                return