From 08d629c98d7c0acb24dd03c785f3d64fb98bbdeb Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 5 Jun 2015 16:23:42 +0200 Subject: Fix http://forum.pyload.org/viewtopic.php?f=10&t=4301 --- module/plugins/hoster/UploadedTo.py | 31 +++++-------------------------- 1 file changed, 5 insertions(+), 26 deletions(-) (limited to 'module/plugins/hoster/UploadedTo.py') diff --git a/module/plugins/hoster/UploadedTo.py b/module/plugins/hoster/UploadedTo.py index 16966a23d..68b50561e 100644 --- a/module/plugins/hoster/UploadedTo.py +++ b/module/plugins/hoster/UploadedTo.py @@ -11,7 +11,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class UploadedTo(SimpleHoster): __name__ = "UploadedTo" __type__ = "hoster" - __version__ = "0.89" + __version__ = "0.90" __pattern__ = r'https?://(?:www\.)?(uploaded\.(to|net)|ul\.to)(/file/|/?\?id=|.*?&id=|/)(?P\w+)' __config__ = [("use_premium", "bool", "Use premium account if available", True)] @@ -29,10 +29,7 @@ class UploadedTo(SimpleHoster): TEMP_OFFLINE_PATTERN = r'uploaded\.net - Maintenance' - LINK_PREMIUM_PATTERN = r'<div class="tfree".*\s*<form method="post" action="(.+?)"' - WAIT_PATTERN = r'Current waiting period: <span>(\d+)' - DL_LIMIT_ERROR = r'You have reached the max. number of possible free downloads for this hour' @classmethod @@ -58,7 +55,7 @@ class UploadedTo(SimpleHoster): def setup(self): - self.multiDL = self.resumeDownload = self.premium + self.multiDL = self.resumeDownload = self.premium self.chunkLimit = 1 # critical problems with more chunks @@ -67,27 +64,11 @@ class UploadedTo(SimpleHoster): self.logError(_("Free-download capacities exhausted")) self.retry(24, 5 * 60) - elif "limit-size" in self.html: - self.fail(_("File too big for free download")) - - elif "limit-slot" in self.html: # Temporary restriction so just wait a bit - self.wait(30 * 60, True) - self.retry() - - elif "limit-parallel" in self.html: - self.fail(_("Cannot download in parallel")) + return super(UploadedTo, self).checkErrors() - elif "limit-dl" in self.html or self.DL_LIMIT_ERROR in self.html: # limit-dl - self.wait(3 * 60 * 60, True) - self.retry() - elif '"err":"captcha"' in self.html: - self.invalidCaptcha() - - else: - m = re.search(self.WAIT_PATTERN, self.html) - if m: - self.wait(m.group(1)) + def handlePremium(self, pyfile): + self.link = pyfile.url + "/ddl?pw=" + self.getPassword() def handleFree(self, pyfile): @@ -110,8 +91,6 @@ class UploadedTo(SimpleHoster): except Exception: pass - self.checkErrors() - def checkFile(self, rules={}): if self.checkDownload({'limit-dl': self.DL_LIMIT_ERROR}): -- cgit v1.2.3 From 55f455d1b8e221e5bf0e657f39fdf3cdb0e1341c Mon Sep 17 00:00:00 2001 From: Walter Purcaro <vuolter@users.noreply.github.com> Date: Fri, 5 Jun 2015 16:25:09 +0200 Subject: Fix https://github.com/pyload/pyload/issues/1222 --- module/plugins/hoster/UploadedTo.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'module/plugins/hoster/UploadedTo.py') diff --git a/module/plugins/hoster/UploadedTo.py b/module/plugins/hoster/UploadedTo.py index 68b50561e..80dcc154d 100644 --- a/module/plugins/hoster/UploadedTo.py +++ b/module/plugins/hoster/UploadedTo.py @@ -21,7 +21,8 @@ class UploadedTo(SimpleHoster): __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] - DISPOSITION = False + CHECK_TRAFFIC = True + DISPOSITION = False API_KEY = "lhF2IeeprweDfu9ccWlxXVVypA5nA3EL" -- cgit v1.2.3 From 0bca42bcf5c0ee0f8d4bf1f11e0ec832ab64e326 Mon Sep 17 00:00:00 2001 From: Walter Purcaro <vuolter@users.noreply.github.com> Date: Fri, 5 Jun 2015 16:54:47 +0200 Subject: [UploadedTo] Fixup --- module/plugins/hoster/UploadedTo.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'module/plugins/hoster/UploadedTo.py') diff --git a/module/plugins/hoster/UploadedTo.py b/module/plugins/hoster/UploadedTo.py index 80dcc154d..eb4c8cf04 100644 --- a/module/plugins/hoster/UploadedTo.py +++ b/module/plugins/hoster/UploadedTo.py @@ -2,6 +2,7 @@ import re import time +import urlparse from module.network.RequestFactory import getURL from module.plugins.internal.ReCaptcha import ReCaptcha @@ -11,7 +12,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class UploadedTo(SimpleHoster): __name__ = "UploadedTo" __type__ = "hoster" - __version__ = "0.90" + __version__ = "0.91" __pattern__ = r'https?://(?:www\.)?(uploaded\.(to|net)|ul\.to)(/file/|/?\?id=|.*?&id=|/)(?P<ID>\w+)' __config__ = [("use_premium", "bool", "Use premium account if available", True)] @@ -69,7 +70,7 @@ class UploadedTo(SimpleHoster): def handlePremium(self, pyfile): - self.link = pyfile.url + "/ddl?pw=" + self.getPassword() + self.link = urlparse.urljoin(pyfile.url, "/ddl?pw=" + self.getPassword()) def handleFree(self, pyfile): -- cgit v1.2.3 From a7292e6f59ac0ae8bba5157fc17c97fcb421aced Mon Sep 17 00:00:00 2001 From: Walter Purcaro <vuolter@users.noreply.github.com> Date: Fri, 5 Jun 2015 19:35:27 +0200 Subject: Fix https://github.com/pyload/pyload/issues/1452 --- module/plugins/hoster/UploadedTo.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'module/plugins/hoster/UploadedTo.py') diff --git a/module/plugins/hoster/UploadedTo.py b/module/plugins/hoster/UploadedTo.py index eb4c8cf04..4db160ab4 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.91" + __version__ = "0.92" __pattern__ = r'https?://(?:www\.)?(uploaded\.(to|net)|ul\.to)(/file/|/?\?id=|.*?&id=|/)(?P<ID>\w+)' __config__ = [("use_premium", "bool", "Use premium account if available", True)] @@ -32,6 +32,7 @@ class UploadedTo(SimpleHoster): TEMP_OFFLINE_PATTERN = r'<title>uploaded\.net - Maintenance' WAIT_PATTERN = r'Current waiting period: <span>(\d+)' + DL_LIMIT_ERROR = r'You have reached the max. number of possible free downloads for this hour' @classmethod -- cgit v1.2.3 From afa6e88d46d61de5523a5d00b657d4a7f742a5cc Mon Sep 17 00:00:00 2001 From: Walter Purcaro <vuolter@users.noreply.github.com> Date: Sat, 6 Jun 2015 07:34:41 +0200 Subject: [UploadedTo] Fixup (2) --- module/plugins/hoster/UploadedTo.py | 35 ++++++++--------------------------- 1 file changed, 8 insertions(+), 27 deletions(-) (limited to 'module/plugins/hoster/UploadedTo.py') diff --git a/module/plugins/hoster/UploadedTo.py b/module/plugins/hoster/UploadedTo.py index 4db160ab4..9c13b86dc 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.92" + __version__ = "0.93" __pattern__ = r'https?://(?:www\.)?(uploaded\.(to|net)|ul\.to)(/file/|/?\?id=|.*?&id=|/)(?P<ID>\w+)' __config__ = [("use_premium", "bool", "Use premium account if available", True)] @@ -25,14 +25,15 @@ class UploadedTo(SimpleHoster): CHECK_TRAFFIC = True DISPOSITION = False - API_KEY = "lhF2IeeprweDfu9ccWlxXVVypA5nA3EL" - URL_REPLACEMENTS = [(__pattern__ + ".*", r'http://uploaded.net/file/\g<ID>')] + API_KEY = "lhF2IeeprweDfu9ccWlxXVVypA5nA3EL" + TEMP_OFFLINE_PATTERN = r'<title>uploaded\.net - Maintenance' + LINK_PREMIUM_PATTERN = r'<div class="tfree".*\s*<form method="post" action="(.+?)"' - WAIT_PATTERN = r'Current waiting period: <span>(\d+)' - DL_LIMIT_ERROR = r'You have reached the max. number of possible free downloads for this hour' + WAIT_PATTERN = r'Current waiting period: <span>(\d+)' + DL_LIMIT_PATTERN = r'You have reached the max. number of possible free downloads for this hour' @classmethod @@ -62,18 +63,6 @@ class UploadedTo(SimpleHoster): self.chunkLimit = 1 # critical problems with more chunks - def checkErrors(self): - if 'var free_enabled = false;' in self.html: - self.logError(_("Free-download capacities exhausted")) - self.retry(24, 5 * 60) - - return super(UploadedTo, self).checkErrors() - - - def handlePremium(self, pyfile): - self.link = urlparse.urljoin(pyfile.url, "/ddl?pw=" + self.getPassword()) - - def handleFree(self, pyfile): self.load("http://uploaded.net/language/en", just_header=True) @@ -87,20 +76,12 @@ class UploadedTo(SimpleHoster): 'recaptcha_response_field' : response}) if "type:'download'" in self.html: - self.correctCaptcha() try: - self.link = re.search("url:'(.+?)'", self.html).group(1) - + self.link = re.search("url:\s*'(.+?)'", self.html).group(1) except Exception: pass - - 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(rules) + self.checkErrors() getInfo = create_getInfo(UploadedTo) -- cgit v1.2.3 From d2e46f208737760c65a58bfc21ad8fd0809c0b18 Mon Sep 17 00:00:00 2001 From: Walter Purcaro <vuolter@users.noreply.github.com> Date: Tue, 9 Jun 2015 13:58:27 +0200 Subject: Fix https://github.com/pyload/pyload/issues/1472 --- module/plugins/hoster/UploadedTo.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'module/plugins/hoster/UploadedTo.py') diff --git a/module/plugins/hoster/UploadedTo.py b/module/plugins/hoster/UploadedTo.py index 9c13b86dc..187653c2d 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.93" + __version__ = "0.94" __pattern__ = r'https?://(?:www\.)?(uploaded\.(to|net)|ul\.to)(/file/|/?\?id=|.*?&id=|/)(?P<ID>\w+)' __config__ = [("use_premium", "bool", "Use premium account if available", True)] @@ -29,7 +29,9 @@ class UploadedTo(SimpleHoster): API_KEY = "lhF2IeeprweDfu9ccWlxXVVypA5nA3EL" + OFFLINE_PATTERN = r'>Page not found' TEMP_OFFLINE_PATTERN = r'<title>uploaded\.net - Maintenance' + LINK_PREMIUM_PATTERN = r'<div class="tfree".*\s*<form method="post" action="(.+?)"' WAIT_PATTERN = r'Current waiting period: <span>(\d+)' -- cgit v1.2.3 From 6faa98072d3bae3d3f2cbf5f7dfa2c9de61da87e Mon Sep 17 00:00:00 2001 From: Walter Purcaro <vuolter@users.noreply.github.com> Date: Tue, 9 Jun 2015 14:27:17 +0200 Subject: [SimpleHoster] preload referer to False --- module/plugins/hoster/UploadedTo.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'module/plugins/hoster/UploadedTo.py') diff --git a/module/plugins/hoster/UploadedTo.py b/module/plugins/hoster/UploadedTo.py index 187653c2d..cb8440687 100644 --- a/module/plugins/hoster/UploadedTo.py +++ b/module/plugins/hoster/UploadedTo.py @@ -32,6 +32,7 @@ class UploadedTo(SimpleHoster): OFFLINE_PATTERN = r'>Page not found' TEMP_OFFLINE_PATTERN = r'<title>uploaded\.net - Maintenance' + LINK_FREE_PATTERN = r"url:\s*'(.+?)'" LINK_PREMIUM_PATTERN = r'<div class="tfree".*\s*<form method="post" action="(.+?)"' WAIT_PATTERN = r'Current waiting period: <span>(\d+)' @@ -77,12 +78,7 @@ class UploadedTo(SimpleHoster): post={'recaptcha_challenge_field': challenge, 'recaptcha_response_field' : response}) - if "type:'download'" in self.html: - try: - self.link = re.search("url:\s*'(.+?)'", self.html).group(1) - except Exception: - pass - + super(UploadedTo, self).handleFree(pyfile) self.checkErrors() -- cgit v1.2.3 From c1764e2fea0bb05164c83a876e8cd58b97f58f25 Mon Sep 17 00:00:00 2001 From: Walter Purcaro <vuolter@users.noreply.github.com> Date: Tue, 16 Jun 2015 17:31:38 +0200 Subject: Update all --- module/plugins/hoster/UploadedTo.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'module/plugins/hoster/UploadedTo.py') diff --git a/module/plugins/hoster/UploadedTo.py b/module/plugins/hoster/UploadedTo.py index cb8440687..46ed863d9 100644 --- a/module/plugins/hoster/UploadedTo.py +++ b/module/plugins/hoster/UploadedTo.py @@ -45,8 +45,7 @@ class UploadedTo(SimpleHoster): for _i in xrange(5): html = getURL("http://uploaded.net/api/filemultiple", - get={"apikey": cls.API_KEY, 'id_0': re.match(cls.__pattern__, url).group('ID')}, - decode=True) + get={"apikey": cls.API_KEY, 'id_0': re.match(cls.__pattern__, url).group('ID')}) if html != "can't find request": api = html.split(",", 4) @@ -69,7 +68,7 @@ class UploadedTo(SimpleHoster): def handleFree(self, pyfile): self.load("http://uploaded.net/language/en", just_header=True) - self.html = self.load("http://uploaded.net/js/download.js", decode=True) + self.html = self.load("http://uploaded.net/js/download.js") recaptcha = ReCaptcha(self) response, challenge = recaptcha.challenge() -- cgit v1.2.3 From 20b6a2ec022202b0efb6cb69415239fb8f4d1445 Mon Sep 17 00:00:00 2001 From: Walter Purcaro <vuolter@users.noreply.github.com> Date: Wed, 17 Jun 2015 18:59:20 +0200 Subject: Spare code cosmetics (2) --- module/plugins/hoster/UploadedTo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hoster/UploadedTo.py') diff --git a/module/plugins/hoster/UploadedTo.py b/module/plugins/hoster/UploadedTo.py index 46ed863d9..b88ac5f0b 100644 --- a/module/plugins/hoster/UploadedTo.py +++ b/module/plugins/hoster/UploadedTo.py @@ -62,7 +62,7 @@ class UploadedTo(SimpleHoster): def setup(self): self.multiDL = self.resumeDownload = self.premium - self.chunkLimit = 1 # critical problems with more chunks + self.chunkLimit = 1 #: critical problems with more chunks def handleFree(self, pyfile): -- cgit v1.2.3 From b1759bc440cd6013837697eb8de540914f693ffd Mon Sep 17 00:00:00 2001 From: Walter Purcaro <vuolter@users.noreply.github.com> Date: Tue, 7 Jul 2015 01:23:55 +0200 Subject: No camelCase style anymore --- module/plugins/hoster/UploadedTo.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'module/plugins/hoster/UploadedTo.py') diff --git a/module/plugins/hoster/UploadedTo.py b/module/plugins/hoster/UploadedTo.py index b88ac5f0b..32b54d1ae 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.94" + __version__ = "0.95" __pattern__ = r'https?://(?:www\.)?(uploaded\.(to|net)|ul\.to)(/file/|/?\?id=|.*?&id=|/)(?P<ID>\w+)' __config__ = [("use_premium", "bool", "Use premium account if available", True)] @@ -40,8 +40,8 @@ class UploadedTo(SimpleHoster): @classmethod - def apiInfo(cls, url): - info = super(UploadedTo, cls).apiInfo(url) + def api_info(cls, url): + info = super(UploadedTo, cls).api_info(url) for _i in xrange(5): html = getURL("http://uploaded.net/api/filemultiple", @@ -61,11 +61,11 @@ class UploadedTo(SimpleHoster): def setup(self): - self.multiDL = self.resumeDownload = self.premium - self.chunkLimit = 1 #: critical problems with more chunks + self.multi_dl = self.resume_download = self.premium + self.chunk_limit = 1 #: critical problems with more chunks - def handleFree(self, pyfile): + def handle_free(self, pyfile): self.load("http://uploaded.net/language/en", just_header=True) self.html = self.load("http://uploaded.net/js/download.js") @@ -77,8 +77,8 @@ class UploadedTo(SimpleHoster): post={'recaptcha_challenge_field': challenge, 'recaptcha_response_field' : response}) - super(UploadedTo, self).handleFree(pyfile) - self.checkErrors() + super(UploadedTo, self).handle_free(pyfile) + self.check_errors() getInfo = create_getInfo(UploadedTo) -- cgit v1.2.3 From 9e5d813d7721e351ac02ba72bdc473a7d77ba6b7 Mon Sep 17 00:00:00 2001 From: Walter Purcaro <vuolter@users.noreply.github.com> Date: Sat, 18 Jul 2015 20:04:36 +0200 Subject: Code cosmetics --- module/plugins/hoster/UploadedTo.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/hoster/UploadedTo.py') diff --git a/module/plugins/hoster/UploadedTo.py b/module/plugins/hoster/UploadedTo.py index 32b54d1ae..e8c317296 100644 --- a/module/plugins/hoster/UploadedTo.py +++ b/module/plugins/hoster/UploadedTo.py @@ -4,7 +4,7 @@ import re import time import urlparse -from module.network.RequestFactory import getURL +from module.network.RequestFactory import getURL as get_url from module.plugins.internal.ReCaptcha import ReCaptcha from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo @@ -44,7 +44,7 @@ class UploadedTo(SimpleHoster): info = super(UploadedTo, cls).api_info(url) for _i in xrange(5): - html = getURL("http://uploaded.net/api/filemultiple", + html = get_url("http://uploaded.net/api/filemultiple", get={"apikey": cls.API_KEY, 'id_0': re.match(cls.__pattern__, url).group('ID')}) if html != "can't find request": -- cgit v1.2.3 From dad722ac7255640e7e0541c4094a4d2e4de79cd3 Mon Sep 17 00:00:00 2001 From: Walter Purcaro <vuolter@users.noreply.github.com> Date: Sun, 19 Jul 2015 00:05:58 +0200 Subject: Code cosmetics (2) --- module/plugins/hoster/UploadedTo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hoster/UploadedTo.py') diff --git a/module/plugins/hoster/UploadedTo.py b/module/plugins/hoster/UploadedTo.py index e8c317296..d04664a8f 100644 --- a/module/plugins/hoster/UploadedTo.py +++ b/module/plugins/hoster/UploadedTo.py @@ -62,7 +62,7 @@ class UploadedTo(SimpleHoster): def setup(self): self.multi_dl = self.resume_download = self.premium - self.chunk_limit = 1 #: critical problems with more chunks + self.chunk_limit = 1 #: Critical problems with more chunks def handle_free(self, pyfile): -- cgit v1.2.3 From ff9383bfe06d14d23bc0ed6af79aa8967965d078 Mon Sep 17 00:00:00 2001 From: Walter Purcaro <vuolter@users.noreply.github.com> Date: Sun, 19 Jul 2015 10:59:52 +0200 Subject: Code cosmetics (3) --- module/plugins/hoster/UploadedTo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hoster/UploadedTo.py') diff --git a/module/plugins/hoster/UploadedTo.py b/module/plugins/hoster/UploadedTo.py index d04664a8f..be139f354 100644 --- a/module/plugins/hoster/UploadedTo.py +++ b/module/plugins/hoster/UploadedTo.py @@ -45,7 +45,7 @@ class UploadedTo(SimpleHoster): for _i in xrange(5): html = get_url("http://uploaded.net/api/filemultiple", - get={"apikey": cls.API_KEY, 'id_0': re.match(cls.__pattern__, url).group('ID')}) + get={'apikey': cls.API_KEY, 'id_0': re.match(cls.__pattern__, url).group('ID')}) if html != "can't find request": api = html.split(",", 4) -- cgit v1.2.3 From 33e2b36605e41962a2e8eee304a7f3d29690ffa8 Mon Sep 17 00:00:00 2001 From: Walter Purcaro <vuolter@users.noreply.github.com> Date: Sun, 19 Jul 2015 13:42:29 +0200 Subject: [OCR] Fix __init__ (2) --- module/plugins/hoster/UploadedTo.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'module/plugins/hoster/UploadedTo.py') diff --git a/module/plugins/hoster/UploadedTo.py b/module/plugins/hoster/UploadedTo.py index be139f354..4023a0e66 100644 --- a/module/plugins/hoster/UploadedTo.py +++ b/module/plugins/hoster/UploadedTo.py @@ -45,7 +45,8 @@ class UploadedTo(SimpleHoster): for _i in xrange(5): html = get_url("http://uploaded.net/api/filemultiple", - get={'apikey': cls.API_KEY, 'id_0': re.match(cls.__pattern__, url).group('ID')}) + get={'apikey': cls.API_KEY, + 'id_0': re.match(cls.__pattern__, url).group('ID')}) if html != "can't find request": api = html.split(",", 4) -- cgit v1.2.3 From d38e830b7c0b3c6561a0072c74bbccb5fcdf4a61 Mon Sep 17 00:00:00 2001 From: Walter Purcaro <vuolter@users.noreply.github.com> Date: Sun, 19 Jul 2015 14:43:42 +0200 Subject: New __status__ magic key --- module/plugins/hoster/UploadedTo.py | 1 + 1 file changed, 1 insertion(+) (limited to 'module/plugins/hoster/UploadedTo.py') diff --git a/module/plugins/hoster/UploadedTo.py b/module/plugins/hoster/UploadedTo.py index 4023a0e66..c5f3cd8ad 100644 --- a/module/plugins/hoster/UploadedTo.py +++ b/module/plugins/hoster/UploadedTo.py @@ -13,6 +13,7 @@ class UploadedTo(SimpleHoster): __name__ = "UploadedTo" __type__ = "hoster" __version__ = "0.95" + __status__ = "stable" __pattern__ = r'https?://(?:www\.)?(uploaded\.(to|net)|ul\.to)(/file/|/?\?id=|.*?&id=|/)(?P<ID>\w+)' __config__ = [("use_premium", "bool", "Use premium account if available", True)] -- cgit v1.2.3 From 6af9b38a8d5d49355b85aef6ddd003605d6bba05 Mon Sep 17 00:00:00 2001 From: Walter Purcaro <vuolter@users.noreply.github.com> Date: Thu, 23 Jul 2015 23:44:45 +0200 Subject: Improve Captcha --- module/plugins/hoster/UploadedTo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hoster/UploadedTo.py') diff --git a/module/plugins/hoster/UploadedTo.py b/module/plugins/hoster/UploadedTo.py index c5f3cd8ad..f77c6a483 100644 --- a/module/plugins/hoster/UploadedTo.py +++ b/module/plugins/hoster/UploadedTo.py @@ -5,7 +5,7 @@ import time import urlparse from module.network.RequestFactory import getURL as get_url -from module.plugins.internal.ReCaptcha import ReCaptcha +from module.plugins.captcha.ReCaptcha import ReCaptcha from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo -- cgit v1.2.3 From 94d017cd2a5c1f194960827a8c7e46afc3682008 Mon Sep 17 00:00:00 2001 From: Walter Purcaro <vuolter@users.noreply.github.com> Date: Fri, 24 Jul 2015 06:55:49 +0200 Subject: Hotfixes (2) --- module/plugins/hoster/UploadedTo.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/hoster/UploadedTo.py') diff --git a/module/plugins/hoster/UploadedTo.py b/module/plugins/hoster/UploadedTo.py index f77c6a483..b1d570328 100644 --- a/module/plugins/hoster/UploadedTo.py +++ b/module/plugins/hoster/UploadedTo.py @@ -13,7 +13,7 @@ class UploadedTo(SimpleHoster): __name__ = "UploadedTo" __type__ = "hoster" __version__ = "0.95" - __status__ = "stable" + __status__ = "testing" __pattern__ = r'https?://(?:www\.)?(uploaded\.(to|net)|ul\.to)(/file/|/?\?id=|.*?&id=|/)(?P<ID>\w+)' __config__ = [("use_premium", "bool", "Use premium account if available", True)] @@ -63,7 +63,7 @@ class UploadedTo(SimpleHoster): def setup(self): - self.multi_dl = self.resume_download = self.premium + self.multiDL = self.resume_download = self.premium self.chunk_limit = 1 #: Critical problems with more chunks -- cgit v1.2.3 From 9e44724d6dda3e1f47cf4d6de4b3e521a244ba4b Mon Sep 17 00:00:00 2001 From: Walter Purcaro <vuolter@users.noreply.github.com> Date: Tue, 28 Jul 2015 19:15:28 +0200 Subject: Fix content-disposition --- module/plugins/hoster/UploadedTo.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'module/plugins/hoster/UploadedTo.py') diff --git a/module/plugins/hoster/UploadedTo.py b/module/plugins/hoster/UploadedTo.py index b1d570328..c90f2bb0f 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.95" + __version__ = "0.96" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?(uploaded\.(to|net)|ul\.to)(/file/|/?\?id=|.*?&id=|/)(?P<ID>\w+)' @@ -24,7 +24,6 @@ class UploadedTo(SimpleHoster): CHECK_TRAFFIC = True - DISPOSITION = False URL_REPLACEMENTS = [(__pattern__ + ".*", r'http://uploaded.net/file/\g<ID>')] -- cgit v1.2.3