Changeset 29520

Timestamp:

07/22/14 13:30:10 (10 years ago)

Author:

obi

Message:

update tithek movie4

Location:

titan/plugins/tithek

Files:

• movie4k.h (modified) (13 diffs)
• streamcloud.h (modified) (1 diff)

titan/plugins/tithek/movie4k.h

@@ -8 +8 @@
 {
         debug(99, "link: %s", link);
-        char* tmpstr = NULL, *url = NULL, *streamurl = NULL, *tmppath = NULL, *tmphost = NULL, *pos = NULL;
+        int debuglevel = getconfigint("debuglevel", NULL);
+        char* tmpstr = NULL, *tmpstr1 = NULL, *tmpstr2 = NULL, *url = NULL, *streamurl = NULL, *tmppath = NULL, *tmphost = NULL, *pos = NULL;
+        titheklog(debuglevel, "/tmp/movie4k_streamurl_url0", NULL, NULL, NULL, link);
 
         if(link == NULL || ostrncmp("http://", link, 7)) return NULL;
@@ -22 +24 @@
         }
 
-        tmpstr = gethttp(tmphost, tmppath, 80, NULL, NULL, 5000, NULL, 0);
-
+        tmpstr1 = gethttp(tmphost, tmppath, 80, NULL, NULL, 5000, NULL, 0);
+        titheklog(debuglevel, "/tmp/movie4k_streamurl_tmpstr1_a", NULL, NULL, NULL, tmpstr1);
+
+        tmpstr = string_resub("question.png", "underplayer", tmpstr1, 0);
+        titheklog(debuglevel, "/tmp/movie4k_streamurl_tmpstr1_b", NULL, NULL, NULL, tmpstr);
+        free(tmpstr1), tmpstr1 = NULL;
+        
         url = string_resub("<a target=\"_blank\" href=\"", "\"><", tmpstr, 0);
+        titheklog(debuglevel, "/tmp/movie4k_streamurl_url1", NULL, NULL, NULL, url);
 
         if(ostrstr(url, "http://") == NULL)
@@ -30 +38 @@
                 free(url), url = NULL;
                 url = string_resub("<iframe src=", "\" width", tmpstr, 0);
+
+                tmpstr2 = ostrcat("<iframe src=", url, 0, 0);
+                tmpstr2 = ostrcat(tmpstr2, "\" width", 1, 0);
+                tmpstr = string_replace_all(tmpstr2, "", tmpstr, 1);
+
+                titheklog(debuglevel, "/tmp/movie4k_streamurl_tmpstr2", NULL, NULL, NULL, tmpstr);
+                titheklog(debuglevel, "/tmp/movie4k_streamurl_url2", NULL, NULL, NULL, url);
         }
         
@@ -36 +51 @@
                 free(url), url = NULL;
                 url = oregex(".*<iframe width=.*(http://.*)&width.*", tmpstr);
+                titheklog(debuglevel, "/tmp/movie4k_streamurl_url3", NULL, NULL, NULL, url);
+        }       
+
+        if(ostrstr(url, "http://clkrev.com") != NULL)
+        {
+                free(url), url = NULL;
+                url = string_resub("<iframe src=\"", "\" width", tmpstr, 0);
+                titheklog(debuglevel, "/tmp/movie4k_streamurl_url4", NULL, NULL, NULL, url);
         }
         
@@ -41 +64 @@
         url = string_replace_all("\"", "", url, 1);
 
+        if(url == NULL)
+        {
+                free(url), url = NULL;
+                url = oregex(".*<iframe width=\".*(http://.*)&width=600&height=480\".*", tmpstr);
+                titheklog(debuglevel, "/tmp/movie4k_streamurl_url5", NULL, NULL, NULL, url);
+        }
+        titheklog(debuglevel, "/tmp/movie4k_streamurl_url6", NULL, NULL, NULL, url);
+
         streamurl = hoster(url);
+        titheklog(debuglevel, "/tmp/movie4k_streamurl_url7", NULL, NULL, NULL, url);
+
         free(url), url = NULL;
         free(tmpstr), tmpstr = NULL;
+        free(tmpstr2), tmpstr2 = NULL;
         free(tmphost), tmphost = NULL;
 
@@ -149 +183 @@
                                                 id = string_resub("watch-movie-", ".html", link, 0);
                                         if(id == NULL)
-                                                id = oregex(".*tvshows-(.*[0-9]{1,10})-.*", link);
+                                                id = oregex(".*tvshows-(.*[0-9]{4,10})-.*", link);
 
 
@@ -372 +406 @@
                                                 extra = getxmlentry(pos3, "quality ");
 
-                                                id = oregex(".*-online-film-(.*[0-9]{1,10}).html.*", pathnew);                                                  
+                                                id = oregex(".*-online-film-(.*[0-9]{4,10}).html.*", pathnew);                                                  
                                                 if(id == NULL)
                                                         id = string_resub("watch-movie-", ".html", pathnew, 0);
                                                 if(id == NULL)
-                                                        id = oregex(".*tvshows-(.*[0-9]{1,10})-.*", pathnew);
+                                                        id = oregex(".*tvshows-(.*[0-9]{4,10})-.*", pathnew);
                                                 if(id == NULL)
                                                         id = ostrcat(tmpid, NULL, 0, 0);
@@ -404 +438 @@
                                         else
                                         {
-                                                id = oregex(".*-online-film-(.*[0-9]{1,10}).html.*", path);                                                     
+                                                id = oregex(".*-online-film-(.*[0-9]{4,10}).html.*", path);                                                     
                                                 if(id == NULL)
                                                         id = string_resub("watch-movie-", ".html", path, 0);
                                                 if(id == NULL)
-                                                        id = oregex(".*tvshows-(.*[0-9]{1,10})-.*", path);
+                                                        id = oregex(".*tvshows-(.*[0-9]{4,10})-.*", path);
                                                 if(id == NULL)
                                                         id = ostrcat(tmpid, NULL, 0, 0);
@@ -470 +504 @@
                                         if(url2 != NULL && ostrcmp(url, url2) != 0)
                                                 ostrcatbig(&line, " (Part1)", &maxlen, &bigpos);
+/*
                                         if(extra != NULL)
                                         {
@@ -476 +511 @@
                                                 ostrcatbig(&line, ")", &maxlen, &bigpos);                                       
                                         }
+*/
                                         ostrcatbig(&line, "#http://www.movie4k.to/", &maxlen, &bigpos);
                                         ostrcatbig(&line, url, &maxlen, &bigpos);
@@ -661 +697 @@
                 path = pos + 1;
         }
-/*
+
         if(!ostrncmp("tvshows-", path, 8))
         {
                 debug(99, "path: %s",path);
                 tpath = ostrcat(path, NULL, 0, 0);
-                id = oregex(".*tvshows-(.*[0-9]{1,10})-.*", path);
+                id = oregex(".*tvshows-(.*[0-9]{4,10})-.*", path);
                 tpath = string_replace("tvshows-season-", "", tpath, 1);
                 tpath = string_replace(".html", "", tpath, 1);
@@ -675 +711 @@
         }
         else
-*/
                 tpath = ostrcat(path, NULL, 0, 0);
 
@@ -711 +746 @@
                                                 {
                                                         link = string_resub("<OPTION value=\"", "\"", ret1[j-1].part, 0);
-                                                        id = oregex(".*tvshows-(.*[0-9]{1,10})-.*", link);
+                                                        id = oregex(".*tvshows-(.*[0-9]{4,10})-.*", link);
                                                         episode = oregex(".*>Episode (.*[0-9]{1,10})</OPTION>.*", ret1[j-1].part);
 

titan/plugins/tithek/streamcloud.h

@@ -69 +69 @@
         free(send), send = NULL;
         debug(99, "tmpstr: %s", tmpstr);
+
+        if(tmpstr == NULL || ostrstr(tmpstr, "<head><title>404 Not Found</title></head>") != NULL)
+        {
+                textbox(_("Message"), _("The page is temporarily unavailable") , _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 1200, 200, 0, 0);
+                goto end;
+        }
 
         waitmsgbar(16, 0, _("Connect with Hoster wait 16 seconds"), 1);