2 files changed, 43 insertions, 5 deletions
diff --git a/module/plugins/hoster/NowDownloadEu.py b/module/plugins/hoster/NowDownloadEu.py
index b2c98dc40..dcf13e678 100644
--- a/module/plugins/hoster/NowDownloadEu.py
+++ b/module/plugins/hoster/NowDownloadEu.py
@@ -11,21 +11,21 @@ class NowDownloadEu(SimpleHoster):
     __type__ = "hoster"
     __version__ = "0.05"
 
-    __pattern__ = r'http://(?:www\.)?nowdownload\.(ch|co|eu|sx)/(dl/|download\.php\?id=)(?P<ID>\w+)'
+    __pattern__ = r'http://(?:www\.)?nowdownload\.(at|ch|co|eu|sx)/(dl/|download\.php\?id=)\w+'
 
-    __description__ = """NowDownload.ch hoster plugin"""
+    __description__ = """NowDownload.at hoster plugin"""
     __license__ = "GPLv3"
     __authors__ = [("godofdream", "soilfiction@gmail.com"),
                    ("Walter Purcaro", "vuolter@gmail.com")]
 
 
     FILE_INFO_PATTERN = r'Downloading</span> <br> (?P<N>.*) (?P<S>[\d.,]+) (?P<U>[\w^_]+) </h4>'
-    OFFLINE_PATTERN = r'(This file does not exist!)'
+    OFFLINE_PATTERN = r'>This file does not exist'
 
     TOKEN_PATTERN = r'"(/api/token\.php\?token=\w+)"'
     CONTINUE_PATTERN = r'"(/dl2/\w+/\w+)"'
     WAIT_PATTERN = r'\.countdown\(\{until: \+(\d+),'
-    LINK_PATTERN = r'"(http://f\d+\.nowdownload\.ch/dl/\w+/\w+)'
+    LINK_PATTERN = r'"(http://f\d+\.nowdownload\.at/dl/\w+/\w+)'
 
     FILE_NAME_REPLACEMENTS = [("&#?\w+;", fixup), (r'<[^>]*>', '')]
 
@@ -46,7 +46,7 @@ class NowDownloadEu(SimpleHoster):
         else:
             wait = 60
 
-        baseurl = "http://www.nowdownload.ch"
+        baseurl = "http://www.nowdownload.at"
         self.html = self.load(baseurl + str(tokenlink.group(1)))
         self.wait(wait)
 
diff --git a/module/plugins/hoster/NowVideoAt.py b/module/plugins/hoster/NowVideoAt.py
new file mode 100644
index 000000000..c224b6172
--- /dev/null
+++ b/module/plugins/hoster/NowVideoAt.py
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+
+import re
+
+from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
+
+
+class NowVideoAt(SimpleHoster):
+    __name__ = "NowVideoAt"
+    __type__ = "hoster"
+    __version__ = "0.01"
+
+    __pattern__ = r'http://(?:www\.)?nowvideo\.(at|ch|co|eu|sx)/(video|mobile/#/videos)/(?P<ID>\w+)'
+
+    __description__ = """NowVideo.at hoster plugin"""
+    __license__ = "GPLv3"
+    __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
+
+
+    FILE_URL_REPLACEMENTS = [(__pattern__, r'http://www.nowvideo.at/video/\g<ID>')]
+
+    FILE_NAME_PATTERN = r'<h4>(?P<N>.+?)<'
+    OFFLINE_PATTERN = r'>This file no longer exists'
+
+    LINK_PATTERN = r'<source src="(.+?)"'
+
+
+    def handleFree(self):
+        self.html = self.load("http://www.nowvideo.at/mobile/video.php", get={'id': self.file_info['ID']})
+
+        m = re.search(self.LINK_PATTERN, self.html)
+        if m is None:
+            self.parseError("Download link not found")
+
+        self.download(m.group(1), disposition=True)
+
+
+getInfo = create_getInfo(NowVideoAt)