Skip to content

Commit f14db4e

Browse files
DeBaschdiDeBaschdi
committed
Add Provider tvtvus (complete)
1 parent 9c5ce59 commit f14db4e

39 files changed

+689
-142
lines changed

‎.github/FUNDING.yml

100644100755
File mode changed.

‎README.md

100644100755
File mode changed.

‎backup.sh

100644100755
+50
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,34 @@ else
304304
echo "Skipping backup: Vodafone DE - no setup found"
305305
fi
306306

307+
# TVTV US
308+
309+
if [ -e tvtv/us ]
310+
then
311+
echo "Backing up: TVTV USA"
312+
cp tvtv/us/user/userfile easyepg_backup/tvtv_us_user_userfile
313+
cp tvtv/us/chlist_old easyepg_backup/tvtv_us_chlist_old
314+
cp tvtv/us/channels.json easyepg_backup/tvtv_us_channels.json
315+
cp tvtv/us/init.json easyepg_backup/tvtv_us_init.json
316+
cp tvtv/us/settings.json easyepg_backup/tvtv_us_settings.json
317+
else
318+
echo "Skipping backup: TVTV USA - no setup found"
319+
fi
320+
321+
# TVTV CA
322+
323+
if [ -e tvtv/ca ]
324+
then
325+
echo "Backing up: TVTV CANNADA"
326+
cp tvtv/ca/user/userfile easyepg_backup/tvtv_ca_user_userfile
327+
cp tvtv/ca/chlist_old easyepg_backup/tvtv_ca_chlist_old
328+
cp tvtv/ca/channels.json easyepg_backup/tvtv_ca_channels.json
329+
cp tvtv/ca/init.json easyepg_backup/tvtv_ca_init.json
330+
cp tvtv/ca/settings.json easyepg_backup/tvtv_ca_settings.json
331+
else
332+
echo "Skipping backup: TVTV CANNADA - no setup found"
333+
fi
334+
307335
# EXTERNAL 1
308336

309337
if [ -e ext/oa ]
@@ -536,6 +564,26 @@ else
536564
echo "Skipping backup: Vodafone DE - XML file not found"
537565
fi
538566

567+
# TVTV US
568+
569+
if [ -e xml/tvtv_us.xml ]
570+
then
571+
echo "Backing up XML: TVTV US"
572+
cp xml/tvtv_us.xml easyepg_backup/xml_tvtv_us.xml
573+
else
574+
echo "Skipping backup: TVTV USA - XML file not found"
575+
fi
576+
577+
# ZATTOO CH
578+
579+
if [ -e xml/tvtv_ca.xml ]
580+
then
581+
echo "Backing up XML: TVTV CANNADA"
582+
cp xml/tvtv_ca.xml easyepg_backup/xml_tvtv_ca.xml
583+
else
584+
echo "Skipping backup: TVTV CANNADA - XML file not found"
585+
fi
586+
539587
# EXTERNAL 1
540588

541589
if [ -e xml/external_oa.xml ]
@@ -621,6 +669,8 @@ do
621669
cp combine/$folder/wpu_de_channels.json easyepg_backup/combine_$folder-wpu_de_channels.json 2> /dev/null
622670
cp combine/$folder/tvs_de_channels.json easyepg_backup/combine_$folder-tvs_de_channels.json 2> /dev/null
623671
cp combine/$folder/vdf_de_channels.json easyepg_backup/combine_$folder-vdf_de_channels.json 2> /dev/null
672+
cp combine/$folder/tvtv_us_channels.json easyepg_backup/combine_$folder-tvtv_us_channels.json 2> /dev/null
673+
cp combine/$folder/tvtv_ca_channels.json easyepg_backup/combine_$folder-tvtv_ca_channels.json 2> /dev/null
624674
cp combine/$folder/ext_oa_channels.json easyepg_backup/combine_$folder-ext_oa_channels.json 2> /dev/null
625675
cp combine/$folder/ext_ob_channels.json easyepg_backup/combine_$folder-ext_ob_channels.json 2> /dev/null
626676
cp combine/$folder/ext_oc_channels.json easyepg_backup/combine_$folder-ext_oc_channels.json 2> /dev/null

‎branch-debaschdi.sh

100644100755
+35-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@ cp easyepg/combine.sh combine.sh 2> /dev/null
1717
cp easyepg/prog_combine.pl prog_combine.pl 2> /dev/null
1818
cp easyepg/LICENSE LICENSE 2> /dev/null
1919
cp easyepg/update.sh update.sh 2> /dev/null
20-
20+
cp easyepg/branch-debaschdi.sh branch-debaschdi.sh 2> /dev/null
21+
cp easyepg/testing.sh testing.sh 2> /dev/null
22+
cp easyepg/testing.sh testing.sh 2> /dev/null
23+
cp easyepg/backup.sh backup.sh 2> /dev/null
24+
cp easyepg/restore.sh restore.sh 2> /dev/null
2125

2226
# HORIZON
2327
echo "Updating Horizon..."
@@ -30,7 +34,7 @@ echo "hzn/ hzn/de/ hzn/at/ hzn/ch/ hzn/nl/ hzn/pl/ hzn/ie/ hzn/sk/ hzn/cz/ hzn/h
3034
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
3135
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
3236
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
33-
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
37+
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 2> /dev/null
3438
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
3539
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
3640

@@ -52,6 +56,7 @@ echo "Updating Zattoo..."
5256
mkdir ztt 2> /dev/null
5357

5458
echo "ztt/ ztt/de/ ztt/ch/" | xargs -n 1 cp -v easyepg/ztt/ztt.sh 2> /dev/null
59+
echo "ztt/ ztt/de/ ztt/ch/" | xargs -n 1 cp -v easyepg/ztt/settings.sh 2> /dev/null
5560
echo "ztt/ ztt/de/ ztt/ch/" | xargs -n 1 cp -v easyepg/ztt/compare_crid.pl 2> /dev/null
5661
echo "ztt/ ztt/de/ ztt/ch/" | xargs -n 1 cp -v easyepg/ztt/save_page.js 2> /dev/null
5762
echo "ztt/ ztt/de/ ztt/ch/" | xargs -n 1 cp -v easyepg/ztt/epg_json2xml.pl 2> /dev/null
@@ -178,6 +183,34 @@ echo "ext/ ext/oa/ ext/ob/ ext/oc/" | xargs -n 1 cp -v easyepg/ext/epg_ext.pl 2>
178183
echo "ext/ ext/oa/ ext/ob/ ext/oc/" | xargs -n 1 cp -v easyepg/ext/ch_ext.pl 2> /dev/null
179184
echo "ext/ ext/oa/ ext/ob/ ext/oc/" | xargs -n 1 cp -v easyepg/ext/compare_menu.pl 2> /dev/null
180185

186+
# TVTV
187+
echo "Updating TVTV..."
188+
189+
mkdir tvtv 2> /dev/null
190+
191+
echo "tvtv/ tvtv/us/ tvtv/ca/" | xargs -n 1 cp -v easyepg/tvtv/tvtv.sh 2> /dev/null
192+
echo "tvtv/ tvtv/us/ tvtv/ca/" | xargs -n 1 cp -v easyepg/tvtv/settings.sh 2> /dev/null
193+
echo "tvtv/ tvtv/us/ tvtv/ca/" | xargs -n 1 cp -v easyepg/tvtv/compare_crid.pl 2> /dev/null
194+
echo "tvtv/ tvtv/us/ tvtv/ca/" | xargs -n 1 cp -v easyepg/tvtv/save_page.js 2> /dev/null
195+
echo "tvtv/ tvtv/us/ tvtv/ca/" | xargs -n 1 cp -v easyepg/tvtv/epg_json2xml.pl 2> /dev/null
196+
echo "tvtv/ tvtv/us/ tvtv/ca/" | xargs -n 1 cp -v easyepg/tvtv/ch_json2xml.pl 2> /dev/null
197+
echo "tvtv/ tvtv/us/ tvtv/ca/" | xargs -n 1 cp -v easyepg/tvtv/cid_json.pl 2> /dev/null
198+
echo "tvtv/ tvtv/us/ tvtv/ca/" | xargs -n 1 cp -v easyepg/tvtv/chlist_printer.pl 2> /dev/null
199+
echo "tvtv/ tvtv/us/ tvtv/ca/" | xargs -n 1 cp -v easyepg/tvtv/compare_menu.pl 2> /dev/null
200+
echo "tvtv/ tvtv/us/ tvtv/ca/" | xargs -n 1 cp -v easyepg/tvtv/url_printer.pl 2> /dev/null
201+
202+
sed 's/XXX/us/g;s/ZZZ/2381D/g;s/YYY/USA/g;s/XYZ/USA/g' easyepg/tvtv/tvtv.sh > tvtv/us/tvtv.sh
203+
sed 's/XXX/us/g;s/ZZZ/2381D/g;s/YYY/USA/g;s/XYZ/USA/g' easyepg/tvtv/ch_json2xml.pl > tvtv/us/ch_json2xml.pl
204+
sed 's/XXX/us/g;s/ZZZ/2381D/g;s/YYY/USA/g;s/XYZ/USA/g' easyepg/tvtv/epg_json2xml.pl > tvtv/us/epg_json2xml.pl
205+
sed 's/XXX/us/g;s/ZZZ/2381D/g;s/YYY/USA/g;s/XYZ/USA/g' easyepg/tvtv/settings.sh > tvtv/us/settings.sh
206+
sed 's/XXX/us/g;s/ZZZ/2381D/g;s/YYY/USA/g;s/XYZ/USA/g' easyepg/tvtv/url_printer.pl > tvtv/us/url_printer.pl
207+
208+
sed 's/XXX/ca/g;s/ZZZ/1743/g;s/YYY/CANNADA/g;s/XYZ/CN/g' easyepg/tvtv/tvtv.sh > tvtv/ca/tvtv.sh
209+
sed 's/XXX/ca/g;s/ZZZ/1743/g;s/YYY/CANNADA/g;s/XYZ/CN/g' easyepg/tvtv/ch_json2xml.pl > tvtv/ca/ch_json2xml.pl
210+
sed 's/XXX/ca/g;s/ZZZ/1743/g;s/YYY/CANNADA/g;s/XYZ/CN/g' easyepg/tvtv/epg_json2xml.pl > tvtv/ca/epg_json2xml.pl
211+
sed 's/XXX/ca/g;s/ZZZ/1743/g;s/YYY/CANNADA/g;s/XYZ/CN/g' easyepg/tvtv/settings.sh > tvtv/ca/settings.sh
212+
sed 's/XXX/ca/g;s/ZZZ/1743/g;s/YYY/CANNADA/g;s/XYZ/CN/g' easyepg/tvtv/url_printer.pl > tvtv/ca/url_printer.pl
213+
181214
echo "CLEAN"
182215
rm -rf easyepg/
183216

‎combine.sh

+123-5
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,18 @@ then
241241
sed 's/<channel id="/"[VODAFONE DE] /g;s/">/" "" on \\/g' /tmp/xmlch >> /tmp/chmenu
242242
fi
243243

244+
if [ -e xml/tvtv_us.xml ]
245+
then
246+
grep 'channel id=' xml/tvtv_us.xml > /tmp/xmlch && cat /tmp/xmlch >> /tmp/xmlch2
247+
sed 's/<channel id="/"[TVTV USA] /g;s/">/" "" on \\/g' /tmp/xmlch >> /tmp/chmenu
248+
fi
249+
250+
if [ -e xml/tvtv_ca.xml ]
251+
then
252+
grep 'channel id=' xml/tvtv_ca.xml > /tmp/xmlch && cat /tmp/xmlch >> /tmp/xmlch2
253+
sed 's/<channel id="/"[TVTV CANNADA] /g;s/">/" "" on \\/g' /tmp/xmlch >> /tmp/chmenu
254+
fi
255+
244256
if [ -e xml/external_oa.xml ]
245257
then
246258
grep 'channel id=' xml/external_oa.xml > /tmp/xmlch && cat /tmp/xmlch >> /tmp/xmlch2
@@ -268,7 +280,7 @@ then
268280
rm /tmp/setupname /tmp/chduplicates 2> /dev/null
269281
else
270282
sed 's/\\\[/[/g;s/\\\]/]/g;s/\\(/(/g;s/\\)/)/g;s/\\\&/\&/g' /tmp/channels > /tmp/xmlch2
271-
sed -i 's/ "\[HORIZON [A-Z][A-Z]\] /\n/g;s/"\[HORIZON [A-Z][A-Z]\] //g;s/ "\[ZATTOO [A-Z][A-Z]\] /\n/g;s/"\[ZATTOO [A-Z][A-Z]\] //g;s/ "\[SWISSCOM [A-Z][A-Z]\] /\n/g;s/"\[SWISSCOM [A-Z][A-Z]\] //g;s/ "\[TVPLAYER [A-Z][A-Z]\] /\n/g;s/"\[TVPLAYER [A-Z][A-Z]\] //g;s/ "\[MAGENTATV [A-Z][A-Z]\] /\n/g;s/"\[MAGENTATV [A-Z][A-Z]\] //g;s/ "\[RADIOTIMES [A-Z][A-Z]\] /\n/g;s/"\[RADIOTIMES [A-Z][A-Z]\] //g;s/ "\[WAIPU.TV [A-Z][A-Z]\] /\n/g;s/"\[WAIPU.TV [A-Z][A-Z]\] //g;s/ "\[TV-SPIELFILM [A-Z][A-Z]\] /\n/g;s/"\[TV-SPIELFILM [A-Z][A-Z]\] //g;s/ "\[VODAFONE [A-Z][A-Z]\] /\n/g;s/"\[VODAFONE [A-Z][A-Z]\] //g;s/ "\[EXTERNAL [A-Z][A-Z]\] /\n/g;s/"\[EXTERNAL [A-Z][A-Z]\] //g;s/"//g;s/"//g' /tmp/xmlch2
283+
sed -i 's/ "\[HORIZON [A-Z][A-Z]\] /\n/g;s/"\[HORIZON [A-Z][A-Z]\] //g;s/ "\[ZATTOO [A-Z][A-Z]\] /\n/g;s/"\[ZATTOO [A-Z][A-Z]\] //g;s/ "\[SWISSCOM [A-Z][A-Z]\] /\n/g;s/"\[SWISSCOM [A-Z][A-Z]\] //g;s/ "\[TVPLAYER [A-Z][A-Z]\] /\n/g;s/"\[TVPLAYER [A-Z][A-Z]\] //g;s/ "\[MAGENTATV [A-Z][A-Z]\] /\n/g;s/"\[MAGENTATV [A-Z][A-Z]\] //g;s/ "\[RADIOTIMES [A-Z][A-Z]\] /\n/g;s/"\[RADIOTIMES [A-Z][A-Z]\] //g;s/ "\[WAIPU.TV [A-Z][A-Z]\] /\n/g;s/"\[WAIPU.TV [A-Z][A-Z]\] //g;s/ "\[TV-SPIELFILM [A-Z][A-Z]\] /\n/g;s/"\[TV-SPIELFILM [A-Z][A-Z]\] //g;s/ "\[VODAFONE [A-Z][A-Z]\] /\n/g;s/"\[VODAFONE [A-Z][A-Z]\] //g;s/ "\[TVTV [A-Z][A-Z]\] /\n/g;s/"\[TVTV [A-Z][A-Z]\] //g;s/ "\[EXTERNAL [A-Z][A-Z]\] /\n/g;s/"\[EXTERNAL [A-Z][A-Z]\] //g;s/"//g;s/"//g' /tmp/xmlch2
272284
sort /tmp/xmlch2 | uniq -d > /tmp/chduplicates
273285

274286
if [ -s /tmp/chduplicates ]
@@ -288,7 +300,7 @@ then
288300
if [ -s /tmp/channels ]
289301
then
290302
sed -i 's/\\\[/[/g;s/\\\]/]/g;s/\\(/(/g;s/\\)/)/g;s/\\\&/\&/g' /tmp/channels
291-
sed -i 's/ "\[HORIZON/\n"\[HORIZON/g;s/ "\[ZATTOO/\n"\[ZATTOO/g;s/ "\[SWISSCOM/\n"\[SWISSCOM/g;s/ "\[TVPLAYER/\n"\[TVPLAYER/g;s/ "\[MAGENTATV/\n"\[MAGENTATV/g;s/ "\[RADIOTIMES/\n"\[RADIOTIMES/g;s/ "\[WAIPU.TV/\n"\[WAIPU.TV/g;s/ "\[TV-SPIELFILM/\n"\[TV-SPIELFILM/g;s/ "\[VODAFONE/\n"\[VODAFONE/g;s/ "\[EXTERNAL/\n"\[EXTERNAL/g' /tmp/channels
303+
sed -i 's/ "\[HORIZON/\n"\[HORIZON/g;s/ "\[ZATTOO/\n"\[ZATTOO/g;s/ "\[SWISSCOM/\n"\[SWISSCOM/g;s/ "\[TVPLAYER/\n"\[TVPLAYER/g;s/ "\[MAGENTATV/\n"\[MAGENTATV/g;s/ "\[RADIOTIMES/\n"\[RADIOTIMES/g;s/ "\[WAIPU.TV/\n"\[WAIPU.TV/g;s/ "\[TV-SPIELFILM/\n"\[TV-SPIELFILM/g;s/ "\[VODAFONE/\n"\[VODAFONE/g;s/ "\[TVTV/\n"\[TVTV/g;s/ "\[EXTERNAL/\n"\[EXTERNAL/g' /tmp/channels
292304

293305
if [ -e /tmp/setupname ]
294306
then
@@ -387,6 +399,16 @@ then
387399
grep "VODAFONE DE" /tmp/channels | sed '/VODAFONE DE/s/\[VODAFONE DE\] //g;s/.*/&,/g;$s/,/]\n}/g;1i{"channels":\[' > combine/$(</tmp/setupname)/vdf_de_channels.json
388400
fi
389401

402+
if [ -e xml/tvtv_us.xml ]
403+
then
404+
grep "TVTV USA" /tmp/channels | sed '/TVTV USA/s/\[TVTV USA\] //g;s/.*/&,/g;$s/,/]\n}/g;1i{"channels":\[' > combine/$(</tmp/setupname)/tvtv_us_channels.json
405+
fi
406+
407+
if [ -e xml/tvtv_ca.xml ]
408+
then
409+
grep "TVTV CANNADA" /tmp/channels | sed '/TVTV CANNADA/s/\[TVTV CANNADA\] //g;s/.*/&,/g;$s/,/]\n}/g;1i{"channels":\[' > combine/$(</tmp/setupname)/tvtv_ca_channels.json
410+
fi
411+
390412
if [ -e xml/external_oa.xml ]
391413
then
392414
grep "EXTERNAL OA" /tmp/channels | sed '/EXTERNAL OA/s/\[EXTERNAL OA\] //g;s/.*/&,/g;$s/,/]\n}/g;1i{"channels":\[' > combine/$(</tmp/setupname)/ext_oa_channels.json
@@ -998,6 +1020,56 @@ then
9981020

9991021
cd - > /dev/null
10001022

1023+
# TVTV US
1024+
if [ -e xml/tvtv_us.xml ]
1025+
then
1026+
grep 'channel id=' xml/tvtv_us.xml > /tmp/xmlch_tvtvus
1027+
sed -i 's/<channel id="/[TVTV USA] /g;s/">//g;s/\&amp;/\&/g' /tmp/xmlch_tvtvus
1028+
else
1029+
rm combine/$(sed -n "$(</tmp/selectedsetup)p" /tmp/combine)/tvtv_us_channels.json 2> /dev/null
1030+
fi
1031+
1032+
touch combine/$(sed -n "$(</tmp/selectedsetup)p" /tmp/combine)/tvtv_us_channels.json /tmp/xmlch_zde
1033+
cd combine/$(sed -n "$(</tmp/selectedsetup)p" /tmp/combine)
1034+
1035+
if [ -e tvtv_us_channels.json ]
1036+
then
1037+
sed '/{"channels":\[/d;/}/d;s/",//g;s/"\]//g;s/"//g' tvtv_us_channels.json > /tmp/channels_tvtvus && cat /tmp/channels_tvtvus >> /tmp/xmlch2
1038+
sed -i 's/.*/[TVTV USA] &/g' /tmp/channels_tvtvus
1039+
1040+
comm -12 <(sort -u /tmp/xmlch_tvtvus) <(sort -u /tmp/channels_tvtvus) > /tmp/comm_menu_enabled
1041+
comm -2 -3 <(sort -u /tmp/xmlch_tvtvus) <(sort -u /tmp/channels_tvtvus) > /tmp/comm_menu_disabled
1042+
sed 's/.*/"&" "" on \\/g' /tmp/comm_menu_enabled >> /tmp/chmenu
1043+
sed 's/.*/"&" "" off \\/g' /tmp/comm_menu_disabled >> /tmp/chmenu
1044+
fi
1045+
1046+
cd - > /dev/null
1047+
1048+
# TVTV CA
1049+
if [ -e xml/tvtv_ca.xml ]
1050+
then
1051+
grep 'channel id=' xml/tvtv_ca.xml > /tmp/xmlch_tvtvca
1052+
sed -i 's/<channel id="/[TVTV CANNADA] /g;s/">//g;s/\&amp;/\&/g' /tmp/xmlch_tvtvca
1053+
else
1054+
rm combine/$(sed -n "$(</tmp/selectedsetup)p" /tmp/combine)/tvtv_ca_channels.json 2> /dev/null
1055+
fi
1056+
1057+
touch combine/$(sed -n "$(</tmp/selectedsetup)p" /tmp/combine)/tvtv_ca_channels.json /tmp/xmlch_zch
1058+
cd combine/$(sed -n "$(</tmp/selectedsetup)p" /tmp/combine)
1059+
1060+
if [ -e tvtv_ca_channels.json ]
1061+
then
1062+
sed '/{"channels":\[/d;/}/d;s/",//g;s/"\]//g;s/"//g' tvtv_ca_channels.json > /tmp/channels_tvtvca && cat /tmp/channels_tvtvca >> /tmp/xmlch2
1063+
sed -i 's/.*/[TVTV CANNADA] &/g' /tmp/channels_tvtvca
1064+
1065+
comm -12 <(sort -u /tmp/xmlch_tvtvca) <(sort -u /tmp/channels_tvtvca) > /tmp/comm_menu_enabled
1066+
comm -2 -3 <(sort -u /tmp/xmlch_tvtvca) <(sort -u /tmp/channels_tvtvca) > /tmp/comm_menu_disabled
1067+
sed 's/.*/"&" "" on \\/g' /tmp/comm_menu_enabled >> /tmp/chmenu
1068+
sed 's/.*/"&" "" off \\/g' /tmp/comm_menu_disabled >> /tmp/chmenu
1069+
fi
1070+
1071+
cd - > /dev/null
1072+
10011073
# EXTERNAL SLOT 1
10021074
if [ -e xml/external_oa.xml ]
10031075
then
@@ -1091,7 +1163,7 @@ then
10911163

10921164
if [ -e /tmp/menu ]
10931165
then
1094-
if grep -q -E "\[HORIZON [A-Z][A-Z]\]|\[ZATTOO [A-Z][A-Z]\]|\[SWISSCOM [A-Z][A-Z]\]|\[TVPLAYER [A-Z][A-Z]\]|\[MAGENTATV [A-Z][A-Z]\]|\[RADIOTIMES [A-Z][A-Z]\]|\[WAIPU.TV [A-Z][A-Z]\]|\[TV-SPIELFILM [A-Z][A-Z]\]|\[VODAFONE [A-Z][A-Z]\]|\[EXTERNAL [A-Z][A-Z]\]" /tmp/chmenu
1166+
if grep -q -E "\[HORIZON [A-Z][A-Z]\]|\[ZATTOO [A-Z][A-Z]\]|\[SWISSCOM [A-Z][A-Z]\]|\[TVPLAYER [A-Z][A-Z]\]|\[MAGENTATV [A-Z][A-Z]\]|\[RADIOTIMES [A-Z][A-Z]\]|\[WAIPU.TV [A-Z][A-Z]\]|\[TV-SPIELFILM [A-Z][A-Z]\]|\[VODAFONE [A-Z][A-Z]\]|\[TVTV [A-Z][A-Z]\]|\[EXTERNAL [A-Z][A-Z]\]" /tmp/chmenu
10951167
then
10961168
bash /tmp/chmenu
10971169

@@ -1127,9 +1199,9 @@ then
11271199
if [ -s /tmp/channels ]
11281200
then
11291201
sed -i 's/\\\[/[/g;s/\\\]/]/g;s/\\(/(/g;s/\\)/)/g;s/\\\&/\&/g' /tmp/channels
1130-
sed 's/ "\[HORIZON [A-Z][A-Z]\] /\n/g;s/"\[HORIZON [A-Z][A-Z]\] //g;s/ "\[ZATTOO [A-Z][A-Z]\] /\n/g;s/"\[ZATTOO [A-Z][A-Z]\] //g;s/ "\[SWISSCOM [A-Z][A-Z]\] /\n/g;s/"\[SWISSCOM [A-Z][A-Z]\] //g;s/ "\[TVPLAYER [A-Z][A-Z]\] /\n/g;s/"\[TVPLAYER [A-Z][A-Z]\] //g;s/ "\[MAGENTATV [A-Z][A-Z]\] /\n/g;s/"\[MAGENTATV [A-Z][A-Z]\] //g;s/ "\[RADIOTIMES [A-Z][A-Z]\] /\n/g;s/"\[RADIOTIMES [A-Z][A-Z]\] //g;s/ "\[WAIPU.TV [A-Z][A-Z]\] /\n/g;s/"\[WAIPU.TV [A-Z][A-Z]\] //g;s/ "\[TV-SPIELFILM [A-Z][A-Z]\] /\n/g;s/"\[TV-SPIELFILM [A-Z][A-Z]\] //g;s/ "\[VODAFONE [A-Z][A-Z]\] /\n/g;s/"\[VODAFONE [A-Z][A-Z]\] //g;s/ "\[EXTERNAL [A-Z][A-Z]\] /\n/g;s/"\[EXTERNAL [A-Z][A-Z]\] //g;s/"//g' /tmp/channels > /tmp/xmlch2
1202+
sed 's/ "\[HORIZON [A-Z][A-Z]\] /\n/g;s/"\[HORIZON [A-Z][A-Z]\] //g;s/ "\[ZATTOO [A-Z][A-Z]\] /\n/g;s/"\[ZATTOO [A-Z][A-Z]\] //g;s/ "\[SWISSCOM [A-Z][A-Z]\] /\n/g;s/"\[SWISSCOM [A-Z][A-Z]\] //g;s/ "\[TVPLAYER [A-Z][A-Z]\] /\n/g;s/"\[TVPLAYER [A-Z][A-Z]\] //g;s/ "\[MAGENTATV [A-Z][A-Z]\] /\n/g;s/"\[MAGENTATV [A-Z][A-Z]\] //g;s/ "\[RADIOTIMES [A-Z][A-Z]\] /\n/g;s/"\[RADIOTIMES [A-Z][A-Z]\] //g;s/ "\[WAIPU.TV [A-Z][A-Z]\] /\n/g;s/"\[WAIPU.TV [A-Z][A-Z]\] //g;s/ "\[TV-SPIELFILM [A-Z][A-Z]\] /\n/g;s/"\[TV-SPIELFILM [A-Z][A-Z]\] //g;s/ "\[VODAFONE [A-Z][A-Z]\] /\n/g;s/"\[VODAFONE [A-Z][A-Z]\] //g;s/ "\[TVTV [A-Z][A-Z]\] /\n/g;s/"\[TVTV [A-Z][A-Z]\] //g;s/ "\[EXTERNAL [A-Z][A-Z]\] /\n/g;s/"\[EXTERNAL [A-Z][A-Z]\] //g;s/"//g' /tmp/channels > /tmp/xmlch2
11311203

1132-
sed -i 's/ "\[HORIZON/\n"\[HORIZON/g;s/ "\[ZATTOO/\n"\[ZATTOO/g;s/ "\[SWISSCOM/\n"\[SWISSCOM/g;s/ "\[TVPLAYER/\n"\[TVPLAYER/g;s/ "\[MAGENTATV/\n"\[MAGENTATV/g;s/ "\[RADIOTIMES/\n"\[RADIOTIMES/g;s/ "\[WAIPU.TV/\n"\[WAIPU.TV/g;s/ "\[TV-SPIELFILM/\n"\[TV-SPIELFILM/g;s/ "\[VODAFONE/\n"\[VODAFONE/g;s/ "\[EXTERNAL/\n"\[EXTERNAL/g;' /tmp/channels
1204+
sed -i 's/ "\[HORIZON/\n"\[HORIZON/g;s/ "\[ZATTOO/\n"\[ZATTOO/g;s/ "\[SWISSCOM/\n"\[SWISSCOM/g;s/ "\[TVPLAYER/\n"\[TVPLAYER/g;s/ "\[MAGENTATV/\n"\[MAGENTATV/g;s/ "\[RADIOTIMES/\n"\[RADIOTIMES/g;s/ "\[WAIPU.TV/\n"\[WAIPU.TV/g;s/ "\[TV-SPIELFILM/\n"\[TV-SPIELFILM/g;s/ "\[VODAFONE/\n"\[VODAFONE/g;s/ "\[TVTV/\n"\[TVTV/g;s/ "\[EXTERNAL/\n"\[EXTERNAL/g;' /tmp/channels
11331205

11341206
if [ -e combine/$(sed -n "$(</tmp/selectedsetup)p" /tmp/combine) ]
11351207
then
@@ -1228,6 +1300,16 @@ then
12281300
grep "VODAFONE DE" /tmp/channels | sed '/VODAFONE DE/s/\[VODAFONE DE\] //g;s/.*/&,/g;$s/,/]\n}/g;1i{"channels":\[' > combine/$(sed -n "$(</tmp/selectedsetup)p" /tmp/combine)/vdf_de_channels.json
12291301
fi
12301302

1303+
if [ -e xml/tvtv_us.xml ]
1304+
then
1305+
grep "TVTV USA" /tmp/channels | sed '/TVTV USA/s/\[TVTV USA\] //g;s/.*/&,/g;$s/,/]\n}/g;1i{"channels":\[' > combine/$(sed -n "$(</tmp/selectedsetup)p" /tmp/combine)/tvtv_us_channels.json
1306+
fi
1307+
1308+
if [ -e xml/tvtv_ca.xml ]
1309+
then
1310+
grep "TVTV CANNADA" /tmp/channels | sed '/TVTV CANNADA/s/\[TVTV CANNADA\] //g;s/.*/&,/g;$s/,/]\n}/g;1i{"channels":\[' > combine/$(sed -n "$(</tmp/selectedsetup)p" /tmp/combine)/tvtv_ca_channels.json
1311+
fi
1312+
12311313
if [ -e xml/external_oa.xml ]
12321314
then
12331315
grep "EXTERNAL OA" /tmp/channels | sed '/EXTERNAL OA/s/\[EXTERNAL OA\] //g;s/.*/&,/g;$s/,/]\n}/g;1i{"channels":\[' > combine/$(sed -n "$(</tmp/selectedsetup)p" /tmp/combine)/ext_oa_channels.json
@@ -1873,6 +1955,42 @@ then
18731955
fi
18741956
fi
18751957

1958+
# TVTV US
1959+
if [ -s combine/$folder/tvtv_us_channels.json ]
1960+
then
1961+
if [ -s xml/tvtv_us.xml ]
1962+
then
1963+
sed 's/fileNAME/tvtv_us.xml/g' ch_combine.pl > /tmp/ch_combine.pl
1964+
sed -i "s/channelsFILE/$folder\/tvtv_us_channels.json/g" /tmp/ch_combine.pl
1965+
printf "\n<!-- CHANNEL LIST: TVTV USA -->\n\n" >> /tmp/combined_channels
1966+
perl /tmp/ch_combine.pl >> /tmp/combined_channels
1967+
1968+
sed 's/fileNAME/tvtv_us.xml/g' prog_combine.pl > /tmp/prog_combine.pl
1969+
sed -i "s/channelsFILE/$folder\/tvtv_us_channels.json/g" /tmp/prog_combine.pl
1970+
sed -i "s/settingsFILE/$folder\/settings.json/g" /tmp/prog_combine.pl
1971+
printf "\n<!-- PROGRAMMES: TVTV USA -->\n\n" >> /tmp/combined_programmes
1972+
perl /tmp/prog_combine.pl >> /tmp/combined_programmes
1973+
fi
1974+
fi
1975+
1976+
# TVTV CA
1977+
if [ -s combine/$folder/tvtv_ca_channels.json ]
1978+
then
1979+
if [ -s xml/tvtv_ca.xml ]
1980+
then
1981+
sed 's/fileNAME/tvtv_ca.xml/g' ch_combine.pl > /tmp/ch_combine.pl
1982+
sed -i "s/channelsFILE/$folder\/tvtv_ca_channels.json/g" /tmp/ch_combine.pl
1983+
printf "\n<!-- CHANNEL LIST: TVTV CANNADA -->\n\n" >> /tmp/combined_channels
1984+
perl /tmp/ch_combine.pl >> /tmp/combined_channels
1985+
1986+
sed 's/fileNAME/tvtv_ca.xml/g' prog_combine.pl > /tmp/prog_combine.pl
1987+
sed -i "s/channelsFILE/$folder\/tvtv_ca_channels.json/g" /tmp/prog_combine.pl
1988+
sed -i "s/settingsFILE/$folder\/settings.json/g" /tmp/prog_combine.pl
1989+
printf "\n<!-- PROGRAMMES: TVTV CANNADA -->\n\n" >> /tmp/combined_programmes
1990+
perl /tmp/prog_combine.pl >> /tmp/combined_programmes
1991+
fi
1992+
fi
1993+
18761994
# EXTERNAL SLOT 1
18771995
if [ -s combine/$folder/ext_oa_channels.json ]
18781996
then

0 commit comments

Comments
 (0)