From badcc797c41e9ee8b226ff803e8f22553a70bd10 Mon Sep 17 00:00:00 2001 From: TWD Date: Tue, 16 Jun 2015 12:05:29 +0200 Subject: Update NowDownloadSx.py --- module/plugins/hoster/NowDownloadSx.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'module/plugins/hoster/NowDownloadSx.py') diff --git a/module/plugins/hoster/NowDownloadSx.py b/module/plugins/hoster/NowDownloadSx.py index a1cf9baf7..b23382420 100644 --- a/module/plugins/hoster/NowDownloadSx.py +++ b/module/plugins/hoster/NowDownloadSx.py @@ -9,9 +9,9 @@ from module.utils import fixup class NowDownloadSx(SimpleHoster): __name__ = "NowDownloadSx" __type__ = "hoster" - __version__ = "0.09" + __version__ = "0.10" - __pattern__ = r'http://(?:www\.)?(nowdownload\.[a-zA-Z]{2,}/(dl/|download\.php.+?id=|mobile/(#/files/|.+?id=))|likeupload\.org/)\w+' + __pattern__ = r'http://(?:www\.)?(nowdownload\.([a-zA-Z]{2,})/(dl/|download\.php.+?id=|mobile/(#/files/|.+?id=))|likeupload\.org/)\w+' __config__ = [("use_premium", "bool", "Use premium account if available", True)] __description__ = """NowDownload.sx hoster plugin""" @@ -26,7 +26,7 @@ class NowDownloadSx(SimpleHoster): TOKEN_PATTERN = r'"(/api/token\.php\?token=\w+)"' CONTINUE_PATTERN = r'"(/dl2/\w+/\w+)"' WAIT_PATTERN = r'\.countdown\(\{until: \+(\d+),' - LINK_FREE_PATTERN = r'(http://s\d+\.coolcdn\.info/nowdownload/.+?)["\']' + LINK_FREE_PATTERN = r'(http://s\d+(\.coolcdn\.info|\.mighycdndelivery\.com)/nowdownload/.+?)["\']' NAME_REPLACEMENTS = [("&#?\w+;", fixup), (r'<.*?>', '')] @@ -49,7 +49,12 @@ class NowDownloadSx(SimpleHoster): else: wait = 60 - baseurl = "http://www.nowdownload.at" + foundbu = re.match(self.__pattern__, self.pyfile.url) + if foundbu: + baseurl = "http://www.nowdownload." + foundbu.group(2) + else: + baseurl = "http://www.nowdownload.ch" + self.html = self.load(baseurl + str(tokenlink.group(1))) self.wait(wait) -- cgit v1.2.3 From bbfb147465b17f1add056c074dffa7a73b278075 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 16 Jun 2015 17:56:56 +0200 Subject: [NowDownloadSx] Tiny cleanup --- module/plugins/hoster/NowDownloadSx.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'module/plugins/hoster/NowDownloadSx.py') diff --git a/module/plugins/hoster/NowDownloadSx.py b/module/plugins/hoster/NowDownloadSx.py index b23382420..7be699ae4 100644 --- a/module/plugins/hoster/NowDownloadSx.py +++ b/module/plugins/hoster/NowDownloadSx.py @@ -11,7 +11,7 @@ class NowDownloadSx(SimpleHoster): __type__ = "hoster" __version__ = "0.10" - __pattern__ = r'http://(?:www\.)?(nowdownload\.([a-zA-Z]{2,})/(dl/|download\.php.+?id=|mobile/(#/files/|.+?id=))|likeupload\.org/)\w+' + __pattern__ = r'http://(?:www\.)?(nowdownload\.[a-zA-Z]{2,}/(dl/|download\.php.+?id=|mobile/(#/files/|.+?id=))|likeupload\.org/)\w+' __config__ = [("use_premium", "bool", "Use premium account if available", True)] __description__ = """NowDownload.sx hoster plugin""" @@ -26,7 +26,7 @@ class NowDownloadSx(SimpleHoster): TOKEN_PATTERN = r'"(/api/token\.php\?token=\w+)"' CONTINUE_PATTERN = r'"(/dl2/\w+/\w+)"' WAIT_PATTERN = r'\.countdown\(\{until: \+(\d+),' - LINK_FREE_PATTERN = r'(http://s\d+(\.coolcdn\.info|\.mighycdndelivery\.com)/nowdownload/.+?)["\']' + LINK_FREE_PATTERN = r'(http://s\d+(?:\.coolcdn\.info|\.mighycdndelivery\.com)/nowdownload/.+?)["\']' NAME_REPLACEMENTS = [("&#?\w+;", fixup), (r'<.*?>', '')] @@ -49,12 +49,7 @@ class NowDownloadSx(SimpleHoster): else: wait = 60 - foundbu = re.match(self.__pattern__, self.pyfile.url) - if foundbu: - baseurl = "http://www.nowdownload." + foundbu.group(2) - else: - baseurl = "http://www.nowdownload.ch" - + baseurl = "http://www.nowdownload.ch" self.html = self.load(baseurl + str(tokenlink.group(1))) self.wait(wait) -- cgit v1.2.3 From b1759bc440cd6013837697eb8de540914f693ffd Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 7 Jul 2015 01:23:55 +0200 Subject: No camelCase style anymore --- module/plugins/hoster/NowDownloadSx.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'module/plugins/hoster/NowDownloadSx.py') diff --git a/module/plugins/hoster/NowDownloadSx.py b/module/plugins/hoster/NowDownloadSx.py index 7be699ae4..ef43c7c94 100644 --- a/module/plugins/hoster/NowDownloadSx.py +++ b/module/plugins/hoster/NowDownloadSx.py @@ -9,7 +9,7 @@ from module.utils import fixup class NowDownloadSx(SimpleHoster): __name__ = "NowDownloadSx" __type__ = "hoster" - __version__ = "0.10" + __version__ = "0.11" __pattern__ = r'http://(?:www\.)?(nowdownload\.[a-zA-Z]{2,}/(dl/|download\.php.+?id=|mobile/(#/files/|.+?id=))|likeupload\.org/)\w+' __config__ = [("use_premium", "bool", "Use premium account if available", True)] @@ -32,12 +32,12 @@ class NowDownloadSx(SimpleHoster): def setup(self): - self.resumeDownload = True - self.multiDL = True - self.chunkLimit = -1 + self.resume_download = True + self.multi_dl = True + self.chunk_limit = -1 - def handleFree(self, pyfile): + def handle_free(self, pyfile): tokenlink = re.search(self.TOKEN_PATTERN, self.html) continuelink = re.search(self.CONTINUE_PATTERN, self.html) if tokenlink is None or continuelink is None: -- cgit v1.2.3 From d38e830b7c0b3c6561a0072c74bbccb5fcdf4a61 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 19 Jul 2015 14:43:42 +0200 Subject: New __status__ magic key --- module/plugins/hoster/NowDownloadSx.py | 1 + 1 file changed, 1 insertion(+) (limited to 'module/plugins/hoster/NowDownloadSx.py') diff --git a/module/plugins/hoster/NowDownloadSx.py b/module/plugins/hoster/NowDownloadSx.py index ef43c7c94..379beda7f 100644 --- a/module/plugins/hoster/NowDownloadSx.py +++ b/module/plugins/hoster/NowDownloadSx.py @@ -10,6 +10,7 @@ class NowDownloadSx(SimpleHoster): __name__ = "NowDownloadSx" __type__ = "hoster" __version__ = "0.11" + __status__ = "stable" __pattern__ = r'http://(?:www\.)?(nowdownload\.[a-zA-Z]{2,}/(dl/|download\.php.+?id=|mobile/(#/files/|.+?id=))|likeupload\.org/)\w+' __config__ = [("use_premium", "bool", "Use premium account if available", True)] -- cgit v1.2.3 From 94d017cd2a5c1f194960827a8c7e46afc3682008 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 24 Jul 2015 06:55:49 +0200 Subject: Hotfixes (2) --- module/plugins/hoster/NowDownloadSx.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/hoster/NowDownloadSx.py') diff --git a/module/plugins/hoster/NowDownloadSx.py b/module/plugins/hoster/NowDownloadSx.py index 379beda7f..876a7bcb5 100644 --- a/module/plugins/hoster/NowDownloadSx.py +++ b/module/plugins/hoster/NowDownloadSx.py @@ -10,7 +10,7 @@ class NowDownloadSx(SimpleHoster): __name__ = "NowDownloadSx" __type__ = "hoster" __version__ = "0.11" - __status__ = "stable" + __status__ = "testing" __pattern__ = r'http://(?:www\.)?(nowdownload\.[a-zA-Z]{2,}/(dl/|download\.php.+?id=|mobile/(#/files/|.+?id=))|likeupload\.org/)\w+' __config__ = [("use_premium", "bool", "Use premium account if available", True)] @@ -34,7 +34,7 @@ class NowDownloadSx(SimpleHoster): def setup(self): self.resume_download = True - self.multi_dl = True + self.multiDL = True self.chunk_limit = -1 -- cgit v1.2.3