Merge remote-tracking branch 'pyload/stable' into stable

5 files changed, 104 insertions, 26 deletions

diff --git a/module/plugins/hoster/NitroflareCom.py b/module/plugins/hoster/NitroflareCom.py
index 7970ae460..9ca6ab187 100644
--- a/module/plugins/hoster/NitroflareCom.py
+++ b/module/plugins/hoster/NitroflareCom.py
@@ -29,6 +29,7 @@ class NitroflareCom(SimpleHoster):
     OFFLINE_PATTERN = r'>File doesn\'t exist'
 
     LINK_PREMIUM_PATTERN = LINK_FREE_PATTERN = r'(https?://[\w\-]+\.nitroflare\.com/.+?)"'
+    DIRECT_LINK = False
 
     RECAPTCHA_KEY        = "6Lenx_USAAAAAF5L1pmTWvWcH73dipAEzNnmNLgy"
     PREMIUM_ONLY_PATTERN = r'This file is available with Premium only'
diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py
index b657fe484..ef6f49da3 100644
--- a/module/plugins/hoster/OneFichierCom.py
+++ b/module/plugins/hoster/OneFichierCom.py
@@ -9,10 +9,10 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class OneFichierCom(SimpleHoster):
     __name__    = "OneFichierCom"
     __type__    = "hoster"
-    __version__ = "0.95"
+    __version__ = "0.97"
     __status__  = "testing"
 
-    __pattern__ = r'https?://(?:www\.)?(?:\w+\.)?(?P<HOST>1fichier\.com|alterupload\.com|cjoint\.net|d(es)?fichiers\.com|dl4free\.com|megadl\.fr|mesfichiers\.org|piecejointe\.net|pjointe\.com|tenvoi\.com)(?:/\?\w+)?'
+    __pattern__ = r'https?://(?:www\.)?(?:\w+\.)?(?P<HOST>1fichier\.com|alterupload\.com|cjoint\.net|d(?:es)?fichiers\.com|dl4free\.com|megadl\.fr|mesfichiers\.org|piecejointe\.net|pjointe\.com|tenvoi\.com)(?:/\?\w+)?'
     __config__  = [("activated"   , "bool", "Activated"                                        , True),
                    ("use_premium" , "bool", "Use premium account if available"                 , True),
                    ("fallback"    , "bool", "Fallback to free download if premium fails"       , True),
@@ -28,22 +28,24 @@ class OneFichierCom(SimpleHoster):
                        ("stickell", "l.stickell@yahoo.it"),
                        ("Elrick69", "elrick69[AT]rocketmail[DOT]com"),
                        ("Walter Purcaro", "vuolter@gmail.com"),
-                       ("Ludovic Lehmann", "ludo.lehmann@gmail.com")]
+                       ("Ludovic Lehmann", "ludo.lehmann@gmail.com"),
+                       ("GammaC0de", "nitzo2001[AT]yahoo[DOT]com")]
 
+    DISPOSITION      = False  #@TODO: Remove disposition in 0.4.10
 
     URL_REPLACEMENTS = [("https:", "http:")]  #@TODO: Remove in 0.4.10
 
-    COOKIES     = [("1fichier.com", "LG", "en")]
+    COOKIES          = [("1fichier.com", "LG", "en")]
 
-    NAME_PATTERN    = r'>File\s*Name :</td>\s*<td.*>(?P<N>.+?)<'
-    SIZE_PATTERN    = r'>Size :</td>\s*<td.*>(?P<S>[\d.,]+) (?P<U>[\w^_]+)'
-    OFFLINE_PATTERN = r'File not found !\s*<'
-
-    WAIT_PATTERN = r'>You must wait \d+ minutes'
+    NAME_PATTERN     = r'>File\s*Name :</td>\s*<td.*>(?P<N>.+?)<'
+    SIZE_PATTERN     = r'>Size :</td>\s*<td.*>(?P<S>[\d.,]+) (?P<U>[\w^_]+)'
+    OFFLINE_PATTERN  = r'File not found !\s*<'
+    LINK_PATTERN     = r'<a href="(.+?)".*>Click here to download the file</a>'
 
+    WAIT_PATTERN     = r'>You must wait \d+ minutes'
 
     def setup(self):
-        self.multiDL        = self.premium
+        self.multiDL         = self.premium
         self.resume_download = True
 
 
@@ -52,7 +54,7 @@ class OneFichierCom(SimpleHoster):
         redirect = url
         for i in xrange(10):
             try:
-                headers = dict(re.findall(r"(?P<name>.+?): (?P<value>.+?)\r?\n", get_url(redirect, just_header=True).lower()))
+                headers = dict((k.lower(), v) for k,v in re.findall(r"(?P<name>.+?): (?P<value>.+?)\r?\n", get_url(redirect, just_header=True)))
                 if 'location' in headers and headers['location']:
                     redirect = headers['location']
                 else:
@@ -94,13 +96,16 @@ class OneFichierCom(SimpleHoster):
         if "pass" in inputs:
             inputs['pass'] = self.get_password()
 
-        inputs['submit'] = "Download"
+        inputs['dl_no_ssl'] = "on"
+
+        self.data=self.load(url, post=inputs)
 
-        self.download(url, post=inputs)
+        m = re.search(self.LINK_PATTERN, self.data)
+        if m:
+            self.link = m.group(1)
 
 
     def handle_premium(self, pyfile):
-        self.download(pyfile.url, post={'did': 0, 'dl_no_ssl': "on"})
+        self.download(pyfile.url, post={'did': 0, 'dl_no_ssl': "on"}, disposition=False)  #@TODO: Remove disposition in 0.4.10
 
 
-getInfo = create_getInfo(OneFichierCom)
diff --git a/module/plugins/hoster/ShareonlineBiz.py b/module/plugins/hoster/ShareonlineBiz.py
index 24c25a43a..06c9f6cfe 100644
--- a/module/plugins/hoster/ShareonlineBiz.py
+++ b/module/plugins/hoster/ShareonlineBiz.py
@@ -12,7 +12,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class ShareonlineBiz(SimpleHoster):
     __name__    = "ShareonlineBiz"
     __type__    = "hoster"
-    __version__ = "0.63"
+    __version__ = "0.64"
     __status__  = "testing"
 
     __pattern__ = r'https?://(?:www\.)?(share-online\.biz|egoshare\.com)/(download\.php\?id=|dl/)(?P<ID>\w+)'
diff --git a/module/plugins/hoster/UgouploadNet.py b/module/plugins/hoster/UgouploadNet.py
new file mode 100644
index 000000000..fec2e11d1
--- /dev/null
+++ b/module/plugins/hoster/UgouploadNet.py
@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+
+import re
+
+from module.plugins.captcha.ReCaptcha import ReCaptcha
+from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
+
+
+class UgouploadNet(SimpleHoster):
+    __name__    = "UgouploadNet"
+    __type__    = "hoster"
+    __version__ = "0.02"
+    __status__  = "testing"
+
+    __pattern__ = r'https?://(?:www)?\.ugoupload\.net/\w{4}/.+'
+    __config__  = [("activated"   , "bool", "Activated"                                        , True),
+                   ("use_premium" , "bool", "Use premium account if available"                 , True),
+                   ("fallback"    , "bool", "Fallback to free download if premium fails"       , True),
+                   ("chk_filesize", "bool", "Check file size"                                  , True),
+                   ("max_wait"    , "int" , "Reconnect if waiting time is greater than minutes", 10  )]
+
+    __description__ = """ugoupload.net hoster plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("GammaC0de", "nitzo2001[AT]yahoo[DOT]com")]
+
+
+    NAME_PATTERN      = r'<div class="heading-1 animated".*>(.+?)</div>'
+    SIZE_PATTERN      = r'\((?P<S>[\d.,]+) (?P<U>[\w^_]+)\)<br/>'
+
+    WAIT_PATTERN      = r'var seconds = (\d+);'
+    LINK_FREE_PATTERN = r"<a class='btn btn-free' href='(.+?)'"
+
+    RECAPTCHA_KEY = "6LeuAc4SAAAAAOSry8eo2xW64K1sjHEKsQ5CaS10"
+
+
+    def setup(self):
+        self.resume_download = False
+        self.multiDL         = False
+
+
+    def handle_free(self, pyfile):
+        if self.req.code == 404:
+            self.offline()
+
+        self.check_errors()
+
+        m = re.search(self.LINK_FREE_PATTERN, self.data)
+        if m:
+            recaptcha = ReCaptcha(self)
+            response, challenge = recaptcha.challenge(self.RECAPTCHA_KEY)
+
+            self.download(m.group(1), post={'recaptcha_challenge_field': challenge,
+                                            'recaptcha_response_field': response,
+                                             'submit':	"Submit",
+                                             'submitted': "1",
+                                             'd': "1"})
diff --git a/module/plugins/hoster/UpstoreNet.py b/module/plugins/hoster/UpstoreNet.py
index c863dff9d..4fcf6dcfa 100644
--- a/module/plugins/hoster/UpstoreNet.py
+++ b/module/plugins/hoster/UpstoreNet.py
@@ -9,16 +9,10 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class UpstoreNet(SimpleHoster):
     __name__    = "UpstoreNet"
     __type__    = "hoster"
-    __version__ = "0.09"
+    __version__ = "0.10"
     __status__  = "testing"
 
     __pattern__ = r'https?://(?:www\.)?upstore\.net/'
-    __config__  = [("activated"   , "bool", "Activated"                                        , True),
-                   ("use_premium" , "bool", "Use premium account if available"                 , True),
-                   ("fallback"    , "bool", "Fallback to free download if premium fails"       , True),
-                   ("chk_filesize", "bool", "Check file size"                                  , True),
-                   ("max_wait"    , "int" , "Reconnect if waiting time is greater than minutes", 10  )]
-
     __description__ = """Upstore.Net File Download Hoster"""
     __license__     = "GPLv3"
     __authors__     = [("igel", "igelkun@myopera.com")]
@@ -27,9 +21,12 @@ class UpstoreNet(SimpleHoster):
     INFO_PATTERN = r'<div class="comment">.*?</div>\s*\n<h2 style="margin:0">(?P<N>.*?)</h2>\s*\n<div class="comment">\s*\n\s*(?P<S>[\d.,]+) (?P<U>[\w^_]+)'
     OFFLINE_PATTERN = r'<span class="error">File not found</span>'
 
+    LONG_WAIT_PATTERN = r'You should wait (\d+) min. before downloading next'
     WAIT_PATTERN = r'var sec = (\d+)'
     CHASH_PATTERN = r'<input type="hidden" name="hash" value="(.+?)">'
     LINK_FREE_PATTERN = r'<a href="(https?://.*?)" target="_blank"><b>'
+    WRONG_CAPTCHA_PATTERN = r'Wrong captcha'
+    PREMIUM_ONLY_PATTERN = r'available only for Premium'
 
 
     def handle_free(self, pyfile):
@@ -42,6 +39,7 @@ class UpstoreNet(SimpleHoster):
         #: Continue to stage2
         post_data = {'hash': chash, 'free': 'Slow download'}
         self.data = self.load(pyfile.url, post=post_data)
+        self.check_errors()
 
         #: STAGE 2: solv captcha and wait
         #: First get the infos we need: recaptcha key and wait time
@@ -64,13 +62,31 @@ class UpstoreNet(SimpleHoster):
 
             self.data = self.load(pyfile.url, post=post_data)
 
-            #: STAGE 3: get direct link
+            # check whether the captcha was wrong
+            m = re.search(self.WRONG_CAPTCHA_PATTERN, self.data, re.S)
+            if m is not None:
+                continue
+
+
+            # STAGE 3: get direct link or wait time
+            m = re.search(self.LONG_WAIT_PATTERN, self.data, re.S)
+            if m is not None:
+                wait_time = 60* int(m.group(1))
+                self.wantReconnect = True
+                self.retry(wait=wait_time, reason=_("Please wait to download this file"))
+
             m = re.search(self.LINK_FREE_PATTERN, self.data, re.S)
             if m is not None:
+                self.link = m.group(1)
                 break
 
-        if m is not None:
-            self.link = m.group(1)
+            # sometimes, upstore just restarts the countdown without saying anything...
+            # in this case we'll just wait 1h and retry
+            self.wantReconnect = True
+            self.retry(wait_time=3600, reason=_("Upstore doesn't like us today"))
+
+
 
 
 getInfo = create_getInfo(UpstoreNet)
+