Changeset 36972

Timestamp:

01/28/16 01:29:06 (8 years ago)

Author:

obi

Message:

fix

Location:

titan

Files:

• mediathek/localparser_secret/beeg.sh (modified) (3 diffs)
• mediathek/localparser_secret/bs.sh (modified) (6 diffs)
• plugins/tithek/tithek_global.h (modified) (3 diffs)

titan/mediathek/localparser_secret/beeg.sh

@@ -64 +64 @@
       }
 /^\}/ { if (table == "videos") {
-           print title "#" SRC " " SRC " stream video/" id "#https://img.beeg.com/236x177/" id ".jpg#" PARSER "_" id ".jpg#" NAME "#111"
+           print title "#" SRC " " SRC " play video/" id "#https://img.beeg.com/236x177/" id ".jpg#" PARSER "_" id ".jpg#" NAME "#111"
            title = ""
            id = ""
@@ -95 +95 @@
 }
 
-stream()
+play()
 {
         $curlbin -o - $URL$PARAM | sed -e 's/{/{\n/g' -e 's/,/,\n/g' -e 's/\[/\[\n/g' -e 's/\}/\n\}/g' -e 's/\]/\n\]/g' | awk -v PARSER=$PARSER -v NAME=$NAME '
@@ -273 +273 @@
         mainmenu) $INPUT;;
         videos) $INPUT;;
-        stream) $INPUT;;
+        play) $INPUT;;
         tags) $INPUT;;
         page) $INPUT;;

titan/mediathek/localparser_secret/bs.sh

@@ +1 @@
+
 #!/bin/bash
 # titannit box parser for burning series
@@ -145 +146 @@
 /<\/tr>/ { if (in_table_row == 1) {
              if (episode != "") {
-                print title "#" SRC " " SRC " hoster " url "#http://atemio.dyndns.tv/mediathek/menu/s" PARAM2 "e" episode ".jpg#s" PARAM2 "e" episode ".jpg#" NAME "#0"
+                print title "#" SRC " " SRC " hosterlist " url "#http://atemio.dyndns.tv/mediathek/menu/s" PARAM2 "e" episode ".jpg#s" PARAM2 "e" episode ".jpg#" NAME "#0"
                 title = ""
                 url = ""
@@ -161 +162 @@
 }
 
-hoster()
+hosterlist()
 {
         $wgetbin $URL$PARAM -O - | awk -v PARAM=$PARAM -v PARAM2=$PARAM2 -v SRC=$SRC -v NAME=$NAME '
-BEGIN { in_hoster = 0
+BEGIN { in_hosterlist = 0
         url = ""
         title = ""
       }
 
-/<h3>Hoster dieser Episode<\/h3>/ { in_hoster = 1
+/<h3>Hoster dieser Episode<\/h3>/ { in_hosterlist = 1
                                     next
                                   }
 
-/href=\"/ { if (in_hoster == 1) {
+/href=\"/ { if (in_hosterlist == 1) {
                i = index($0, "href=\"") + 6
                j = index(substr($0, i), "\">") - 1
@@ -181 +182 @@
           }
 
-/<\/span> / { if (in_hoster == 1) {
+/<\/span> / { if (in_hosterlist == 1) {
                  i = index($0, "</span> ") + 8
                  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 "#111"
+                 i = index($0, "</span> ") + 8
+                 j = index(substr($0, i), " -") - 1
+                 pic = substr($0, i, j)
+                 pic = tolower(pic)
+                 print title "#" SRC " " SRC " hoster " url "#http://atemio.dyndns.tv/mediathek/menu/" pic ".jpg#" pic ".jpg#" NAME "#111"
               }
               next
             }
 
-/<\/ul>/ { in_hoster = 0
+/<\/ul>/ { in_hosterlist = 0
           next
         }
 
-' >/tmp/tithek/$PARSER.hoster.list
-        echo "/tmp/tithek/$PARSER.hoster.list"
-}
-
-video()
+' >/tmp/tithek/$PARSER.hosterlist.list
+        echo "/tmp/tithek/$PARSER.hosterlist.list"
+}
+
+hoster()
 {
         $wgetbin $URL$PARAM -O - | awk -v PARAM=$PARAM -v PARAM2=$PARAM2 -v SRC=$SRC -v NAME=$NAME '
-BEGIN { in_hoster = 0
+BEGIN { in_hosterlist = 0
         url = ""
         title = ""
       }
 
-/<div id=\"video_actions\">/ { in_video = 1
+/<div id=\"video_actions\">/ { in_hoster = 1
                                next
                              }
 
-/<a href=\"/ { if (in_video == 1) {
+/<a href=\"/ { if (in_hoster == 1) {
                   i = index($0, "<a href=\"") + 9
                   j = index(substr($0, i), "\"") - 1
@@ -226 +231 @@
              }
 
-/<\/div>/ { in_video = 0
+/<\/div>/ { in_hoster = 0
             next
           }
 
-' >/tmp/tithek/$PARSER.video.list
-#       echo "/tmp/tithek/$PARSER.video.list"
-        cat     "/tmp/tithek/$PARSER.video.list"
+' >/tmp/tithek/$PARSER.hoster.list
+#       echo "/tmp/tithek/$PARSER.hoster.list"
+        cat     "/tmp/tithek/$PARSER.hoster.list"
 }
 
@@ -242 +247 @@
         staffel) $INPUT;;
         episode) $INPUT;;
+        hosterlist) $INPUT;;
         hoster) $INPUT;;
-        video) $INPUT;;
 esac
 

titan/plugins/tithek/tithek_global.h

@@ -80 +80 @@
         else if(ostrstr(tmplink, "zerocast") != NULL)
                 streamurl = zerocast(url, 0);
-        else if(ostrstr(tmplink, "beeg") != NULL)
-                streamurl = beeg(url);
         else
                 textbox(_("Message"), _("The hoster is not yet supported !"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, 5, 0);
@@ -703 +701 @@
         tmpstr = string_newline(tmpstr);
 
-printf("tmpstr: %s\n", tmpstr); 
-        streamurl = hoster(tmpstr);
-        if(streamurl == NULL)
+        if(ostrstr(link, ".sh play") != NULL)
                 streamurl = ostrcat(tmpstr, NULL, 0, 0);
-printf("streamurl: %s\n", streamurl);   
+        else if(ostrstr(link, ".sh hoster") != NULL)
+                streamurl = hoster(tmpstr);
 
         free(tmpstr), tmpstr = NULL;
@@ -714 +711 @@
 }
 
-
-//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)
 {
-printf("localparser_search: %s\n", link);
-
         char* tmpstr = NULL, *tmpstr1 = NULL, *line = NULL, *menu = NULL, *search = NULL;
         int ret = 1, count = 0, i = 0;