From fd105f8e51768ec1943cda2375bdfdbe5b0a3951 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Fri, 9 Jan 2015 00:35:51 +0100
Subject: "New Year" Update: hoster plugins

---
 module/plugins/hoster/UploadheroCom.py | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

(limited to 'module/plugins/hoster/UploadheroCom.py')

diff --git a/module/plugins/hoster/UploadheroCom.py b/module/plugins/hoster/UploadheroCom.py
index 189079017..ac0b4b562 100644
--- a/module/plugins/hoster/UploadheroCom.py
+++ b/module/plugins/hoster/UploadheroCom.py
@@ -11,7 +11,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class UploadheroCom(SimpleHoster):
     __name__    = "UploadheroCom"
     __type__    = "hoster"
-    __version__ = "0.16"
+    __version__ = "0.17"
 
     __pattern__ = r'http://(?:www\.)?uploadhero\.com?/dl/\w+'
 
@@ -31,11 +31,12 @@ class UploadheroCom(SimpleHoster):
     IP_WAIT_PATTERN = r'<span id="minutes">(\d+)</span>.*\s*<span id="seconds">(\d+)</span>'
 
     CAPTCHA_PATTERN = r'"(/captchadl\.php\?\w+)"'
-    FREE_URL_PATTERN = r'var magicomfg = \'<a href="(http://[^<>"]*?)"|"(http://storage\d+\.uploadhero\.co/\?d=\w+/[^<>"/]+)"'
-    PREMIUM_URL_PATTERN = r'<a href="([^"]+)" id="downloadnow"'
 
+    LINK_FREE_PATTERN    = r'var magicomfg = \'<a href="(http://[^<>"]*?)"|"(http://storage\d+\.uploadhero\.co/\?d=\w+/[^<>"/]+)"'
+    LINK_PREMIUM_PATTERN = r'<a href="([^"]+)" id="downloadnow"'
 
-    def handleFree(self):
+
+    def handleFree(self, pyfile):
         self.checkErrors()
 
         m = re.search(self.CAPTCHA_PATTERN, self.html)
@@ -45,8 +46,8 @@ class UploadheroCom(SimpleHoster):
 
         for _i in xrange(5):
             captcha = self.decryptCaptcha(captcha_url)
-            self.html = self.load(self.pyfile.url, get={"code": captcha})
-            m = re.search(self.FREE_URL_PATTERN, self.html)
+            self.html = self.load(pyfile.url, get={"code": captcha})
+            m = re.search(self.LINK_FREE_PATTERN, self.html)
             if m:
                 self.correctCaptcha()
                 download_url = m.group(1) or m.group(2)
@@ -59,12 +60,6 @@ class UploadheroCom(SimpleHoster):
         self.download(download_url)
 
 
-    def handlePremium(self):
-        self.logDebug("%s: Use Premium Account" % self.__name__)
-        link = re.search(self.PREMIUM_URL_PATTERN, self.html).group(1)
-        self.download(link)
-
-
     def checkErrors(self):
         m = re.search(self.IP_BLOCKED_PATTERN, self.html)
         if m:
-- 
cgit v1.2.3


From 1f8ae39acba53cebb46331692515f2ed42f8e12d Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Tue, 10 Mar 2015 22:42:32 +0100
Subject: Update plugins after SimpleHoster changes

---
 module/plugins/hoster/UploadheroCom.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'module/plugins/hoster/UploadheroCom.py')

diff --git a/module/plugins/hoster/UploadheroCom.py b/module/plugins/hoster/UploadheroCom.py
index ac0b4b562..34e42f091 100644
--- a/module/plugins/hoster/UploadheroCom.py
+++ b/module/plugins/hoster/UploadheroCom.py
@@ -21,19 +21,19 @@ class UploadheroCom(SimpleHoster):
                        ("zoidberg", "zoidberg@mujmail.cz")]
 
 
-    NAME_PATTERN = r'<div class="nom_de_fichier">(?P<N>.*?)</div>'
-    SIZE_PATTERN = r'Taille du fichier : </span><strong>(?P<S>.*?)</strong>'
+    NAME_PATTERN    = r'<div class="nom_de_fichier">(?P<N>.*?)</div>'
+    SIZE_PATTERN    = r'Taille du fichier : </span><strong>(?P<S>.*?)</strong>'
     OFFLINE_PATTERN = r'<p class="titre_dl_2">|<div class="raison"><strong>Le lien du fichier ci-dessus n\'existe plus.'
 
     COOKIES = [("uploadhero.co", "lang", "en")]
 
     IP_BLOCKED_PATTERN = r'href="(/lightbox_block_download\.php\?min=.*?)"'
-    IP_WAIT_PATTERN = r'<span id="minutes">(\d+)</span>.*\s*<span id="seconds">(\d+)</span>'
+    IP_WAIT_PATTERN    = r'<span id="minutes">(\d+)</span>.*\s*<span id="seconds">(\d+)</span>'
 
     CAPTCHA_PATTERN = r'"(/captchadl\.php\?\w+)"'
 
     LINK_FREE_PATTERN    = r'var magicomfg = \'<a href="(http://[^<>"]*?)"|"(http://storage\d+\.uploadhero\.co/\?d=\w+/[^<>"/]+)"'
-    LINK_PREMIUM_PATTERN = r'<a href="([^"]+)" id="downloadnow"'
+    LINK_PREMIUM_PATTERN = r'<a href="(.+?)" id="downloadnow"'
 
 
     def handleFree(self, pyfile):
@@ -63,7 +63,7 @@ class UploadheroCom(SimpleHoster):
     def checkErrors(self):
         m = re.search(self.IP_BLOCKED_PATTERN, self.html)
         if m:
-            self.html = self.load("http://uploadhero.co%s" % m.group(1))
+            self.html = self.load("http://uploadhero.co" + m.group(1))
 
             m = re.search(self.IP_WAIT_PATTERN, self.html)
             wait_time = (int(m.group(1)) * 60 + int(m.group(2))) if m else 5 * 60
-- 
cgit v1.2.3


From 04b29926182e7f3181a7c2e20dd57dec4e400def Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Fri, 20 Mar 2015 11:21:27 +0100
Subject: [UploadheroCom] Fix https://github.com/pyload/pyload/issues/1244

---
 module/plugins/hoster/UploadheroCom.py | 44 +++++++++++++++-------------------
 1 file changed, 19 insertions(+), 25 deletions(-)

(limited to 'module/plugins/hoster/UploadheroCom.py')

diff --git a/module/plugins/hoster/UploadheroCom.py b/module/plugins/hoster/UploadheroCom.py
index 34e42f091..12729ee8b 100644
--- a/module/plugins/hoster/UploadheroCom.py
+++ b/module/plugins/hoster/UploadheroCom.py
@@ -5,13 +5,15 @@
 
 import re
 
+from urlparse import urljoin
+
 from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
 
 class UploadheroCom(SimpleHoster):
     __name__    = "UploadheroCom"
     __type__    = "hoster"
-    __version__ = "0.17"
+    __version__ = "0.18"
 
     __pattern__ = r'http://(?:www\.)?uploadhero\.com?/dl/\w+'
 
@@ -21,56 +23,48 @@ class UploadheroCom(SimpleHoster):
                        ("zoidberg", "zoidberg@mujmail.cz")]
 
 
-    NAME_PATTERN    = r'<div class="nom_de_fichier">(?P<N>.*?)</div>'
-    SIZE_PATTERN    = r'Taille du fichier : </span><strong>(?P<S>.*?)</strong>'
-    OFFLINE_PATTERN = r'<p class="titre_dl_2">|<div class="raison"><strong>Le lien du fichier ci-dessus n\'existe plus.'
+    NAME_PATTERN    = r'<div class="nom_de_fichier">(?P<N>.+?)<'
+    SIZE_PATTERN    = r'>Filesize: </span><strong>(?P<S>[\d.,]+) (?P<U>[\w^_]+)'
+    OFFLINE_PATTERN = r'<p class="titre_dl_2">'
 
     COOKIES = [("uploadhero.co", "lang", "en")]
 
-    IP_BLOCKED_PATTERN = r'href="(/lightbox_block_download\.php\?min=.*?)"'
+    IP_BLOCKED_PATTERN = r'href="(/lightbox_block_download\.php\?min=.+?)"'
     IP_WAIT_PATTERN    = r'<span id="minutes">(\d+)</span>.*\s*<span id="seconds">(\d+)</span>'
 
     CAPTCHA_PATTERN = r'"(/captchadl\.php\?\w+)"'
 
-    LINK_FREE_PATTERN    = r'var magicomfg = \'<a href="(http://[^<>"]*?)"|"(http://storage\d+\.uploadhero\.co/\?d=\w+/[^<>"/]+)"'
+    LINK_FREE_PATTERN    = r'var magicomfg = \'<a href="(.+?)"|"(http://storage\d+\.uploadhero\.co.+?)"'
     LINK_PREMIUM_PATTERN = r'<a href="(.+?)" id="downloadnow"'
 
 
     def handleFree(self, pyfile):
-        self.checkErrors()
-
         m = re.search(self.CAPTCHA_PATTERN, self.html)
         if m is None:
-            self.error(_("CAPTCHA_PATTERN not found"))
-        captcha_url = "http://uploadhero.co" + m.group(1)
+            self.error(_("Captcha not found"))
 
-        for _i in xrange(5):
-            captcha = self.decryptCaptcha(captcha_url)
-            self.html = self.load(pyfile.url, get={"code": captcha})
-            m = re.search(self.LINK_FREE_PATTERN, self.html)
-            if m:
-                self.correctCaptcha()
-                download_url = m.group(1) or m.group(2)
-                break
-            else:
-                self.invalidCaptcha()
-        else:
-            self.fail(_("No valid captcha code entered"))
+        captcha = self.decryptCaptcha(urljoin("http://uploadhero.co", m.group(1)))
 
-        self.download(download_url)
+        self.html = self.load(pyfile.url,
+                              get={"code": captcha})
+
+        m = re.search(self.LINK_FREE_PATTERN, self.html)
+        if m:
+            self.link = m.group(1) or m.group(2)
+            self.wait(50)
 
 
     def checkErrors(self):
         m = re.search(self.IP_BLOCKED_PATTERN, self.html)
         if m:
-            self.html = self.load("http://uploadhero.co" + m.group(1))
+            self.html = self.load(urljoin("http://uploadhero.co", m.group(1)))
 
             m = re.search(self.IP_WAIT_PATTERN, self.html)
             wait_time = (int(m.group(1)) * 60 + int(m.group(2))) if m else 5 * 60
             self.wait(wait_time, True)
             self.retry()
 
-        self.info.pop('error', None)
+        return super(UploadheroCom, self).checkErrors()
 
 
 getInfo = create_getInfo(UploadheroCom)
-- 
cgit v1.2.3


From 7d90803262ccbb4fc5296a4dc3ce30fe98f55631 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Wed, 25 Mar 2015 23:10:07 +0100
Subject: __config__ cosmetics

---
 module/plugins/hoster/UploadheroCom.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'module/plugins/hoster/UploadheroCom.py')

diff --git a/module/plugins/hoster/UploadheroCom.py b/module/plugins/hoster/UploadheroCom.py
index 12729ee8b..6c8747b58 100644
--- a/module/plugins/hoster/UploadheroCom.py
+++ b/module/plugins/hoster/UploadheroCom.py
@@ -16,6 +16,7 @@ class UploadheroCom(SimpleHoster):
     __version__ = "0.18"
 
     __pattern__ = r'http://(?:www\.)?uploadhero\.com?/dl/\w+'
+    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
 
     __description__ = """UploadHero.co plugin"""
     __license__     = "GPLv3"
-- 
cgit v1.2.3


From 1ef93e913238275f7657d496ba3d2e7eeb5a30a2 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Fri, 1 May 2015 01:06:01 +0200
Subject: Use 'import' instead 'from'

---
 module/plugins/hoster/UploadheroCom.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'module/plugins/hoster/UploadheroCom.py')

diff --git a/module/plugins/hoster/UploadheroCom.py b/module/plugins/hoster/UploadheroCom.py
index 6c8747b58..5c74f10eb 100644
--- a/module/plugins/hoster/UploadheroCom.py
+++ b/module/plugins/hoster/UploadheroCom.py
@@ -4,8 +4,7 @@
 # http://uploadhero.co/dl/wQBRAVSM
 
 import re
-
-from urlparse import urljoin
+import urlparse
 
 from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
@@ -44,7 +43,7 @@ class UploadheroCom(SimpleHoster):
         if m is None:
             self.error(_("Captcha not found"))
 
-        captcha = self.decryptCaptcha(urljoin("http://uploadhero.co", m.group(1)))
+        captcha = self.decryptCaptcha(urlparse.urljoin("http://uploadhero.co", m.group(1)))
 
         self.html = self.load(pyfile.url,
                               get={"code": captcha})
@@ -58,7 +57,7 @@ class UploadheroCom(SimpleHoster):
     def checkErrors(self):
         m = re.search(self.IP_BLOCKED_PATTERN, self.html)
         if m:
-            self.html = self.load(urljoin("http://uploadhero.co", m.group(1)))
+            self.html = self.load(urlparse.urljoin("http://uploadhero.co", m.group(1)))
 
             m = re.search(self.IP_WAIT_PATTERN, self.html)
             wait_time = (int(m.group(1)) * 60 + int(m.group(2))) if m else 5 * 60
-- 
cgit v1.2.3