From fd509e84ae45c745395231ff35a66d20e119b7dc Mon Sep 17 00:00:00 2001
From: Jan-Luca <sunsettrack4@gmail.com>
Date: Thu, 30 May 2019 15:22:08 +0200
Subject: [PATCH] Append available channels to XMLTV file

---
 README.md              | 6 +++---
 zguide_xmltv.sh        | 8 ++++----
 zguide_xmltv_simple.sh | 8 ++++----
 ztvh.sh                | 4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index f3df647..8bb538b 100755
--- a/README.md
+++ b/README.md
@@ -37,13 +37,13 @@ sudo cpanm install utf8
 mkdir ~/ztvh
 
 # Download the .zip file and extract the files into the "ztvh" folder:
-wget https://github.com/sunsettrack4/zattoo_tvh/archive/v0.5.4.zip
+wget https://github.com/sunsettrack4/zattoo_tvh/archive/v0.5.5.zip
 
 # Unzip the file:
-unzip v0.5.4.zip
+unzip v0.5.5.zip
 
 # Move all script files to the created ztvh folder
-mv ~/zattoo_tvh-0.5.4/* ~/ztvh/
+mv ~/zattoo_tvh-0.5.5/* ~/ztvh/
 
 # Set system-wide permissions to the folder and its related files
 sudo chmod 0777 ~/ztvh
diff --git a/zguide_xmltv.sh b/zguide_xmltv.sh
index 2beb856..f448188 100755
--- a/zguide_xmltv.sh
+++ b/zguide_xmltv.sh
@@ -137,10 +137,10 @@ sed -i -e 's/\[{.*/<\/programme>/g' -e '/^\s*$/d' workfile
 #
 
 printf "\rAdding channel list to EPG file...                   "
-sed 's/\(.*\)\("title": "[^"]*", \)\(.*\)/\2\1\3/g' ~/ztvh/work/epg_channels_file > workfile2
-sed -i 's/\(.*\)\("cid": "[^"]*", \)\(.*\)/\2\1\3/g' workfile2
-sed -i -e 's/\("cid": "[^"]*", \)\("title": "[^"]*", \)\(.*\)/\1\2-END-/g' -e  '/"level": "/d' workfile2
-sed -i 's/"cid": "/<channel id="/g;s/", "title": "/">\n  <display-name lang="de">/g;s/", -END-/<\/display-name>\n<\/channel>/g' workfile2
+sed '/EXTINF/s/.*tvg-id="/<channel id="/g' ~/ztvh/channels.m3u > workfile2
+sed -i '/<channel id=/s/" group-title=".*, /">\n  <display-name lang="de">/g' workfile2
+sed -i '/<display-name/s/.*/&<\/display-name>\n<\/channel>/g' workfile2
+sed -i -e '/pipe:\/\//d' -e '/EXTM3U/d' workfile2
 cat workfile >> workfile2 && mv workfile2 workfile
 
 printf "\rSetting XMLTV file type...                           "
diff --git a/zguide_xmltv_simple.sh b/zguide_xmltv_simple.sh
index d13b649..f997ac3 100755
--- a/zguide_xmltv_simple.sh
+++ b/zguide_xmltv_simple.sh
@@ -135,10 +135,10 @@ sed -i -e 's/\[{.*/<\/programme>/g' -e '/^\s*$/d' workfile
 #
 
 printf "\rAdding channel list to EPG file...                   "
-sed 's/\(.*\)\("title": "[^"]*", \)\(.*\)/\2\1\3/g' ~/ztvh/work/epg_channels_file > workfile2
-sed -i 's/\(.*\)\("cid": "[^"]*", \)\(.*\)/\2\1\3/g' workfile2
-sed -i -e 's/\("cid": "[^"]*", \)\("title": "[^"]*", \)\(.*\)/\1\2-END-/g' -e  '/"level": "/d' workfile2
-sed -i 's/"cid": "/<channel id="/g;s/", "title": "/">\n  <display-name lang="de">/g;s/", -END-/<\/display-name>\n<\/channel>/g' workfile2
+sed '/EXTINF/s/.*tvg-id="/<channel id="/g' ~/ztvh/channels.m3u > workfile2
+sed -i '/<channel id=/s/" group-title=".*, /">\n  <display-name lang="de">/g' workfile2
+sed -i '/<display-name/s/.*/&<\/display-name>\n<\/channel>/g' workfile2
+sed -i -e '/pipe:\/\//d' -e '/EXTM3U/d' workfile2
 cat workfile >> workfile2 && mv workfile2 workfile
 
 printf "\rSetting XMLTV file type...                           "
diff --git a/ztvh.sh b/ztvh.sh
index 08316e1..e552dad 100755
--- a/ztvh.sh
+++ b/ztvh.sh
@@ -21,7 +21,7 @@ clear
 echo "                                                                        "
 echo "ZattooUNLIMITED for VLC and tvheadend                                   "
 echo "(c) 2017-2019 Jan-Luca Neumann                        I             +   "
-echo "Script v0.5.4 2019/05/11 | Zattoo v2.13.1       I    I         +        "
+echo "Script v0.5.5 2019/05/30 | Zattoo v2.13.1       I    I         +        "
 echo "                                                 I  I             +     "
 echo "                                                  II                    "
 echo "ZZZZZZZZZ       AA     TTTTTTTTTT TTTTTTTTTT    888888        888888    "
@@ -2202,7 +2202,7 @@ clear
 
 echo "ZattooUNLIMITED for VLC and tvheadend"
 echo "(c) 2017-2019 Jan-Luca Neumann"
-echo "Script v0.5.3 | Zattoo v2.13.1"
+echo "Script v0.5.5 | Zattoo v2.13.1"
 echo ""
 echo "=== GRABBER STARTUP ==="
 echo ""