Changeset 39358

Timestamp:

11/19/16 20:16:49 (7 years ago)

Author:

obi

Message:

add vidto.py

Location:

titan/mediathek/localhoster

Files:

• hoster.sh (modified) (2 diffs)
• lib/helpers.py (modified) (3 diffs)
• vidto.py (added)
• vivo.py (modified) (1 diff)

titan/mediathek/localhoster/hoster.sh

@@ -142 +142 @@
 }
 
+vidto()
+{
+        $BIN $CMD/vidto.py $INPUT
+}
+
+
 if [ "$TYPE" == "get" ];then
         case $hoster in
@@ -164 +170 @@
                 vidzi) vidzi $INPUT;;
                 vivo) vivo $INPUT;;
+                vidto) vidto $INPUT;;
                 streamcloud1) streamcloud $INPUT;;      
         esac

titan/mediathek/localhoster/lib/helpers.py

@@ -64 +64 @@
         if auto_pick:
             return sources[0][1]
-#       else:
+        else:
+            return sources[0][1]
+
 #            result = xbmcgui.Dialog().select('Choose the link', [source[0] if source[0] else 'Uknown' for source in sources])
 #            if result == -1:
@@ -70 +72 @@
 #            else:
 #                return sources[result][1]
-    else:
-        raise ResolverError('No Video Link Found')
+#    else:
+#        raise ResolverError('No Video Link Found')
 
 def append_headers(headers):
@@ -173 +175 @@
 
     response = net.http_GET(url, headers=headers)
-#    response_headers = response.get_headers(as_dict=True)
+    response_headers = response.get_headers(as_dict=True)
     response_headers = response.get_headers()
 
     headers.update({'Referer': url})
-#    cookie = response_headers.get('Set-Cookie', None)
-#    if cookie:
-#        headers.update({'Cookie': cookie})
+    cookie = response_headers.get('Set-Cookie', None)
+    if cookie:
+        headers.update({'Cookie': cookie})
     html = response.content
 
     source_list = scrape_sources(html, result_blacklist)
     source = pick_source(source_list)
-    return source# + append_headers(headers)
+    return source + append_headers(headers)
+#    return source

titan/mediathek/localhoster/vivo.py

@@ -7 +7 @@
 import base64
 import json
+from lib import helpers
 
 class VivoResolver(object):
-    name = "vivosx"
-    domains = ["vivo.sx"]
-    pattern = '(?://|\.)(vivo\.sx)/([0-9a-zA-Z]+)'
+    name = "vidto"
+    domains = ["vidto.me"]
+    pattern = '(?://|\.)(vidto\.me)/(?:embed-)?([0-9a-zA-Z]+)'
 
     def __init__(self):