summaryrefslogtreecommitdiffstats
path: root/module/plugins/hoster
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-06-16 17:09:37 +0200
committerGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-06-16 17:09:37 +0200
commit469cff247e88706037bc51527e744022031d6c85 (patch)
treea293c0640ec84dc6bc3a315b30ffe6e20f653bb8 /module/plugins/hoster
parentMerge pull request #1515 from TWD/patch-4 (diff)
parentUpdate NowDownloadSx.py (diff)
downloadpyload-469cff247e88706037bc51527e744022031d6c85.tar.xz
Merge pull request #1514 from TWD/patch-5
Update NowDownloadSx.py
Diffstat (limited to 'module/plugins/hoster')
-rw-r--r--module/plugins/hoster/NowDownloadSx.py13
1 files changed, 9 insertions, 4 deletions
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)