Changeset 39367

Timestamp:

11/20/16 01:01:37 (6 years ago)

Author:

obi

Message:

fix thevideo

Location:

titan

Files:

• mediathek/localhoster/thevideo.py (modified) (3 diffs)
• plugins/tithek/kinox.h (modified) (1 diff)

titan/mediathek/localhoster/thevideo.py

@@ -42 +42 @@
 
         html = self.net.http_GET(web_url, headers=headers).content
-
+#        print "111111111111", html.encode('utf-8').strip()
         vhash = re.search('\'_vhash\', value: \'(.*?)\'', html).group(1)
         gfk = re.search('\'gfk\', value: \'(.*?)\'', html).group(1)
@@ -64 +64 @@
 
         html = self.net.http_POST(url=web_url, form_data=fdata, headers=headers).content
+#        print "2222222222", html.encode('utf-8').strip()
 
+#http://thevideo.me/jwv/LDonSU04MylZO1ZNSThGPUEK
         r = re.search('sources:\s*(\[.*?\])', html, re.DOTALL)
 
@@ -86 +88 @@
         web_url = self.get_aturl(host, path, mpri_Key)
         html = self.net.http_GET(web_url, headers=headers).content
+#        print "3333333333", html.encode('utf-8').strip()
+
         js_data = jsunpack.unpack(html)
         for match in re.finditer('(eval\(function.*?)\{\}\)\)', html, re.DOTALL):

titan/plugins/tithek/kinox.h

@@ -391 +391 @@
 
                                         tmpstr1 = string_replace_all("\\", "", tmpstr1, 1);
-                                        tmpstr1 = string_resub("<a href=\"", "\"", tmpstr1, 0);
-
+                                        if(ostrstr(tmpstr1, "iframe src") != NULL)
+                                                tmpstr1 = string_resub("<a href=\"", "\"", tmpstr1, 0);
+                                        else
+                                                tmpstr1 = string_resub("<iframe src=\"", "\"", tmpstr1, 0);
 
                                         url = ostrcat(tmpstr1, NULL, 0, 0);