diff --git a/servers/maxstream.json b/servers/maxstream.json
index 8cb8257d..902c5f0a 100644
--- a/servers/maxstream.json
+++ b/servers/maxstream.json
@@ -4,12 +4,8 @@
"ignore_urls": [],
"patterns": [
{
- "pattern": "https?://maxstream.video/(?:e/)?([a-z0-9]+)",
- "url": "https://maxstream.video/\\1"
- },
- {
- "pattern": "https?://maxstream.video/embed-([a-z0-9]+).html",
- "url": "https://maxstream.video/\\1"
+ "pattern": "https?://maxstream.video/(?:e/|embed-|cast/)?([a-z0-9]+)",
+ "url": "https://maxstream.video/cast/\\1"
}
]
},
diff --git a/servers/maxstream.py b/servers/maxstream.py
index d77e3e6c..ece93bce 100644
--- a/servers/maxstream.py
+++ b/servers/maxstream.py
@@ -1,22 +1,65 @@
-from core import httptools
-from core import scrapertools, support
-from lib import jsunpack
-from platformcode import logger, config
+# -*- coding: utf-8 -*-
+# --------------------------------------------------------
+# Conector MaxStream
+# --------------------------------------------------------
+from core import httptools, scrapertools, support
+from platformcode import logger, config
+import ast, sys
+
+if sys.version_info[0] >= 3:
+ import urllib.parse as urlparse
+else:
+ import urlparse
def test_video_exists(page_url):
logger.debug("(page_url='%s')" % page_url)
+
global data
data = httptools.downloadpage(page_url).data
- if "File Not Found" in data or "File was deleted" in data:
+ if "file was deleted" in data:
return False, config.get_localized_string(70449) % "MaxStream"
+
return True, ""
+
def get_video_url(page_url, premium=False, user="", password="", video_password=""):
logger.debug("url=" + page_url)
- global data
- packed = scrapertools.find_single_match(data, r'(eval.*?)')
- unpacked = jsunpack.unpack(packed)
- return support.get_jwplayer_mediaurl(unpacked, 'MaxStream')
+ video_urls = []
+ url_video = ''
+
+ lastIndexStart = data.rfind('')
+
+ script = data[ (lastIndexStart + len('