support latest merge

matthuisman · May 13, 2021 · f84343a · f84343a
1 parent 03b3389
commit f84343a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 15 deletions.
diff --git a/iptv_merge.m3u8.sh b/iptv_merge.m3u8.sh
@@ -3,10 +3,5 @@
 SCRIPT="$(realpath $0)"
 SCRIPT_PATH="$(dirname $SCRIPT)"
 
-PLAYLIST_PATH="$(proxy_type=TV_GRAB $SCRIPT_PATH/.env/bin/python $SCRIPT_PATH/proxy.py 'plugin://plugin.program.iptv.merge/?_=proxy_merge&type=playlist' | cut -c 2-)"
-
-if [ $? -eq 200 ]; then
-    cat "$PLAYLIST_PATH" | sed -E "s|(^plugin://.*?$)|pipe://$SCRIPT_PATH/tvh.sh \"\1\"|g" | sed -E "s|tvg-logo=\"(/.*?)\"|tvg-logo=\"file://\1\"|g"
-else
-    >&2 echo "$PLAYLIST_PATH"
-fi
+PLAYLIST_PATH="$(proxy_type=TV_GRAB $SCRIPT_PATH/.env/bin/python $SCRIPT_PATH/proxy.py 'plugin://plugin.program.iptv.merge/?_=run_merge&type=playlist' | cut -c 2-)"
+cat "$PLAYLIST_PATH" | sed -E "s|(^plugin://.*?$)|pipe://$SCRIPT_PATH/tvh.sh \"\1\"|g" | sed -E "s|tvg-logo=\"(/.*?)\"|tvg-logo=\"file://\1\"|g"
diff --git a/tv_grab_iptv_merge b/tv_grab_iptv_merge
@@ -9,14 +9,8 @@ VERSION="1.0"
 if [ $# -lt 1 ]; then
     >&2 echo "Running iptv.merge plugin..."
 
-    EPG_PATH="$(proxy_type=TV_GRAB $SCRIPT_PATH/.env/bin/python $SCRIPT_PATH/proxy.py 'plugin://plugin.program.iptv.merge/?_=proxy_merge&type=epg' | cut -c 2-)"
-
-    if [ $? -eq 200 ]; then
-        cat "$EPG_PATH"
-    else
-        >&2 echo "$EPG_PATH"
-    fi
-
+    EPG_PATH="$(proxy_type=TV_GRAB $SCRIPT_PATH/.env/bin/python $SCRIPT_PATH/proxy.py 'plugin://plugin.program.iptv.merge/?_=run_merge&type=epg' | cut -c 2-)"
+    cat "$EPG_PATH"
     exit 0
 fi