diff --git a/epg.sh b/epg.sh index baafbc8..0f48a06 100755 --- a/epg.sh +++ b/epg.sh @@ -22,7 +22,7 @@ clear echo " --------------------------------------------" echo " EASYEPG SIMPLE XMLTV GRABBER " -echo " Release v0.4.0 BETA - 2019/07/09 " +echo " Release v0.4.0 BETA " echo " powered by " echo " " echo " ==THE=======================================" @@ -587,7 +587,7 @@ fi cd $(pwd) echo "DIR=$(pwd)" > /tmp/initrun.txt -echo "VER=v0.4.0" >> /tmp/initrun.txt +echo "VER=v0.4.0 2019/10/07" >> /tmp/initrun.txt # # CHECK INTERNET CONNECTIVITY diff --git a/prog_combine.pl b/prog_combine.pl index eb31842..c45ddba 100755 --- a/prog_combine.pl +++ b/prog_combine.pl @@ -165,9 +165,9 @@ } } else { if( defined $title_lang ) { - print " No programme available\n"; + print " No program information available\n"; } else { - print " No programme available\n"; + print " No program information available\n"; } } @@ -308,9 +308,9 @@ } } else { if( defined $title_lang ) { - print " No programme available\n"; + print " No program information available\n"; } else { - print " No programme available\n"; + print " No program information available\n"; } } @@ -451,9 +451,9 @@ } } else { if( defined $title_lang ) { - print " No programme available\n"; + print " No program information available\n"; } else { - print " No programme available\n"; + print " No program information available\n"; } } @@ -594,9 +594,9 @@ } } else { if( defined $title_lang ) { - print " No programme available\n"; + print " No program information available\n"; } else { - print " No programme available\n"; + print " No program information available\n"; } } @@ -737,9 +737,9 @@ } } else { if( defined $title_lang ) { - print " No programme available\n"; + print " No program information available\n"; } else { - print " No programme available\n"; + print " No program information available\n"; } } @@ -880,9 +880,9 @@ } } else { if( defined $title_lang ) { - print " No programme available\n"; + print " No program information available\n"; } else { - print " No programme available\n"; + print " No program information available\n"; } } @@ -1023,9 +1023,9 @@ } } else { if( defined $title_lang ) { - print " No programme available\n"; + print " No program information available\n"; } else { - print " No programme available\n"; + print " No program information available\n"; } } @@ -1166,9 +1166,9 @@ } } else { if( defined $title_lang ) { - print " No programme available\n"; + print " No program information available\n"; } else { - print " No programme available\n"; + print " No program information available\n"; } } @@ -1309,9 +1309,9 @@ } } else { if( defined $title_lang ) { - print " No programme available\n"; + print " No program information available\n"; } else { - print " No programme available\n"; + print " No program information available\n"; } } @@ -1452,9 +1452,9 @@ } } else { if( defined $title_lang ) { - print " No programme available\n"; + print " No program information available\n"; } else { - print " No programme available\n"; + print " No program information available\n"; } } @@ -1595,9 +1595,9 @@ } } else { if( defined $title_lang ) { - print " No programme available\n"; + print " No program information available\n"; } else { - print " No programme available\n"; + print " No program information available\n"; } } @@ -1738,9 +1738,9 @@ } } else { if( defined $title_lang ) { - print " No programme available\n"; + print " No program information available\n"; } else { - print " No programme available\n"; + print " No program information available\n"; } } @@ -1881,9 +1881,9 @@ } } else { if( defined $title_lang ) { - print " No programme available\n"; + print " No program information available\n"; } else { - print " No programme available\n"; + print " No program information available\n"; } } @@ -2024,9 +2024,9 @@ } } else { if( defined $title_lang ) { - print " No programme available\n"; + print " No program information available\n"; } else { - print " No programme available\n"; + print " No program information available\n"; } } @@ -2165,9 +2165,9 @@ } } else { if( defined $title_lang ) { - print " No programme available\n"; + print " No program information available\n"; } else { - print " No programme available\n"; + print " No program information available\n"; } } diff --git a/testing.sh b/testing.sh new file mode 100644 index 0000000..b78ccee --- /dev/null +++ b/testing.sh @@ -0,0 +1,185 @@ +#!/bin/bash + +# ######################### +# USE TESTING BRANCH # +# ######################### + +# GIT CLONE + +git clone https://github.com/sunsettrack4/easyepg --branch TESTING + +# MAIN +echo "Updating main..." + +cp easyepg/epg.sh epg.sh 2> /dev/null +cp easyepg/ch_combine.pl ch_combine.pl 2> /dev/null +cp easyepg/combine.sh combine.sh 2> /dev/null +cp easyepg/prog_combine.pl prog_combine.pl 2> /dev/null +cp easyepg/LICENSE LICENSE 2> /dev/null +cp easyepg/update.sh update.sh 2> /dev/null + + +# HORIZON +echo "Updating Horizon..." + +mkdir hzn 2> /dev/null + +echo "hzn/ hzn/de/ hzn/at/ hzn/ch/ hzn/nl/ hzn/pl/ hzn/ie/ hzn/sk/ hzn/cz/ hzn/hu/ hzn/ro/" | xargs -n 1 cp -v easyepg/hzn/hzn.sh 2> /dev/null +echo "hzn/ hzn/de/ hzn/at/ hzn/ch/ hzn/nl/ hzn/pl/ hzn/ie/ hzn/sk/ hzn/cz/ hzn/hu/ hzn/ro/" | xargs -n 1 cp -v easyepg/hzn/ch_json2xml.pl 2> /dev/null +echo "hzn/ hzn/de/ hzn/at/ hzn/ch/ hzn/nl/ hzn/pl/ hzn/ie/ hzn/sk/ hzn/cz/ hzn/hu/ hzn/ro/" | xargs -n 1 cp -v easyepg/hzn/cid_json.pl 2> /dev/null +echo "hzn/ hzn/de/ hzn/at/ hzn/ch/ hzn/nl/ hzn/pl/ hzn/ie/ hzn/sk/ hzn/cz/ hzn/hu/ hzn/ro/" | xargs -n 1 cp -v easyepg/hzn/epg_json2xml.pl 2> /dev/null +echo "hzn/ hzn/de/ hzn/at/ hzn/ch/ hzn/nl/ hzn/pl/ hzn/ie/ hzn/sk/ hzn/cz/ hzn/hu/ hzn/ro/" | xargs -n 1 cp -v easyepg/hzn/settings.sh 2> /dev/null +echo "hzn/ hzn/de/ hzn/at/ hzn/ch/ hzn/nl/ hzn/pl/ hzn/ie/ hzn/sk/ hzn/cz/ hzn/hu/ hzn/ro/" | xargs -n 1 cp -v easyepg/hzn/chlist_printer.pl 2> /dev/null +echo "hzn/ hzn/de/ hzn/at/ hzn/ch/ hzn/nl/ hzn/pl/ hzn/ie/ hzn/sk/ hzn/cz/ hzn/hu/ hzn/ro/" | xargs -n 1 cp -v easyepg/hzn/compare_menu.pl.sh 2> /dev/null +echo "hzn/ hzn/de/ hzn/at/ hzn/ch/ hzn/nl/ hzn/pl/ hzn/ie/ hzn/sk/ hzn/cz/ hzn/hu/ hzn/ro/" | xargs -n 1 cp -v easyepg/hzn/hzn.sh 2> /dev/null +echo "hzn/ hzn/de/ hzn/at/ hzn/ch/ hzn/nl/ hzn/pl/ hzn/ie/ hzn/sk/ hzn/cz/ hzn/hu/ hzn/ro/" | xargs -n 1 cp -v easyepg/hzn/hzn.sh 2> /dev/null + +sed 's/XX/DE/g;s/YYY/deu/g' easyepg/hzn/url_printer.pl > hzn/de/url_printer.pl 2> /dev/null +sed 's/XX/AT/g;s/YYY/deu/g' easyepg/hzn/url_printer.pl > hzn/at/url_printer.pl 2> /dev/null +sed 's/XX/CH/g;s/YYY/deu/g' easyepg/hzn/url_printer.pl > hzn/ch/url_printer.pl 2> /dev/null +sed 's/XX/NL/g;s/YYY/nld/g' easyepg/hzn/url_printer.pl > hzn/nl/url_printer.pl 2> /dev/null +sed 's/XX/PL/g;s/YYY/pol/g' easyepg/hzn/url_printer.pl > hzn/pl/url_printer.pl 2> /dev/null +sed 's/XX/IE/g;s/YYY/eng/g' easyepg/hzn/url_printer.pl > hzn/ie/url_printer.pl 2> /dev/null +sed 's/XX/SK/g;s/YYY/slk/g' easyepg/hzn/url_printer.pl > hzn/sk/url_printer.pl 2> /dev/null +sed 's/XX/CZ/g;s/YYY/ces/g' easyepg/hzn/url_printer.pl > hzn/cz/url_printer.pl 2> /dev/null +sed 's/XX/HU/g;s/YYY/hun/g' easyepg/hzn/url_printer.pl > hzn/hu/url_printer.pl 2> /dev/null +sed 's/XX/RO/g;s/YYY/ron/g' easyepg/hzn/url_printer.pl > hzn/ro/url_printer.pl 2> /dev/null + + +# ZATTOO +echo "Updating Zattoo..." + +mkdir ztt 2> /dev/null + +echo "ztt/ ztt/de/ ztt/ch/" | xargs -n 1 cp -v easyepg/ztt/ztt.sh 2> /dev/null +echo "ztt/ ztt/de/ ztt/ch/" | xargs -n 1 cp -v easyepg/ztt/compare_crid.pl 2> /dev/null +echo "ztt/ ztt/de/ ztt/ch/" | xargs -n 1 cp -v easyepg/ztt/save_page.js 2> /dev/null +echo "ztt/ ztt/de/ ztt/ch/" | xargs -n 1 cp -v easyepg/ztt/epg_json2xml.pl 2> /dev/null +echo "ztt/ ztt/de/ ztt/ch/" | xargs -n 1 cp -v easyepg/ztt/ch_json2xml.pl 2> /dev/null +echo "ztt/ ztt/de/ ztt/ch/" | xargs -n 1 cp -v easyepg/ztt/cid_json.pl 2> /dev/null +echo "ztt/ ztt/de/ ztt/ch/" | xargs -n 1 cp -v easyepg/ztt/chlist_printer.pl 2> /dev/null +echo "ztt/ ztt/de/ ztt/ch/" | xargs -n 1 cp -v easyepg/ztt/compare_menu.pl 2> /dev/null + +sed 's/\[XX\]/[DE]/g;s/XXXX/DE/g' easyepg/ztt/settings.sh > ztt/de/settings.sh 2> /dev/null +sed 's/\[XX\]/[CH]/g;s/XXXX/CH/g' easyepg/ztt/settings.sh > ztt/ch/settings.sh 2> /dev/null + + +# SWISSCOM +echo "Updating Swisscom..." + +mkdir swc 2> /dev/null + +echo "swc/ swc/ch/" | xargs -n 1 cp -v easyepg/swc/swc.sh 2> /dev/null +echo "swc/ swc/ch/" | xargs -n 1 cp -v easyepg/swc/settings.sh 2> /dev/null +echo "swc/ swc/ch/" | xargs -n 1 cp -v easyepg/swc/epg_json2xml.pl 2> /dev/null +echo "swc/ swc/ch/" | xargs -n 1 cp -v easyepg/swc/ch_json2xml.pl 2> /dev/null +echo "swc/ swc/ch/" | xargs -n 1 cp -v easyepg/swc/cid_json.pl 2> /dev/null +echo "swc/ swc/ch/" | xargs -n 1 cp -v easyepg/swc/chlist_printer.pl 2> /dev/null +echo "swc/ swc/ch/" | xargs -n 1 cp -v easyepg/swc/compare_menu.pl 2> /dev/null +echo "swc/ swc/ch/" | xargs -n 1 cp -v easyepg/swc/url_printer.pl 2> /dev/null + + +# TVPLAYER +echo "Updating tvPlayer..." + +mkdir tvp 2> /dev/null + +echo "tvp/ tvp/uk/" | xargs -n 1 cp -v easyepg/tvp/tvp.sh 2> /dev/null +echo "tvp/ tvp/uk/" | xargs -n 1 cp -v easyepg/tvp/settings.sh 2> /dev/null +echo "tvp/ tvp/uk/" | xargs -n 1 cp -v easyepg/tvp/epg_json2xml.pl 2> /dev/null +echo "tvp/ tvp/uk/" | xargs -n 1 cp -v easyepg/tvp/ch_json2xml.pl 2> /dev/null +echo "tvp/ tvp/uk/" | xargs -n 1 cp -v easyepg/tvp/cid_json.pl 2> /dev/null +echo "tvp/ tvp/uk/" | xargs -n 1 cp -v easyepg/tvp/chlist_printer.pl 2> /dev/null +echo "tvp/ tvp/uk/" | xargs -n 1 cp -v easyepg/tvp/compare_menu.pl 2> /dev/null + + +# TELEKOM +echo "Updating Telekom..." + +mkdir tkm 2> /dev/null + +echo "tkm/ tkm/de/" | xargs -n 1 cp -v easyepg/tkm/tkm.sh 2> /dev/null +echo "tkm/ tkm/de/" | xargs -n 1 cp -v easyepg/tkm/settings.sh 2> /dev/null +echo "tkm/ tkm/de/" | xargs -n 1 cp -v easyepg/tkm/epg_json2xml.pl 2> /dev/null +echo "tkm/ tkm/de/" | xargs -n 1 cp -v easyepg/tkm/ch_json2xml.pl 2> /dev/null +echo "tkm/ tkm/de/" | xargs -n 1 cp -v easyepg/tkm/cid_json.pl 2> /dev/null +echo "tkm/ tkm/de/" | xargs -n 1 cp -v easyepg/tkm/chlist_printer.pl 2> /dev/null +echo "tkm/ tkm/de/" | xargs -n 1 cp -v easyepg/tkm/compare_menu.pl 2> /dev/null +echo "tkm/ tkm/de/" | xargs -n 1 cp -v easyepg/tkm/url_printer.pl 2> /dev/null +echo "tkm/ tkm/de/" | xargs -n 1 cp -v easyepg/tkm/proxy.sh 2> /dev/null +echo "tkm/ tkm/de/" | xargs -n 1 cp -v easyepg/tkm/web_magentatv_de.php 2> /dev/null + +# RADIOTIMES +echo "Updating RadioTimes..." + +mkdir rdt 2> /dev/null + +echo "rdt/ rdt/uk/" | xargs -n 1 cp -v easyepg/rdt/rdt.sh 2> /dev/null +echo "rdt/ rdt/uk/" | xargs -n 1 cp -v easyepg/rdt/settings.sh 2> /dev/null +echo "rdt/ rdt/uk/" | xargs -n 1 cp -v easyepg/rdt/epg_json2xml.pl 2> /dev/null +echo "rdt/ rdt/uk/" | xargs -n 1 cp -v easyepg/rdt/ch_json2xml.pl 2> /dev/null +echo "rdt/ rdt/uk/" | xargs -n 1 cp -v easyepg/rdt/cid_json.pl 2> /dev/null +echo "rdt/ rdt/uk/" | xargs -n 1 cp -v easyepg/rdt/chlist_printer.pl 2> /dev/null +echo "rdt/ rdt/uk/" | xargs -n 1 cp -v easyepg/rdt/compare_menu.pl 2> /dev/null +echo "rdt/ rdt/uk/" | xargs -n 1 cp -v easyepg/rdt/compare_crid.pl 2> /dev/null +echo "rdt/ rdt/uk/" | xargs -n 1 cp -v easyepg/rdt/url_printer.pl 2> /dev/null + + +# WAIPU.TV +echo "Updating waipu.tv..." + +mkdir wpu 2> /dev/null + +echo "wpu/ wpu/de/" | xargs -n 1 cp -v easyepg/wpu/wpu.sh 2> /dev/null +echo "wpu/ wpu/de/" | xargs -n 1 cp -v easyepg/wpu/settings.sh 2> /dev/null +echo "wpu/ wpu/de/" | xargs -n 1 cp -v easyepg/wpu/epg_json2xml.pl 2> /dev/null +echo "wpu/ wpu/de/" | xargs -n 1 cp -v easyepg/wpu/ch_json2xml.pl 2> /dev/null +echo "wpu/ wpu/de/" | xargs -n 1 cp -v easyepg/wpu/cid_json.pl 2> /dev/null +echo "wpu/ wpu/de/" | xargs -n 1 cp -v easyepg/wpu/chlist_printer.pl 2> /dev/null +echo "wpu/ wpu/de/" | xargs -n 1 cp -v easyepg/wpu/compare_menu.pl 2> /dev/null + +# TV-Spielfilm +echo "Updating TV-Spielfilm..." + +mkdir tvs 2> /dev/null + +echo "tvs/ tvs/de/" | xargs -n 1 cp -v easyepg/tvs/tvs.sh 2> /dev/null +echo "tvs/ tvs/de/" | xargs -n 1 cp -v easyepg/tvs/settings.sh 2> /dev/null +echo "tvs/ tvs/de/" | xargs -n 1 cp -v easyepg/tvs/epg_json2xml.pl 2> /dev/null +echo "tvs/ tvs/de/" | xargs -n 1 cp -v easyepg/tvs/ch_json2xml.pl 2> /dev/null +echo "tvs/ tvs/de/" | xargs -n 1 cp -v easyepg/tvs/cid_json.pl 2> /dev/null +echo "tvs/ tvs/de/" | xargs -n 1 cp -v easyepg/tvs/chlist_printer.pl 2> /dev/null +echo "tvs/ tvs/de/" | xargs -n 1 cp -v easyepg/tvs/compare_menu.pl 2> /dev/null +echo "tvs/ tvs/de/" | xargs -n 1 cp -v easyepg/tvs/url_printer.pl 2> /dev/null + +# VODAFONE +echo "Updating VODAFONE..." + +mkdir vdf 2> /dev/null + +echo "vdf/ vdf/de/" | xargs -n 1 cp -v easyepg/vdf/vdf.sh 2> /dev/null +echo "vdf/ vdf/de/" | xargs -n 1 cp -v easyepg/vdf/settings.sh 2> /dev/null +echo "vdf/ vdf/de/" | xargs -n 1 cp -v easyepg/vdf/epg_json2xml.pl 2> /dev/null +echo "vdf/ vdf/de/" | xargs -n 1 cp -v easyepg/vdf/ch_json2xml.pl 2> /dev/null +echo "vdf/ vdf/de/" | xargs -n 1 cp -v easyepg/vdf/compare_crid.pl 2> /dev/null +echo "vdf/ vdf/de/" | xargs -n 1 cp -v easyepg/vdf/cid_json.pl 2> /dev/null +echo "vdf/ vdf/de/" | xargs -n 1 cp -v easyepg/vdf/chlist_printer.pl 2> /dev/null +echo "vdf/ vdf/de/" | xargs -n 1 cp -v easyepg/vdf/compare_menu.pl 2> /dev/null +echo "vdf/ vdf/de/" | xargs -n 1 cp -v easyepg/vdf/url_printer.pl 2> /dev/null + +# EXTERNAL +echo "Updating External..." + +mkdir ext 2> /dev/null + +echo "ext/ ext/oa/ ext/ob/ ext/oc/" | xargs -n 1 cp -v easyepg/ext/ext.sh 2> /dev/null +echo "ext/ ext/oa/ ext/ob/ ext/oc/" | xargs -n 1 cp -v easyepg/ext/settings.sh 2> /dev/null +echo "ext/ ext/oa/ ext/ob/ ext/oc/" | xargs -n 1 cp -v easyepg/ext/epg_ext.pl 2> /dev/null +echo "ext/ ext/oa/ ext/ob/ ext/oc/" | xargs -n 1 cp -v easyepg/ext/ch_ext.pl 2> /dev/null +echo "ext/ ext/oa/ ext/ob/ ext/oc/" | xargs -n 1 cp -v easyepg/ext/compare_menu.pl 2> /dev/null + +echo "CLEAN" +rm -rf easyepg/ + +# DONE +echo "UPDATE FINISHED! --> Branch TESTING" diff --git a/tvs/tvs.sh b/tvs/tvs.sh index c7b1f9f..892f2b7 100644 --- a/tvs/tvs.sh +++ b/tvs/tvs.sh @@ -83,8 +83,9 @@ if [ $(wc -l < mani/common) -ge 7 ] then number=$(echo $(( $(wc -l < mani/common) / 7))) - split -l $number --numeric-suffixes mani/common mani/day - + split --lines=$(( $number + 1 )) --numeric-suffixes mani/common mani/day + + rm mani/common 2> /dev/null else cp mani/common mani/day00 fi @@ -123,7 +124,7 @@ function status_manifest_download { z100="[####################]" df=$(find mani/ -type f | wc -l) ; - ftd=$(wc -l < mani/common) ; + if [ -e mani/common ]; then ftd=$(wc -l < mani/common); else ftd=$(wc -l < mani/day00); fi; status=$(expr $df \* 100 / $ftd - 2) ; if [[ $status -gt 100 || $status -eq 100 ]]; then status="100"; fi if [[ $status -gt 0 && $status -lt 5 || $status -eq 0 ]]; then bar="$z0"; elif [[ $status -gt 5 && $status -lt 10 ]]; then bar="$z5"; elif [[ $status -gt 10 && $status -lt 15 ]] ; then bar="$z10"; elif [[ $status -gt 15 && $status -lt 20 ]] ; then bar="$z15"; elif [[ $status -gt 20 && $status -lt 25 ]] ; then bar="$z20"; elif [[ $status -gt 25 && $status -lt 30 ]] ; then bar="$z25"; elif [[ $status -gt 30 && $status -lt 35 ]] ; then bar="$z30"; elif [[ $status -gt 35 && $status -lt 40 ]] ; then bar="$z35"; elif [[ $status -gt 40 && $status -lt 45 ]] ; then bar="$z40"; elif [[ $status -gt 40 && $status -lt 50 ]] ; then bar="$z45"; elif [[ $status -gt 50 && $status -lt 55 ]] ; then bar="$z50"; elif [[ $status -gt 55 && $status -lt 60 ]] ; then bar="$z55"; elif [[ $status -gt 60 && $status -lt 65 ]] ; then bar="$z60"; elif [[ $status -gt 60 && $status -lt 70 ]] ; then bar="$z65"; elif [[ $status -gt 70 && $status -lt 75 ]] ; then bar="$z70"; elif [[ $status -gt 70 && $status -lt 80 ]] ; then bar="$z75"; elif [[ $status -gt 80 && $status -lt 85 ]] ; then bar="$z80"; elif [[ $status -gt 85 && $status -lt 90 ]] ; then bar="$z85"; elif [[ $status -gt 90 && $status -lt 95 ]] ; then bar="$z90"; elif [[ $status -gt 95 && $status -lt 100 ]] ; then bar="$z95"; elif [ $status -eq 100 ] ; then bar="$z100";fi diff --git a/update.sh b/update.sh index c0c0ee7..c129b59 100755 --- a/update.sh +++ b/update.sh @@ -33,6 +33,7 @@ cp easyepg/prog_combine.pl prog_combine.pl 2> /dev/null cp easyepg/LICENSE LICENSE 2> /dev/null cp easyepg/update.sh update.sh 2> /dev/null cp easyepg/branch-debaschdi.sh branch-debaschdi.sh 2> /dev/null +cp easyepg/testing.sh testing.sh 2> /dev/null # HORIZON echo "Updating Horizon..." diff --git a/ztt/ztt.sh b/ztt/ztt.sh index 6b340ed..3d9a6c7 100755 --- a/ztt/ztt.sh +++ b/ztt/ztt.sh @@ -887,7 +887,7 @@ done perl chlist_printer.pl > /tmp/compare.json -rm /tmp/duplicate_checker 2> /dev/null +rm /tmp/duplicate_checker errors.txt 2> /dev/null for time in {1..14..1} do @@ -900,7 +900,6 @@ do rm day/daydlnew_${time}_${part} day/datafile_${time}_${part} 2> /dev/null touch day/day${time} - rm errors.txt 2> /dev/null cat /tmp/errors_${time}_${part}.txt >> errors.txt 2> /dev/null done done