diff options
Diffstat (limited to 'module/plugins/hoster')
| -rw-r--r-- | module/plugins/hoster/AlldebridCom.py | 6 | ||||
| -rw-r--r-- | module/plugins/hoster/CzshareCom.py | 6 | ||||
| -rw-r--r-- | module/plugins/hoster/EuroshareEu.py | 6 | ||||
| -rw-r--r-- | module/plugins/hoster/FastixRu.py | 6 | ||||
| -rw-r--r-- | module/plugins/hoster/FastshareCz.py | 6 | ||||
| -rw-r--r-- | module/plugins/hoster/FilefactoryCom.py | 6 | ||||
| -rw-r--r-- | module/plugins/hoster/OverLoadMe.py | 6 | ||||
| -rw-r--r-- | module/plugins/hoster/PremiumTo.py | 6 | ||||
| -rw-r--r-- | module/plugins/hoster/RealdebridCom.py | 6 | ||||
| -rw-r--r-- | module/plugins/hoster/ShareonlineBiz.py | 6 | ||||
| -rw-r--r-- | module/plugins/hoster/SimplydebridCom.py | 6 | ||||
| -rw-r--r-- | module/plugins/hoster/SmoozedCom.py | 6 | ||||
| -rw-r--r-- | module/plugins/hoster/UnrestrictLi.py | 6 | ||||
| -rw-r--r-- | module/plugins/hoster/UploadableCh.py | 6 | ||||
| -rw-r--r-- | module/plugins/hoster/UploadedTo.py | 6 | ||||
| -rw-r--r-- | module/plugins/hoster/UploadheroCom.py | 10 | ||||
| -rw-r--r-- | module/plugins/hoster/ZeveraCom.py | 6 | 
17 files changed, 53 insertions, 53 deletions
| diff --git a/module/plugins/hoster/AlldebridCom.py b/module/plugins/hoster/AlldebridCom.py index 90590adac..0a35ae2be 100644 --- a/module/plugins/hoster/AlldebridCom.py +++ b/module/plugins/hoster/AlldebridCom.py @@ -13,7 +13,7 @@ from module.utils import parseFileSize  class AlldebridCom(MultiHoster):      __name__    = "AlldebridCom"      __type__    = "hoster" -    __version__ = "0.44" +    __version__ = "0.45"      __pattern__ = r'https?://(?:www\.|s\d+\.)?alldebrid\.com/dl/[\w^_]+' @@ -68,11 +68,11 @@ class AlldebridCom(MultiHoster):              pyfile.name = self.getFilename(self.link) -    def checkFile(self): +    def checkFile(self, rules={}):          if self.checkDownload({'error': "<title>An error occured while processing your request</title>"}) == "error":              self.retry(wait_time=60, reason=_("An error occured while generating link")) -        return super(AlldebridCom, self).checkFile() +        return super(AlldebridCom, self).checkFile(rules)  getInfo = create_getInfo(AlldebridCom) diff --git a/module/plugins/hoster/CzshareCom.py b/module/plugins/hoster/CzshareCom.py index d055f49ba..34f52c05c 100644 --- a/module/plugins/hoster/CzshareCom.py +++ b/module/plugins/hoster/CzshareCom.py @@ -12,7 +12,7 @@ from module.utils import parseFileSize  class CzshareCom(SimpleHoster):      __name__    = "CzshareCom"      __type__    = "hoster" -    __version__ = "0.98" +    __version__ = "0.99"      __pattern__ = r'http://(?:www\.)?(czshare|sdilej)\.(com|cz)/(\d+/|download\.php\?).+' @@ -133,7 +133,7 @@ class CzshareCom(SimpleHoster):          self.wait() -    def checkFile(self): +    def checkFile(self, rules={}):          # check download          check = self.checkDownload({              "temp offline" : re.compile(r"^Soubor je do.*asn.* nedostupn.*$"), @@ -155,7 +155,7 @@ class CzshareCom(SimpleHoster):              self.invalidCaptcha()              self.retry() -        return super(CzshareCom, self).checkFile() +        return super(CzshareCom, self).checkFile(rules)  getInfo = create_getInfo(CzshareCom) diff --git a/module/plugins/hoster/EuroshareEu.py b/module/plugins/hoster/EuroshareEu.py index b4c9ace6a..9b71ddfc1 100644 --- a/module/plugins/hoster/EuroshareEu.py +++ b/module/plugins/hoster/EuroshareEu.py @@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo  class EuroshareEu(SimpleHoster):      __name__    = "EuroshareEu"      __type__    = "hoster" -    __version__ = "0.27" +    __version__ = "0.28"      __pattern__ = r'http://(?:www\.)?euroshare\.(eu|sk|cz|hu|pl)/file/.+' @@ -57,11 +57,11 @@ class EuroshareEu(SimpleHoster):          self.link = "http://euroshare.eu%s" % m.group(1) -    def checkFile(self): +    def checkFile(self, rules={}):          if self.checkDownload({"multi-dl": re.compile(self.ERR_PARDL_PATTERN)})              self.longWait(5 * 60, 12) -        return super(EuroshareEu, self).checkFile() +        return super(EuroshareEu, self).checkFile(rules)  getInfo = create_getInfo(EuroshareEu) diff --git a/module/plugins/hoster/FastixRu.py b/module/plugins/hoster/FastixRu.py index d534101d8..759b9bfec 100644 --- a/module/plugins/hoster/FastixRu.py +++ b/module/plugins/hoster/FastixRu.py @@ -12,7 +12,7 @@ from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo  class FastixRu(MultiHoster):      __name__    = "FastixRu"      __type__    = "hoster" -    __version__ = "0.09" +    __version__ = "0.10"      __pattern__ = r'http://(?:www\.)?fastix\.(ru|it)/file/\w{24}' @@ -56,11 +56,11 @@ class FastixRu(MultiHoster):              pyfile.name = self.getFilename(self.link) -    def checkFile(self): +    def checkFile(self, rules={}):          if self.checkDownload({"error": "<title>An error occurred while processing your request</title>"}):              self.retry(wait_time=60, reason=_("An error occurred while generating link")) -        return super(FastixRu, self).checkFile() +        return super(FastixRu, self).checkFile(rules)  getInfo = create_getInfo(FastixRu) diff --git a/module/plugins/hoster/FastshareCz.py b/module/plugins/hoster/FastshareCz.py index 6fe871ad4..626521ed2 100644 --- a/module/plugins/hoster/FastshareCz.py +++ b/module/plugins/hoster/FastshareCz.py @@ -10,7 +10,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo  class FastshareCz(SimpleHoster):      __name__    = "FastshareCz"      __type__    = "hoster" -    __version__ = "0.27" +    __version__ = "0.28"      __pattern__ = r'http://(?:www\.)?fastshare\.cz/\d+/.+' @@ -57,7 +57,7 @@ class FastshareCz(SimpleHoster):          self.download(urljoin(baseurl, action), post={'code': captcha, 'btn.x': 77, 'btn.y': 18}) -    def checkFile(self): +    def checkFile(self, rules={}):          check = self.checkDownload({              'paralell-dl'  : re.compile(r"<title>FastShare.cz</title>|<script>alert\('Pres FREE muzete stahovat jen jeden soubor najednou.'\)"),              'wrong captcha': re.compile(r'Download for FREE'), @@ -73,7 +73,7 @@ class FastshareCz(SimpleHoster):          elif check == "credit":              self.resetAccount() -        return super(FastshareCz, self).checkFile() +        return super(FastshareCz, self).checkFile(rules)  getInfo = create_getInfo(FastshareCz) diff --git a/module/plugins/hoster/FilefactoryCom.py b/module/plugins/hoster/FilefactoryCom.py index 4980ebe39..c71a7d1fb 100644 --- a/module/plugins/hoster/FilefactoryCom.py +++ b/module/plugins/hoster/FilefactoryCom.py @@ -21,7 +21,7 @@ def getInfo(urls):  class FilefactoryCom(SimpleHoster):      __name__    = "FilefactoryCom"      __type__    = "hoster" -    __version__ = "0.53" +    __version__ = "0.54"      __pattern__ = r'https?://(?:www\.)?filefactory\.com/(file|trafficshare/\w+)/\w+' @@ -59,7 +59,7 @@ class FilefactoryCom(SimpleHoster):              self.wait(m.group(1)) -    def checkFile(self): +    def checkFile(self, rules={}):          check = self.checkDownload({'multiple': "You are currently downloading too many files at once.",                                      'error'   : '<div id="errorMessage">'}) @@ -70,7 +70,7 @@ class FilefactoryCom(SimpleHoster):          elif check == "error":              self.error(_("Unknown error")) -        return super(FilefactoryCom, self).checkFile() +        return super(FilefactoryCom, self).checkFile(rules)      def handlePremium(self, pyfile): diff --git a/module/plugins/hoster/OverLoadMe.py b/module/plugins/hoster/OverLoadMe.py index e92d927f3..7b444c3ca 100644 --- a/module/plugins/hoster/OverLoadMe.py +++ b/module/plugins/hoster/OverLoadMe.py @@ -13,7 +13,7 @@ from module.utils import parseFileSize  class OverLoadMe(MultiHoster):      __name__    = "OverLoadMe"      __type__    = "hoster" -    __version__ = "0.09" +    __version__ = "0.10"      __pattern__ = r'https?://.*overload\.me/.+' @@ -65,12 +65,12 @@ class OverLoadMe(MultiHoster):              pyfile.name = self.getFilename(self.link) -    def checkFile(self): +    def checkFile(self, rules={}):          if self.checkDownload({"error": "<title>An error occured while processing your request</title>"})              # usual this download can safely be retried              self.retry(wait_time=60, reason=_("An error occured while generating link.")) -        return super(OverLoadMe, self).checkFile() +        return super(OverLoadMe, self).checkFile(rules)  getInfo = create_getInfo(OverLoadMe) diff --git a/module/plugins/hoster/PremiumTo.py b/module/plugins/hoster/PremiumTo.py index b66b9a505..164530e57 100644 --- a/module/plugins/hoster/PremiumTo.py +++ b/module/plugins/hoster/PremiumTo.py @@ -11,7 +11,7 @@ from module.utils import fs_encode  class PremiumTo(MultiHoster):      __name__    = "PremiumTo"      __type__    = "hoster" -    __version__ = "0.21" +    __version__ = "0.22"      __pattern__ = r'^unmatchable$' @@ -34,7 +34,7 @@ class PremiumTo(MultiHoster):                        disposition=True) -    def checkFile(self): +    def checkFile(self, rules={}):          if self.checkDownload({'nopremium': "No premium account available"}):              self.retry(60, 5 * 60, "No premium account available") @@ -49,7 +49,7 @@ class PremiumTo(MultiHoster):          if err:              self.fail(err) -        return super(PremiumTo, self).checkFile() +        return super(PremiumTo, self).checkFile(rules)  getInfo = create_getInfo(PremiumTo) diff --git a/module/plugins/hoster/RealdebridCom.py b/module/plugins/hoster/RealdebridCom.py index 14c46f522..ba76cfe9d 100644 --- a/module/plugins/hoster/RealdebridCom.py +++ b/module/plugins/hoster/RealdebridCom.py @@ -14,7 +14,7 @@ from module.utils import parseFileSize  class RealdebridCom(MultiHoster):      __name__    = "RealdebridCom"      __type__    = "hoster" -    __version__ = "0.64" +    __version__ = "0.65"      __pattern__ = r'https?://((?:www\.|s\d+\.)?real-debrid\.com/dl/|[\w^_]\.rdb\.so/d/)[\w^_]+' @@ -68,12 +68,12 @@ class RealdebridCom(MultiHoster):              pyfile.name = self.getFilename(self.link) -    def checkFile(self): +    def checkFile(self, rules={}):          if self.checkDownload({"error": "<title>An error occured while processing your request</title>"}):              #usual this download can safely be retried              self.retry(wait_time=60, reason=_("An error occured while generating link")) -        return super(RealdebridCom, self).checkFile() +        return super(RealdebridCom, self).checkFile(rules)  getInfo = create_getInfo(RealdebridCom) diff --git a/module/plugins/hoster/ShareonlineBiz.py b/module/plugins/hoster/ShareonlineBiz.py index e00bf5ada..546cd2f42 100644 --- a/module/plugins/hoster/ShareonlineBiz.py +++ b/module/plugins/hoster/ShareonlineBiz.py @@ -14,7 +14,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo  class ShareonlineBiz(SimpleHoster):      __name__    = "ShareonlineBiz"      __type__    = "hoster" -    __version__ = "0.48" +    __version__ = "0.49"      __pattern__ = r'https?://(?:www\.)?(share-online\.biz|egoshare\.com)/(download\.php\?id=|dl/)(?P<ID>\w+)' @@ -108,7 +108,7 @@ class ShareonlineBiz(SimpleHoster):          self.download(download_url) -    def checkFile(self): +    def checkFile(self, rules={}):          check = self.checkDownload({'cookie': re.compile(r'<div id="dl_failure"'),                                      'fail'  : re.compile(r"<title>Share-Online")}) @@ -120,7 +120,7 @@ class ShareonlineBiz(SimpleHoster):              self.invalidCaptcha()              self.retry(5, 5 * 60, _("Download failed")) -        return super(ShareonlineBiz, self).checkFile() +        return super(ShareonlineBiz, self).checkFile(rules)      def handlePremium(self, pyfile):  #: should be working better loading (account) api internally diff --git a/module/plugins/hoster/SimplydebridCom.py b/module/plugins/hoster/SimplydebridCom.py index 24811d6aa..7079b7fbb 100644 --- a/module/plugins/hoster/SimplydebridCom.py +++ b/module/plugins/hoster/SimplydebridCom.py @@ -8,7 +8,7 @@ from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo, rep  class SimplydebridCom(MultiHoster):      __name__    = "SimplydebridCom"      __type__    = "hoster" -    __version__ = "0.15" +    __version__ = "0.16"      __pattern__ = r'http://\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/sd\.php' @@ -38,11 +38,11 @@ class SimplydebridCom(MultiHoster):          self.wait(5) -    def checkFile(self): +    def checkFile(self, rules={}):          if self.checkDownload({"error": "No address associated with hostname"}):              self.retry(24, 3 * 60, _("Bad file downloaded")) -        return super(SimplydebridCom, self).checkFile() +        return super(SimplydebridCom, self).checkFile(rules)  getInfo = create_getInfo(SimplydebridCom) diff --git a/module/plugins/hoster/SmoozedCom.py b/module/plugins/hoster/SmoozedCom.py index bd653ff59..fdb764151 100644 --- a/module/plugins/hoster/SmoozedCom.py +++ b/module/plugins/hoster/SmoozedCom.py @@ -7,7 +7,7 @@ from module.plugins.internal.MultiHoster import MultiHoster  class SmoozedCom(MultiHoster):      __name__    = "SmoozedCom"      __type__    = "hoster" -    __version__ = "0.03" +    __version__ = "0.04"      __pattern__ = r'^unmatchable$'  #: Since we want to allow the user to specify the list of hoster to use we let MultiHoster.coreReady @@ -55,9 +55,9 @@ class SmoozedCom(MultiHoster):              self.link = header["location"][-1] if isinstance(header["location"], list) else header["location"] -    def checkFile(self): +    def checkFile(self, rules={}):          if self.checkDownload({'error': '{"state":"error"}',                                 'retry': '{"state":"retry"}'}):              self.fail(_("Error response received")) -        return super(SmoozedCom, self).checkFile() +        return super(SmoozedCom, self).checkFile(rules) diff --git a/module/plugins/hoster/UnrestrictLi.py b/module/plugins/hoster/UnrestrictLi.py index 0a5c2081f..8205ba0d3 100644 --- a/module/plugins/hoster/UnrestrictLi.py +++ b/module/plugins/hoster/UnrestrictLi.py @@ -10,7 +10,7 @@ from module.plugins.internal.SimpleHoster import secondsToMidnight  class UnrestrictLi(MultiHoster):      __name__    = "UnrestrictLi"      __type__    = "hoster" -    __version__ = "0.21" +    __version__ = "0.22"      __pattern__ = r'https?://(?:www\.)?(unrestrict|unr)\.li/dl/[\w^_]+' @@ -67,8 +67,8 @@ class UnrestrictLi(MultiHoster):              self.setNameSize() -    def checkFile(self): -        super(UnrestrictLi, self).checkFile() +    def checkFile(self, rules={}): +        super(UnrestrictLi, self).checkFile(rules)          if self.getConfig('history'):              self.load("https://unrestrict.li/history/", get={'delete': "all"}) diff --git a/module/plugins/hoster/UploadableCh.py b/module/plugins/hoster/UploadableCh.py index d09b99d92..46b68c5fc 100644 --- a/module/plugins/hoster/UploadableCh.py +++ b/module/plugins/hoster/UploadableCh.py @@ -11,7 +11,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo  class UploadableCh(SimpleHoster):      __name__    = "UploadableCh"      __type__    = "hoster" -    __version__ = "0.08" +    __version__ = "0.09"      __pattern__ = r'http://(?:www\.)?uploadable\.ch/file/(?P<ID>\w+)' @@ -66,13 +66,13 @@ class UploadableCh(SimpleHoster):          self.download(pyfile.url, post={'download': "normal"}, disposition=True) -    def checkFile(self): +    def checkFile(self, rules={}):          if self.checkDownload({'wait': re.compile("Please wait for")}):              self.logInfo("Downloadlimit reached, please wait or reconnect")              self.wait(60 * 60, True)              self.retry() -        return super(UploadableCh, self).checkFile() +        return super(UploadableCh, self).checkFile(rules)  getInfo = create_getInfo(UploadableCh) diff --git a/module/plugins/hoster/UploadedTo.py b/module/plugins/hoster/UploadedTo.py index 83a16c251..6161863b2 100644 --- a/module/plugins/hoster/UploadedTo.py +++ b/module/plugins/hoster/UploadedTo.py @@ -12,7 +12,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo  class UploadedTo(SimpleHoster):      __name__    = "UploadedTo"      __type__    = "hoster" -    __version__ = "0.84" +    __version__ = "0.85"      __pattern__ = r'https?://(?:www\.)?(uploaded\.(to|net)|ul\.to)(/file/|/?\?id=|.*?&id=|/)(?P<ID>\w+)' @@ -109,12 +109,12 @@ class UploadedTo(SimpleHoster):          self.checkErrors() -    def checkFile(self): +    def checkFile(self, rules={}):          if self.checkDownload({'limit-dl': self.DL_LIMIT_ERROR}):              self.wait(3 * 60 * 60, True)              self.retry() -        return super(UploadedTo, self).checkFile() +        return super(UploadedTo, self).checkFile(rules)  getInfo = create_getInfo(UploadedTo) 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 diff --git a/module/plugins/hoster/ZeveraCom.py b/module/plugins/hoster/ZeveraCom.py index 665b64789..79505601d 100644 --- a/module/plugins/hoster/ZeveraCom.py +++ b/module/plugins/hoster/ZeveraCom.py @@ -10,7 +10,7 @@ from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo  class ZeveraCom(MultiHoster):      __name__    = "ZeveraCom"      __type__    = "hoster" -    __version__ = "0.28" +    __version__ = "0.29"      __pattern__ = r'https?://(?:www\.)zevera\.com/(getFiles\.ashx|Members/download\.ashx)\?.*ourl=.+' @@ -24,11 +24,11 @@ class ZeveraCom(MultiHoster):          self.link = "https://%s/getFiles.ashx?ourl=%s" % (self.account.HOSTER_DOMAIN, pyfile.url) -    def checkFile(self): +    def checkFile(self, rules={}):          if self.checkDownload({"error": 'action="ErrorDownload.aspx'}):              self.fail(_("Error response received")) -        return super(ZeveraCom, self).checkFile() +        return super(ZeveraCom, self).checkFile(rules)  getInfo = create_getInfo(ZeveraCom) | 
