Changeset 44473

Timestamp:

01/02/20 16:21:49 (4 years ago)

Author:

obi

Message:

fix

File:

• titan/mediathek/localhoster/streamz.py (modified) (4 diffs)

titan/mediathek/localhoster/streamz.py

@@ -5 +5 @@
 from lib.net import Net
 
-class VidUpMeResolver(object):
+class StreamzResolver(object):
     name = "streamz"
-    domains = ['streamz.cc']
-    pattern = r'(?://|\.)(streamz\.cc)/([0-9a-zA-Z]+)'
+    domains = ['streamz.cc|streamcrypt.net']
+    pattern = r'(?://|\.)(streamz\.cc|streamcrypt\.net)/([0-9a-zA-Z]+)'
 
     def __init__(self):
@@ -16 +16 @@
         media_id = self.get_host_and_id(url)[1]
 
-        return self.get_media_url(host, media_id)
+        return self.get_media_url(host, media_id, url)
  
     def get_host_and_id(self, url):
@@ -25 +25 @@
             return False
 
-    def get_media_url(self, host, media_id):
-        web_url = self.get_url(host, media_id)
+    def get_media_url(self, host, media_id, url):
+        web_url = self.get_url(host, media_id, url)
+ #       print "web_url", web_url
         html = self.net.http_GET(web_url).content
 
@@ -53 +54 @@
 #                 print stream_url[-1]
 
-    def get_url(self, host, media_id):
-        return 'http://%s/%s' % (host,media_id)
+    def get_url(self, host, media_id, url):
+ #       return 'http://%s/%s' % (host,media_id)
+        return '%s' % (url)
 
 
-sys.stdout = VidUpMeResolver()
+sys.stdout = StreamzResolver()