little fixes - shareonline.biz, uploadhero.com

2 files changed, 18 insertions, 9 deletions

diff --git a/module/plugins/hoster/ShareonlineBiz.py b/module/plugins/hoster/ShareonlineBiz.py
index 8517d441d..719235565 100644
--- a/module/plugins/hoster/ShareonlineBiz.py
+++ b/module/plugins/hoster/ShareonlineBiz.py
@@ -43,7 +43,7 @@ class ShareonlineBiz(Hoster):
     __name__ = "ShareonlineBiz"
     __type__ = "hoster"
     __pattern__ = r"http://[\w\.]*?(share\-online\.biz|egoshare\.com)/(download.php\?id\=|dl/)[\w]+"
-    __version__ = "0.28"
+    __version__ = "0.29"
     __description__ = """Shareonline.biz Download Hoster"""
     __author_name__ = ("spoob", "mkaay", "zoidberg")
     __author_mail__ = ("spoob@pyload.org", "mkaay@mkaay.de", "zoidberg@mujmail.cz")
@@ -73,6 +73,10 @@ class ShareonlineBiz(Hoster):
             if self.premium: 
                 self.account.getAccountInfo(self.user, True)
             self.retry(reason=_("Invalid download ticket"))
+            
+        self.logDebug('DOWNLOAD SIZE: %d B (%d expected)' % (self.pyfile.size , self.exp_size))
+        if self.pyfile.size != self.exp_size:
+            self.retry(reason="Incorrect file size: %d B" % self.pyfile.size)
 
     def downloadAPIData(self):
         api_url_base = "http://api.share-online.biz/linkcheck.php?md5=1"
@@ -91,7 +95,7 @@ class ShareonlineBiz(Hoster):
     def handleFree(self):       
         self.downloadAPIData()
         self.pyfile.name = self.api_data["filename"]
-        self.pyfile.size = self.api_data["size"]
+        self.pyfile.size = self.exp_size = int(self.api_data["size"])
         
         self.html = self.load(self.pyfile.url, cookies = True) #refer, stuff
         self.setWait(3)
@@ -141,7 +145,7 @@ class ShareonlineBiz(Hoster):
             self.offline()
         
         self.pyfile.name = dlinfo["name"]
-        self.pyfile.size = dlinfo["size"]
+        self.pyfile.size = self.exp_size = int(dlinfo["size"])
                
         dlLink = dlinfo["url"]
         if dlLink == "server_under_maintenance":
diff --git a/module/plugins/hoster/UploadheroCom.py b/module/plugins/hoster/UploadheroCom.py
index dd43d76b9..eb7b5fb23 100644
--- a/module/plugins/hoster/UploadheroCom.py
+++ b/module/plugins/hoster/UploadheroCom.py
@@ -23,7 +23,7 @@ class UploadheroCom(SimpleHoster):
     __name__ = "UploadheroCom"
     __type__ = "hoster"
     __pattern__ = r"http://(?:www\.)?uploadhero\.com/dl/\w+"
-    __version__ = "0.11"
+    __version__ = "0.12"
     __description__ = """UploadHero.com plugin"""
     __author_name__ = ("mcmyst", "zoidberg")
     __author_mail__ = ("mcmyst@hotmail.fr", "zoidberg@mujmail.cz")
@@ -35,9 +35,11 @@ class UploadheroCom(SimpleHoster):
     
     DOWNLOAD_URL_PATTERN = r'<a href="([^"]+)" id="downloadnow"'
     
-    IP_WAIT_PATTERN = r'/lightbox_block_download\.php\?min=(\d+)\&sec=(\d+)"'
+    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\?[a-z0-9]+)"'
-    DL_URL_PATTERN = r'var magicomfg = \'<a href="(http://[^<>"]*?)"|"(http://storage\d+\.uploadhero\.com/\?d=[A-Za-z0-9]+/[^<>"/]+)"'
+    FREE_URL_PATTERN = r'var magicomfg = \'<a href="(http://[^<>"]*?)"|"(http://storage\d+\.uploadhero\.com/\?d=[A-Za-z0-9]+/[^<>"/]+)"'
     
     def handleFree(self):
         self.checkErrors() 
@@ -49,7 +51,7 @@ class UploadheroCom(SimpleHoster):
         for i in range(5):
             captcha = self.decryptCaptcha(captcha_url)    
             self.html = self.load(self.pyfile.url, get = {"code": captcha})
-            found = re.search(self.DL_URL_PATTERN, self.html) 
+            found = re.search(self.FREE_URL_PATTERN, self.html) 
             if found:
                 self.correctCaptcha()
                 download_url = found.group(1) or found.group(2)
@@ -69,9 +71,12 @@ class UploadheroCom(SimpleHoster):
         self.download(link) 
              
     def checkErrors(self):
-        found = re.search(self.IP_WAIT_PATTERN, self.html)
+        found = re.search(self.IP_BLOCKED_PATTERN, self.html)
         if found:
-            wait_time = 30 * 60 - int(found.group(1)) * 60 - int(found.group(2))
+            self.html = self.load("http://uploadhero.com%s" % found.group(1))
+                    
+            found = re.search(self.IP_WAIT_PATTERN, self.html)
+            wait_time = (int(found.group(1)) * 60 + int(found.group(2))) if found else 300
             self.setWait(wait_time, True)
             self.wait()
             self.retry()