diff --git a/servers/akstream.json b/servers/akstream.json index 6e1f942e..f1ea64c2 100644 --- a/servers/akstream.json +++ b/servers/akstream.json @@ -1,8 +1,12 @@ { "active": true, "find_videos": { - "ignore_urls": ["http://akvideo.stream/video"], + "ignore_urls": ["http://akvideo.stream/video", "http://akvideo.stream/video/api"], "patterns": [ + { + "pattern": "(https://akvideo\\.stream/api/vcmod/fastredirect/embed_ak\\.php\\?id=[0-9]+)", + "url": "\\1" + }, { "pattern": "akvideo.stream\/video\/(?:embed-)?([a-zA-Z0-9]+)", "url": "http://akvideo.stream\/video\/\\1" diff --git a/servers/akstream.py b/servers/akstream.py index cb0dfd7a..29a4855e 100644 --- a/servers/akstream.py +++ b/servers/akstream.py @@ -11,7 +11,14 @@ from platformcode import logger, config def test_video_exists(page_url): logger.info("(page_url='%s')" % page_url) global data - data = httptools.downloadpage(page_url).data + page = httptools.downloadpage(page_url) + if 'embed_ak.php' in page_url: + code = scrapertools.find_single_match(page.url, '/embed-([0-9a-z]+)\.html') + if code: + page = httptools.downloadpage('http://akvideo.stream/video/' + code) + else: + return False, config.get_localized_string(70449) % "Akvideo" + data = page.data if "File Not Found" in data: return False, config.get_localized_string(70449) % "Akvideo" return True, ""