diff options
author | Stefano <l.stickell@yahoo.it> | 2013-09-04 14:46:25 +0200 |
---|---|---|
committer | Stefano <l.stickell@yahoo.it> | 2013-09-04 14:46:25 +0200 |
commit | e310f47061fe6344dc929318975cd915f8ff6ac1 (patch) | |
tree | f69a9ea7c8755f01e41ab4219de96437e4da4f06 | |
parent | BitshareCom: fixes (diff) | |
download | pyload-e310f47061fe6344dc929318975cd915f8ff6ac1.tar.xz |
Uploadhero: changed domain from COM to CO
See #125
-rw-r--r-- | module/plugins/accounts/UploadheroCom.py | 8 | ||||
-rw-r--r-- | module/plugins/hoster/UploadheroCom.py | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/module/plugins/accounts/UploadheroCom.py b/module/plugins/accounts/UploadheroCom.py index 0e64a3ff5..12463f285 100644 --- a/module/plugins/accounts/UploadheroCom.py +++ b/module/plugins/accounts/UploadheroCom.py @@ -10,9 +10,9 @@ from module.plugins.Account import Account class UploadheroCom(Account): __name__ = "UploadheroCom" - __version__ = "0.1" + __version__ = "0.2" __type__ = "account" - __description__ = """Uploadhero.com account plugin""" + __description__ = """Uploadhero.co account plugin""" __author_name__ = ("mcmyst") __author_mail__ = ("mcmyst@hotmail.fr") @@ -20,7 +20,7 @@ class UploadheroCom(Account): premium_pattern = re.compile('Il vous reste <span class="bleu">([0-9]+)</span> jours premium.') data = self.getAccountData(user) - page = req.load("http://uploadhero.com/my-account") + page = req.load("http://uploadhero.co/my-account") if premium_pattern.search(page): end_date = datetime.date.today() + datetime.timedelta(days=int(premium_pattern.search(page).group(1))) @@ -32,7 +32,7 @@ class UploadheroCom(Account): return account_info def login(self, user, data, req): - page = req.load("http://uploadhero.com/lib/connexion.php", + page = req.load("http://uploadhero.co/lib/connexion.php", post={"pseudo_login": user, "password_login": data["password"]}) if "mot de passe invalide" in page: diff --git a/module/plugins/hoster/UploadheroCom.py b/module/plugins/hoster/UploadheroCom.py index 79bca748e..7b047e028 100644 --- a/module/plugins/hoster/UploadheroCom.py +++ b/module/plugins/hoster/UploadheroCom.py @@ -27,12 +27,12 @@ class UploadheroCom(SimpleHoster): __name__ = "UploadheroCom" __type__ = "hoster" __pattern__ = r"http://(?:www\.)?uploadhero\.com?/dl/\w+" - __version__ = "0.14" - __description__ = """UploadHero.com plugin""" + __version__ = "0.15" + __description__ = """UploadHero.co plugin""" __author_name__ = ("mcmyst", "zoidberg") __author_mail__ = ("mcmyst@hotmail.fr", "zoidberg@mujmail.cz") - SH_COOKIES = [("http://uploadhero.com", "lang", "en")] + SH_COOKIES = [("http://uploadhero.co", "lang", "en")] FILE_NAME_PATTERN = r'<div class="nom_de_fichier">(?P<N>.*?)</div>' FILE_SIZE_PATTERN = r'Taille du fichier : </span><strong>(?P<S>.*?)</strong>' FILE_OFFLINE_PATTERN = r'<p class="titre_dl_2">|<div class="raison"><strong>Le lien du fichier ci-dessus n\'existe plus.' @@ -43,7 +43,7 @@ class UploadheroCom(SimpleHoster): IP_WAIT_PATTERN = r'<span id="minutes">(\d+)</span>.*\s*<span id="seconds">(\d+)</span>' CAPTCHA_PATTERN = r'"(/captchadl\.php\?[a-z0-9]+)"' - FREE_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\.co/\?d=[A-Za-z0-9]+/[^<>"/]+)"' def handleFree(self): self.checkErrors() @@ -51,7 +51,7 @@ class UploadheroCom(SimpleHoster): found = re.search(self.CAPTCHA_PATTERN, self.html) if not found: self.parseError("Captcha URL") - captcha_url = "http://uploadhero.com" + found.group(1) + captcha_url = "http://uploadhero.co" + found.group(1) for i in range(5): captcha = self.decryptCaptcha(captcha_url) @@ -78,7 +78,7 @@ class UploadheroCom(SimpleHoster): def checkErrors(self): found = re.search(self.IP_BLOCKED_PATTERN, self.html) if found: - self.html = self.load("http://uploadhero.com%s" % found.group(1)) + self.html = self.load("http://uploadhero.co%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 |