Changeset 38774

Timestamp:

09/14/16 15:27:15 (7 years ago)

Author:

obi

Message:

tithek fix nowvideo

File:

• titan/plugins/tithek/nowvideo.h (modified) (2 diffs)

titan/plugins/tithek/nowvideo.h

@@ -9 +9 @@
         char* tmppath = NULL;
         char* tmpstr = NULL;
+        char* tmpstr2 = NULL;
         char* send = NULL;
         char* ip = NULL;
@@ -108 +109 @@
         }
 
-        file = string_resub("flashvars.file=\"", "\";", tmpstr, 0);
-        if(file == NULL)
-                file = string_replace("/video/", "", tmppath, 0);
-        if(file == NULL)
-                file = string_resub("login.php?return=/video/", "\">Log In", tmpstr, 0);
-        if(file == NULL)
-                file = string_resub("<a href=\"/share.php?id=", "&title=", tmpstr, 0);
-        
-        char* r1 = NULL, *r2 = NULL, *r3 = NULL, *r4 = NULL;
-        pos = ostrstr(tmpstr, ");}('");
-        if(pos != NULL)
+        tmpstr2 = string_resub("<div id=\"flaAspectRatio\">", "</div>", tmpstr, 0);
+        streamlink = oregex(".*(http.*.mp4).*", tmpstr2);
+        streamlink = stringreplacechar(streamlink, '"', '\0');
+        if(streamlink == NULL)
         {
-                r1 = string_resub(");}('", "'", pos, 0);
-                pos = ostrstr(pos + 5, ",'");
+                file = string_resub("flashvars.file=\"", "\";", tmpstr, 0);
+                if(file == NULL)
+                        file = string_replace("/video/", "", tmppath, 0);
+                if(file == NULL)
+                        file = string_resub("login.php?return=/video/", "\">Log In", tmpstr, 0);
+                if(file == NULL)
+                        file = string_resub("<a href=\"/share.php?id=", "&title=", tmpstr, 0);
+                
+                char* r1 = NULL, *r2 = NULL, *r3 = NULL, *r4 = NULL;
+                pos = ostrstr(tmpstr, ");}('");
                 if(pos != NULL)
                 {
-                        r2 = string_resub(",'", "'", pos, 0);
-                        pos = ostrstr(pos + 2, ",'");
+                        r1 = string_resub(");}('", "'", pos, 0);
+                        pos = ostrstr(pos + 5, ",'");
                         if(pos != NULL)
                         {
-                                r3 = string_resub(",'", "'", pos, 0);
+                                r2 = string_resub(",'", "'", pos, 0);
                                 pos = ostrstr(pos + 2, ",'");
                                 if(pos != NULL)
-                                        r4 = string_resub(",'", "'", pos, 0);
+                                {
+                                        r3 = string_resub(",'", "'", pos, 0);
+                                        pos = ostrstr(pos + 2, ",'");
+                                        if(pos != NULL)
+                                                r4 = string_resub(",'", "'", pos, 0);
+                                }
                         }
                 }
+                
+                filekey = getfilekey(r1, r2, r3, r4);
+                
+                free(r1); r1 = NULL;
+                free(r2); r2 = NULL;
+                free(r3); r3 = NULL;
+                free(r4); r4 = NULL;
+                
+                if(filekey == NULL)
+                        filekey = string_resub("flashvars.filekey=\"", "\";", tmpstr, 0);
+        
+                if(filekey == NULL)
+                {
+                        char* searchstr = string_resub("flashvars.filekey=", ";", tmpstr, 0);
+                        debug(99, "searchstr: %s", searchstr);
+                        searchstr = ostrcat(searchstr, "=\"", 1, 0);
+                        filekey = string_resub(searchstr, "\";", tmpstr, 0);
+                }
+                debug(99, "filekey: %s", filekey);
+        
+                free(tmppath), tmppath = NULL;
+                tmppath = ostrcat("/api/player.api.php?file=", file, 0, 0);
+                tmppath = ostrcat(tmppath, "&key=", 1, 0);
+                tmppath = ostrcat(tmppath, filekey, 1, 0);
+        
+                free(send), send = NULL;
+                send = ostrcat(send, "GET ", 1, 0);
+                send = ostrcat(send, tmppath, 1, 0);
+                send = ostrcat(send, " HTTP/1.1\r\nHost: ", 1, 0);
+                send = ostrcat(send, tmphost, 1, 0);
+                send = ostrcat(send, "\r\nUser-Agent: Mozilla/5.0 (X11; Linux i686) AppleWebKit/535.1 (KHTML, like Gecko) Chrome/13.0.782.99 Safari/535.1\r\nConnection: close\r\nAccept-Encoding: gzip\r\n\r\n", 1, 0);
+                debug(99, "send: %s", send);
+                free(tmpstr), tmpstr = NULL;
+                tmpstr = gethttpreal(tmphost, tmppath, 80, NULL, NULL, NULL, 0, send, NULL, 5000, 1);
+                debug(99, "tmpstr: %s", tmpstr);
+                titheklog(debuglevel, "/tmp/nowvideo2_get", NULL, NULL, NULL, tmpstr);
+        
+                streamlink = string_resub("url=", "&", tmpstr, 0);
         }
-        
-        filekey = getfilekey(r1, r2, r3, r4);
-        
-        free(r1); r1 = NULL;
-        free(r2); r2 = NULL;
-        free(r3); r3 = NULL;
-        free(r4); r4 = NULL;
-        
-        if(filekey == NULL)
-                filekey = string_resub("flashvars.filekey=\"", "\";", tmpstr, 0);
+        else
+                titheklog(debuglevel, "/tmp/nowvideo2_get", NULL, NULL, NULL, tmpstr);
 
-        if(filekey == NULL)
-        {
-                char* searchstr = string_resub("flashvars.filekey=", ";", tmpstr, 0);
-                debug(99, "searchstr: %s", searchstr);
-                searchstr = ostrcat(searchstr, "=\"", 1, 0);
-                filekey = string_resub(searchstr, "\";", tmpstr, 0);
-        }
-        debug(99, "filekey: %s", filekey);
-
-        free(tmppath), tmppath = NULL;
-        tmppath = ostrcat("/api/player.api.php?file=", file, 0, 0);
-        tmppath = ostrcat(tmppath, "&key=", 1, 0);
-        tmppath = ostrcat(tmppath, filekey, 1, 0);
-
-        free(send), send = NULL;
-        send = ostrcat(send, "GET ", 1, 0);
-        send = ostrcat(send, tmppath, 1, 0);
-        send = ostrcat(send, " HTTP/1.1\r\nHost: ", 1, 0);
-        send = ostrcat(send, tmphost, 1, 0);
-        send = ostrcat(send, "\r\nUser-Agent: Mozilla/5.0 (X11; Linux i686) AppleWebKit/535.1 (KHTML, like Gecko) Chrome/13.0.782.99 Safari/535.1\r\nConnection: close\r\nAccept-Encoding: gzip\r\n\r\n", 1, 0);
-        debug(99, "send: %s", send);
-        free(tmpstr), tmpstr = NULL;
-        tmpstr = gethttpreal(tmphost, tmppath, 80, NULL, NULL, NULL, 0, send, NULL, 5000, 1);
-        debug(99, "tmpstr: %s", tmpstr);
-        titheklog(debuglevel, "/tmp/nowvideo2_get", NULL, NULL, NULL, tmpstr);
-
-        streamlink = string_resub("url=", "&", tmpstr, 0);
 end:
         free(tmphost); tmphost = NULL;
         free(tmppath); tmppath = NULL;
         free(tmpstr); tmpstr = NULL;
+        free(tmpstr2); tmpstr2 = NULL;
         free(send); send = NULL;
         free(filekey); filekey = NULL;