diff options
author | Walter Purcaro <vuolter@gmail.com> | 2014-09-26 16:59:26 +0200 |
---|---|---|
committer | Walter Purcaro <vuolter@gmail.com> | 2014-09-26 16:59:26 +0200 |
commit | 4709a41c176dd2947709b7f35ccc84213d574624 (patch) | |
tree | 937addae8d579aafae2c1f66b75536615dfe5b5c /module/plugins/hoster | |
parent | Fix cookie deletion + Account support for SimpleCrypter (diff) | |
download | pyload-4709a41c176dd2947709b7f35ccc84213d574624.tar.xz |
Rename SH flags
Diffstat (limited to 'module/plugins/hoster')
-rw-r--r-- | module/plugins/hoster/CzshareCom.py | 2 | ||||
-rw-r--r-- | module/plugins/hoster/DepositfilesCom.py | 4 | ||||
-rw-r--r-- | module/plugins/hoster/EgoFilesCom.py | 2 | ||||
-rw-r--r-- | module/plugins/hoster/FastshareCz.py | 2 | ||||
-rw-r--r-- | module/plugins/hoster/FilefactoryCom.py | 2 | ||||
-rw-r--r-- | module/plugins/hoster/FileomCom.py | 2 | ||||
-rw-r--r-- | module/plugins/hoster/FilerNet.py | 4 | ||||
-rw-r--r-- | module/plugins/hoster/GigapetaCom.py | 2 | ||||
-rw-r--r-- | module/plugins/hoster/ShareRapidCom.py | 2 | ||||
-rw-r--r-- | module/plugins/hoster/TurbobitNet.py | 2 | ||||
-rw-r--r-- | module/plugins/hoster/TusfilesNet.py | 2 | ||||
-rw-r--r-- | module/plugins/hoster/UploadheroCom.py | 2 | ||||
-rw-r--r-- | module/plugins/hoster/VeohCom.py | 2 | ||||
-rw-r--r-- | module/plugins/hoster/VimeoCom.py | 2 | ||||
-rw-r--r-- | module/plugins/hoster/WrzucTo.py | 2 | ||||
-rw-r--r-- | module/plugins/hoster/ZippyshareCom.py | 2 |
16 files changed, 18 insertions, 18 deletions
diff --git a/module/plugins/hoster/CzshareCom.py b/module/plugins/hoster/CzshareCom.py index 4f581651b..51627dc33 100644 --- a/module/plugins/hoster/CzshareCom.py +++ b/module/plugins/hoster/CzshareCom.py @@ -27,7 +27,7 @@ class CzshareCom(SimpleHoster): FILE_SIZE_REPLACEMENTS = [(' ', '')] FILE_URL_REPLACEMENTS = [(r'http://[^/]*/download.php\?.*?id=(\w+).*', r'http://sdilej.cz/\1/x/')] - SH_CHECK_TRAFFIC = True + FORCE_CHECK_TRAFFIC = True FREE_URL_PATTERN = r'<a href="([^"]+)" class="page-download">[^>]*alt="([^"]+)" /></a>' FREE_FORM_PATTERN = r'<form action="download.php" method="post">\s*<img src="captcha.php" id="captcha" />(.*?)</form>' diff --git a/module/plugins/hoster/DepositfilesCom.py b/module/plugins/hoster/DepositfilesCom.py index e2b2d46fd..9ff8c22a1 100644 --- a/module/plugins/hoster/DepositfilesCom.py +++ b/module/plugins/hoster/DepositfilesCom.py @@ -27,7 +27,7 @@ class DepositfilesCom(SimpleHoster): (r'.*<b title="(?P<N>[^"]+).*', "\g<N>")] FILE_URL_REPLACEMENTS = [(__pattern__, "https://dfiles.eu/files/\g<ID>")] - SH_COOKIES = [(".dfiles.eu", "lang_current", "en")] + COOKIES = [(".dfiles.eu", "lang_current", "en")] RECAPTCHA_PATTERN = r"Recaptcha.create\('([^']+)'" @@ -106,7 +106,7 @@ class DepositfilesCom(SimpleHoster): self.retry(wait_time=60) def handlePremium(self): - self.html = self.load(self.pyfile.url, cookies=self.SH_COOKIES) + self.html = self.load(self.pyfile.url, cookies=self.COOKIES) if '<span class="html_download_api-gold_traffic_limit">' in self.html: self.logWarning("Download limit reached") diff --git a/module/plugins/hoster/EgoFilesCom.py b/module/plugins/hoster/EgoFilesCom.py index 547f042e4..7f7104da1 100644 --- a/module/plugins/hoster/EgoFilesCom.py +++ b/module/plugins/hoster/EgoFilesCom.py @@ -32,7 +32,7 @@ class EgoFilesCom(SimpleHoster): self.load("https://egofiles.com/ajax/lang.php?lang=en", just_header=True) def process(self, pyfile): - if self.premium and (not self.SH_CHECK_TRAFFIC or self.checkTrafficLeft()): + if self.premium and (not self.FORCE_CHECK_TRAFFIC or self.checkTrafficLeft()): self.handlePremium() else: self.handleFree() diff --git a/module/plugins/hoster/FastshareCz.py b/module/plugins/hoster/FastshareCz.py index 7a847fdc4..5a6773af6 100644 --- a/module/plugins/hoster/FastshareCz.py +++ b/module/plugins/hoster/FastshareCz.py @@ -26,7 +26,7 @@ class FastshareCz(SimpleHoster): FILE_URL_REPLACEMENTS = [("#.*", "")] - SH_COOKIES = [(".fastshare.cz", "lang", "en")] + COOKIES = [(".fastshare.cz", "lang", "en")] FREE_URL_PATTERN = r'action=(/free/.*?)>\s*<img src="([^"]*)"><br' PREMIUM_URL_PATTERN = r'(http://data\d+\.fastshare\.cz/download\.php\?id=\d+&)' diff --git a/module/plugins/hoster/FilefactoryCom.py b/module/plugins/hoster/FilefactoryCom.py index 1ac7550fc..627e4dee9 100644 --- a/module/plugins/hoster/FilefactoryCom.py +++ b/module/plugins/hoster/FilefactoryCom.py @@ -33,7 +33,7 @@ class FilefactoryCom(SimpleHoster): OFFLINE_PATTERN = r'<h2>File Removed</h2>|This file is no longer available' PREMIUM_ONLY_PATTERN = r'>Premium Account Required<' - SH_COOKIES = [(".filefactory.com", "locale", "en_US.utf8")] + COOKIES = [(".filefactory.com", "locale", "en_US.utf8")] def handleFree(self): diff --git a/module/plugins/hoster/FileomCom.py b/module/plugins/hoster/FileomCom.py index 2f876466b..3735daab3 100644 --- a/module/plugins/hoster/FileomCom.py +++ b/module/plugins/hoster/FileomCom.py @@ -20,7 +20,7 @@ class FileomCom(XFileSharingPro): HOSTER_NAME = "fileom.com" FILE_URL_REPLACEMENTS = [(r'/$', "")] - SH_COOKIES = [(".fileom.com", "lang", "english")] + COOKIES = [(".fileom.com", "lang", "english")] FILE_NAME_PATTERN = r'Filename: <span>(?P<N>.+?)<' FILE_SIZE_PATTERN = r'File Size: <span class="size">(?P<S>[\d\.]+) (?P<U>\w+)' diff --git a/module/plugins/hoster/FilerNet.py b/module/plugins/hoster/FilerNet.py index a36607f8a..b4cb314b6 100644 --- a/module/plugins/hoster/FilerNet.py +++ b/module/plugins/hoster/FilerNet.py @@ -31,14 +31,14 @@ class FilerNet(SimpleHoster): def process(self, pyfile): - if self.premium and (not self.SH_CHECK_TRAFFIC or self.checkTrafficLeft()): + if self.premium and (not self.FORCE_CHECK_TRAFFIC or self.checkTrafficLeft()): self.handlePremium() else: self.handleFree() def handleFree(self): self.req.setOption("timeout", 120) - self.html = self.load(self.pyfile.url, decode=not self.SH_BROKEN_ENCODING, cookies=self.SH_COOKIES) + self.html = self.load(self.pyfile.url, decode=not self.TEXT_ENCODING, cookies=self.COOKIES) # Wait between downloads m = re.search(r'musst du <span id="time">(\d+)</span> Sekunden warten', self.html) diff --git a/module/plugins/hoster/GigapetaCom.py b/module/plugins/hoster/GigapetaCom.py index 966ac8094..5bbbeb80e 100644 --- a/module/plugins/hoster/GigapetaCom.py +++ b/module/plugins/hoster/GigapetaCom.py @@ -23,7 +23,7 @@ class GigapetaCom(SimpleHoster): FILE_SIZE_PATTERN = r'<th>\s*Size\s*</th>\s*<td>\s*(?P<S>.*?)\s*</td>' OFFLINE_PATTERN = r'<div id="page_error">' - SH_COOKIES = [(".gigapeta.com", "lang", "us")] + COOKIES = [(".gigapeta.com", "lang", "us")] def handleFree(self): diff --git a/module/plugins/hoster/ShareRapidCom.py b/module/plugins/hoster/ShareRapidCom.py index 414e92feb..9d77ba714 100644 --- a/module/plugins/hoster/ShareRapidCom.py +++ b/module/plugins/hoster/ShareRapidCom.py @@ -34,7 +34,7 @@ class ShareRapidCom(SimpleHoster): FILE_SIZE_PATTERN = r'<td class="i">Velikost:</td>\s*<td class="h"><strong>\s*(?P<S>[0-9.]+) (?P<U>[kKMG])i?B</strong></td>' OFFLINE_PATTERN = ur'Nastala chyba 404|Soubor byl smazán' - SH_CHECK_TRAFFIC = True + FORCE_CHECK_TRAFFIC = True LINK_PATTERN = r'<a href="([^"]+)" title="Stahnout">([^<]+)</a>' ERR_LOGIN_PATTERN = ur'<div class="error_div"><strong>Stahování je přístupné pouze přihlášeným uživatelům' diff --git a/module/plugins/hoster/TurbobitNet.py b/module/plugins/hoster/TurbobitNet.py index a9cc46614..6b60d5bc8 100644 --- a/module/plugins/hoster/TurbobitNet.py +++ b/module/plugins/hoster/TurbobitNet.py @@ -31,7 +31,7 @@ class TurbobitNet(SimpleHoster): FILE_URL_REPLACEMENTS = [(r"http://(?:www\.)?(turbobit.net|unextfiles.com)/(?:download/free/)?(?P<ID>\w+).*", "http://turbobit.net/\g<ID>.html")] - SH_COOKIES = [(".turbobit.net", "user_lang", "en")] + COOKIES = [(".turbobit.net", "user_lang", "en")] LINK_PATTERN = r'(?P<url>/download/redirect/[^"\']+)' LIMIT_WAIT_PATTERN = r'<div id="time-limit-text">\s*.*?<span id=\'timeout\'>(\d+)</span>' diff --git a/module/plugins/hoster/TusfilesNet.py b/module/plugins/hoster/TusfilesNet.py index 350241ea9..1ea455399 100644 --- a/module/plugins/hoster/TusfilesNet.py +++ b/module/plugins/hoster/TusfilesNet.py @@ -19,7 +19,7 @@ class TusfilesNet(XFileSharingPro): FILE_INFO_PATTERN = r'\](?P<N>.+) - (?P<S>[\d.]+) (?P<U>\w+)\[' OFFLINE_PATTERN = r'>File Not Found|<Title>TusFiles - Fast Sharing Files!' - SH_COOKIES = [(".tusfiles.net", "lang", "english")] + COOKIES = [(".tusfiles.net", "lang", "english")] def setup(self): diff --git a/module/plugins/hoster/UploadheroCom.py b/module/plugins/hoster/UploadheroCom.py index e34701ed7..2fad623c1 100644 --- a/module/plugins/hoster/UploadheroCom.py +++ b/module/plugins/hoster/UploadheroCom.py @@ -23,7 +23,7 @@ class UploadheroCom(SimpleHoster): FILE_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.' - SH_COOKIES = [(".uploadhero.co", "lang", "en")] + 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>' diff --git a/module/plugins/hoster/VeohCom.py b/module/plugins/hoster/VeohCom.py index fcd5e90a4..a965e5e77 100644 --- a/module/plugins/hoster/VeohCom.py +++ b/module/plugins/hoster/VeohCom.py @@ -22,7 +22,7 @@ class VeohCom(SimpleHoster): FILE_URL_REPLACEMENTS = [(__pattern__, r'http://www.veoh.com/watch/\g<ID>')] - SH_COOKIES = [(".veoh.com", "lassieLocale", "en")] + COOKIES = [(".veoh.com", "lassieLocale", "en")] def setup(self): diff --git a/module/plugins/hoster/VimeoCom.py b/module/plugins/hoster/VimeoCom.py index 145d9053f..923be59f7 100644 --- a/module/plugins/hoster/VimeoCom.py +++ b/module/plugins/hoster/VimeoCom.py @@ -24,7 +24,7 @@ class VimeoCom(SimpleHoster): FILE_URL_REPLACEMENTS = [(__pattern__, r'https://www.vimeo.com/\g<ID>')] - SH_COOKIES = [(".vimeo.com", "language", "en")] + COOKIES = [(".vimeo.com", "language", "en")] def setup(self): diff --git a/module/plugins/hoster/WrzucTo.py b/module/plugins/hoster/WrzucTo.py index 3b26b1a02..4b63e0964 100644 --- a/module/plugins/hoster/WrzucTo.py +++ b/module/plugins/hoster/WrzucTo.py @@ -21,7 +21,7 @@ class WrzucTo(SimpleHoster): FILE_NAME_PATTERN = r'id="file_info">\s*<strong>(?P<N>.*?)</strong>' FILE_SIZE_PATTERN = r'class="info">\s*<tr>\s*<td>(?P<S>.*?)</td>' - SH_COOKIES = [(".wrzuc.to", "language", "en")] + COOKIES = [(".wrzuc.to", "language", "en")] def setup(self): diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py index 1bee788d5..4724a2980 100644 --- a/module/plugins/hoster/ZippyshareCom.py +++ b/module/plugins/hoster/ZippyshareCom.py @@ -25,7 +25,7 @@ class ZippyshareCom(SimpleHoster): FILE_INFO_PATTERN = r'document\.getElementById\(\'dlbutton\'\)\.href = "[^;]*/(?P<N>[^"]+)";' OFFLINE_PATTERN = r'>File does not exist on this server<' - SH_COOKIES = [(".zippyshare.com", "ziplocale", "en")] + COOKIES = [(".zippyshare.com", "ziplocale", "en")] def setup(self): |