Changeset 36966

Timestamp:

01/27/16 23:34:04 (7 years ago)

Author:

obi

Message:

update tithek

Location:

titan

Files:

• mediathek/localparser_secret/bs.sh (modified) (3 diffs)
• plugins/tithek/tithek.h (modified) (7 diffs)
• plugins/tithek/tithek_global.h (modified) (1 diff)
• plugins/tithek/tithek_header.h (modified) (1 diff)

titan/mediathek/localparser_secret/bs.sh

@@ -185 +185 @@
                  j = index(substr($0, i), "</a>") - 1
                  title = substr($0, i, j)
-#                 print title "#" SRC " " SRC " video " url "#http://atemio.dyndns.tv/mediathek/menu/default.jpg#default.jpg#" NAME "#0"
-                 print SRC " " SRC " video " url
+                 print title "#" SRC " " SRC " video " url "#http://atemio.dyndns.tv/mediathek/menu/default.jpg#default.jpg#" NAME "#111"
               }
               next
@@ -220 +219 @@
                   title = substr($0, i, j)
                   
-#                  print "Originalvideo#" url "#http://atemio.dyndns.tv/mediathek/menu/default.jpg#default.jpg#" NAME "#14"
-                  print title "#" url "#http://atemio.dyndns.tv/mediathek/menu/" title ".jpg#" title ".jpg#" NAME "#14"
+#                  print "Originalvideo#" url "#http://atemio.dyndns.tv/mediathek/menu/default.jpg#default.jpg#" NAME "#140"
+#                  print title "#" url "#http://atemio.dyndns.tv/mediathek/menu/" title ".jpg#" title ".jpg#" NAME "#14"
+                  print url
                }
                next
@@ -231 +231 @@
 
 ' >/tmp/tithek/$PARSER.video.list
-        cat "/tmp/tithek/$PARSER.video.list"
+#       echo "/tmp/tithek/$PARSER.video.list"
+        cat     "/tmp/tithek/$PARSER.video.list"
 }
 

titan/plugins/tithek/tithek.h

@@ -445 +445 @@
 
 //      if(cmpfilenameext(filename, ".sh") == 0)
-        if(ostrstr(filename, ".sh ") != NULL && ostrstr(filename, ".sh init") == NULL && ostrstr(filename, ".sh video") == NULL)
+        if(ostrstr(filename, ".sh ") != NULL && ostrstr(filename, ".sh init") == NULL)
         {
                 printf("[tithek] cmd: %s\n", filename);
@@ -454 +454 @@
                 debug(10, "file: %s", file);
         }
-        else if(ostrstr(filename, ".sh video") != NULL)
-        {
-                printf("[tithek] video..... cmd: %s\n", filename);
-                debug(10, "cmd: %s", filename);
-                file = command(filename);
-                file = string_newline(file);
-                printf("[tithek] file: %s\n", file);
-                debug(10, "file: %s", file);
-        }
         else
                 file = ostrcat(filename, NULL, 0, 0);   
@@ -483 +474 @@
                         continue;
 
-                if(ostrstr(filename, ".sh hoster") != NULL)
-                {
-                        printf("[tithek] hoster fileline: %s\n", fileline);
-                        tmpstr = command(fileline);
-                        printf("[tithek] hoster tmpstr: %s\n", tmpstr);
-
-                        len = strlen(tmpstr) - 1;
-                        if(tmpstr[len] == '\n')
-                                tmpstr[len] = '\0';
-                        if(tmpstr[len - 1] == '\r')
-                                tmpstr[len - 1] = '\0';
-                }
-                else
-                {
-                        len = strlen(fileline) - 1;
-                        if(fileline[len] == '\n')
-                                fileline[len] = '\0';
-                        if(fileline[len - 1] == '\r')
-                                fileline[len - 1] = '\0';
-                }
+                len = strlen(fileline) - 1;
+                if(fileline[len] == '\n')
+                        fileline[len] = '\0';
+                if(fileline[len - 1] == '\r')
+                        fileline[len - 1] = '\0';
+
                 linecount++;
 
                 if(last == NULL) last = tmplast;
-                if(ostrstr(filename, ".sh hoster") != NULL)
-                        last = addtithek(tmpstr, len + 2, linecount, last, pay);
-                else
-                        last = addtithek(fileline, len + 2, linecount, last, pay);
+                last = addtithek(fileline, len + 2, linecount, last, pay);
                 if(last != NULL) tmplast = last;
                 free(tmpstr), tmpstr = NULL;
@@ -1381 +1355 @@
         tmpstr = ostrcat(((struct tithek*)listbox->select->handle)->link, NULL, 0, 0);
         tmpstr2 = ostrcat(((struct tithek*)listbox->select->handle)->title, NULL, 0, 0);
-                
+
         if(((struct tithek*)listbox->select->handle)->flag == 2)
         {
                 if(tmpstr != NULL) tmpstr1 = ostrcat(tmpstr, NULL, 0, 0);
-        }                                               
+        }
         else if(((struct tithek*)listbox->select->handle)->flag == 3)
         {
@@ -1474 +1448 @@
         {
                 if(tmpstr != NULL) tmpstr1 = nbaondemand(tmpstr);
+        }
+        else if(((struct tithek*)listbox->select->handle)->flag == 111)
+        {
+                if(tmpstr != NULL) tmpstr1 = localparser_hoster(tmpstr);
         }
 
@@ -2076 +2054 @@
                                 clearscreen(grid);
 
-                                if(((struct tithek*)listbox->select->handle)->flag == 2 || ((struct tithek*)listbox->select->handle)->flag == 3 || ((struct tithek*)listbox->select->handle)->flag == 4 || ((struct tithek*)listbox->select->handle)->flag == 5 || ((struct tithek*)listbox->select->handle)->flag == 6 || ((struct tithek*)listbox->select->handle)->flag == 12 || ((struct tithek*)listbox->select->handle)->flag == 14 || ((struct tithek*)listbox->select->handle)->flag == 15 || ((struct tithek*)listbox->select->handle)->flag == 20 || ((struct tithek*)listbox->select->handle)->flag == 38 || ((struct tithek*)listbox->select->handle)->flag == 42 || ((struct tithek*)listbox->select->handle)->flag == 45 || ((struct tithek*)listbox->select->handle)->flag == 46 || ((struct tithek*)listbox->select->handle)->flag == 64 || ((struct tithek*)listbox->select->handle)->flag == 50 || ((struct tithek*)listbox->select->handle)->flag == 41 || ((struct tithek*)listbox->select->handle)->flag == 43 || ((struct tithek*)listbox->select->handle)->flag == 75 || ((struct tithek*)listbox->select->handle)->flag == 91 || ((struct tithek*)listbox->select->handle)->flag == 92 || ((struct tithek*)listbox->select->handle)->flag == 93 || ((struct tithek*)listbox->select->handle)->flag == 94 || ((struct tithek*)listbox->select->handle)->flag == 98)
+                                if(((struct tithek*)listbox->select->handle)->flag == 2 || ((struct tithek*)listbox->select->handle)->flag == 3 || ((struct tithek*)listbox->select->handle)->flag == 4 || ((struct tithek*)listbox->select->handle)->flag == 5 || ((struct tithek*)listbox->select->handle)->flag == 6 || ((struct tithek*)listbox->select->handle)->flag == 12 || ((struct tithek*)listbox->select->handle)->flag == 14 || ((struct tithek*)listbox->select->handle)->flag == 15 || ((struct tithek*)listbox->select->handle)->flag == 20 || ((struct tithek*)listbox->select->handle)->flag == 38 || ((struct tithek*)listbox->select->handle)->flag == 42 || ((struct tithek*)listbox->select->handle)->flag == 45 || ((struct tithek*)listbox->select->handle)->flag == 46 || ((struct tithek*)listbox->select->handle)->flag == 64 || ((struct tithek*)listbox->select->handle)->flag == 50 || ((struct tithek*)listbox->select->handle)->flag == 41 || ((struct tithek*)listbox->select->handle)->flag == 43 || ((struct tithek*)listbox->select->handle)->flag == 75 || ((struct tithek*)listbox->select->handle)->flag == 91 || ((struct tithek*)listbox->select->handle)->flag == 92 || ((struct tithek*)listbox->select->handle)->flag == 93 || ((struct tithek*)listbox->select->handle)->flag == 94 || ((struct tithek*)listbox->select->handle)->flag == 98 || ((struct tithek*)listbox->select->handle)->flag == 111)
                                 {
                                         submenu(listbox, load, title);
@@ -2346 +2324 @@
                                         continue;
                                 }       
+                                else if((((struct tithek*)listbox->select->handle)->flag == 112))
+                                {
+//                                      if(localparser_search(grid, listbox, countlabel, load, ((struct tithek*)listbox->select->handle)->link, ((struct tithek*)listbox->select->handle)->title) == 0)
+//                                              if(screenlistbox(grid, listbox, countlabel, title, titheklink, &pagecount, &tithekexit, &oaktpage, &oaktline, &ogridcol, 0, 0) == 0) break;
+                                        if(localparser_search(grid, listbox, countlabel, load, ((struct tithek*)listbox->select->handle)->link, ((struct tithek*)listbox->select->handle)->title, NULL, 0) == 0)
+                                                if(screenlistbox(grid, listbox, countlabel, title, titheklink, &pagecount, &tithekexit, &oaktpage, &oaktline, &ogridcol, 0, 0) == 0) break;
+                                }
                                 else if((((struct tithek*)listbox->select->handle)->flag == 3))
                                 {

titan/plugins/tithek/tithek_global.h

@@ -693 +693 @@
 }
 
+char* localparser_hoster(char* link)
+{
+        debug(99, "local_parser link: %s", link);
+        int debuglevel = getconfigint("debuglevel", NULL);
+        int ret = 1;
+        char* tmpstr = NULL, *streamurl = NULL;
+
+        tmpstr = command(link);
+        tmpstr = string_newline(tmpstr);
+        
+        streamurl = hoster(tmpstr);
+        free(tmpstr), tmpstr = NULL;
+
+        return streamurl;
+}
+
+
+//int localparser_search(struct skin* grid, struct skin* listbox, struct skin* countlabel, struct skin* load, char* link, char* title)
+int localparser_search(struct skin* grid, struct skin* listbox, struct skin* countlabel, struct skin* load, char* link, char* title, char* searchstr, int flag)
+{
+        char* tmpstr = NULL, *tmpstr1 = NULL, *line = NULL, *menu = NULL, *search = NULL;
+        int ret = 1, count = 0, i = 0;
+
+        if(listbox == NULL || listbox->select == NULL || listbox->select->handle == NULL)
+                return ret;
+
+        if(searchstr == NULL)
+                search = textinputhist(_("Search"), " ", "searchhist");
+        else
+                search = textinputhist(_("Search"), searchstr, "searchhist");
+
+        if(search != NULL)
+        {
+                drawscreen(load, 0, 0);
+
+                strstrip(search);
+                string_tolower(search);
+
+                tmpstr = gethttp("atemio.dyndns.tv", "/mediathek/youtube/streams/youtube.all-sorted.list", 80, NULL, HTTPAUTH, 5000, NULL, 0);
+
+                struct splitstr* ret1 = NULL;
+                ret1 = strsplit(tmpstr, "\n", &count);
+
+                if(ret1 != NULL)
+                {
+                        int max = count;
+                        for(i = 0; i < max; i++)
+                        {
+                        
+                                tmpstr1 = ostrcat(ret1[i].part, NULL, 0, 0);
+                                tmpstr1 = stringreplacecharonce(tmpstr1, '#', '\0');
+                                string_tolower(tmpstr1);
+
+                                if(ostrstr(tmpstr1, search) != NULL)
+                                {
+                                        printf("found: %s\n", ret1[i].part);
+                                        int rcret = waitrc(NULL, 10, 0);
+                                        if(rcret == getrcconfigint("rcexit", NULL)) break;
+
+                                        line = ostrcat(line, ret1[i].part, 1, 0);
+                                        line = ostrcat(line, "\n", 0, 0);
+                                }
+                                free(tmpstr1), tmpstr1 = NULL;                          
+                        }
+                        free(ret1), ret1 = NULL;
+
+                        if(line != NULL)
+                        {
+                                line = string_replace_all("http://atemio.dyndns.tv/", "http://imageshack.us/md/up/grd/", line, 1);
+                                menu = ostrcat("/tmp/tithek/youtube.search.list", NULL, 0, 0);
+                                writesys(menu, line, 0);
+                                struct tithek* tnode = (struct tithek*)listbox->select->handle;
+                                createtithek(tnode, tnode->title, menu, tnode->pic, tnode->localname, tnode->menutitle, tnode->flag);
+                                ret = 0;
+                        }
+                }
+                free(tmpstr), tmpstr = NULL;
+        }
+        free(search), search = NULL;
+        return ret;
+}
+
 #endif

titan/plugins/tithek/tithek_header.h

@@ -9 +9 @@
 void localscript_init(char* titheklink, char* tithekfile);
 int b64dec(char* dest, char* src);
+char* localparser_hoster(char* link);
+int localparser_search(struct skin* grid, struct skin* listbox, struct skin* countlabel, struct skin* load, char* link, char* title, char* searchstr, int flag);
 
 void titheklog(int debuglevel, char* name1, char* name2, char* name3, char* name4, char* content)