Remove unnecessary patches and update readme

0001-remove.patch

@@ -1,15 +0,0 @@
---- a/epg.xml
-+++ b/epg.xml
-@@ -49,9 +49,6 @@
-   <channel id="mjh-chinese-tv28">
-     <display-name>Chinese TV28</display-name>
-   </channel>
--  <channel id="mjh-chinese-tv29">
--    <display-name>Chinese TV29</display-name>
--  </channel>
-   <channel id="mjh-parliament-tv">
-     <display-name>Parliament TV</display-name>
-   </channel>
--- 
-2.30.2
-

0001-rename.patch

@@ -1,14 +0,0 @@
---- a/epg.xml
-+++ b/epg.xml
-@@ -26,7 +26,7 @@
-     <display-name>PRIME</display-name>
-   </channel>
-   <channel id="mjh-rush-nz">
--    <display-name>RUSH</display-name>
-+    <display-name>Rush</display-name>
-   </channel>
-   <channel id="mjh-te-reo">
-     <display-name>Te Reo</display-name>
--- 
-2.30.2
-

0002-remove.patch

@@ -1,15 +0,0 @@
---- a/epg.xml
-+++ b/epg.xml
-@@ -52,9 +52,6 @@
-   <channel id="mjh-parliament-tv">
-     <display-name>Parliament TV</display-name>
-   </channel>
--  <channel id="mjh-apna-television">
--    <display-name>APNA Television</display-name>
--  </channel>
-   <channel id="mjh-panda-tv">
-     <display-name>Panda TV</display-name>
-   </channel>
--- 
-2.30.2
-

0002-rename.patch

@@ -1,14 +0,0 @@
---- a/epg.xml
-+++ b/epg.xml
-@@ -47,7 +47,7 @@
-     <display-name>Hope Channel</display-name>
-   </channel>
-   <channel id="mjh-chinese-tv28">
--    <display-name>Chinese TV28</display-name>
-+    <display-name>ChineseTV</display-name>
-   </channel>
-   <channel id="mjh-chinese-tv29">
-     <display-name>Chinese TV29</display-name>
--- 
-2.30.2
-

0003-remove.patch

@@ -1,15 +0,0 @@
---- a/epg.xml
-+++ b/epg.xml
-@@ -52,9 +52,6 @@
-   <channel id="mjh-parliament-tv">
-     <display-name>Parliament TV</display-name>
-   </channel>
--  <channel id="mjh-panda-tv">
--    <display-name>Panda TV</display-name>
--  </channel>
-   <channel id="mjh-wairarapa-tv">
-     <display-name>Wairarapa TV</display-name>
-   </channel>
--- 
-2.30.2
-

0003-rename.patch

@@ -1,14 +0,0 @@
---- a/epg.xml
-+++ b/epg.xml
-@@ -53,7 +53,7 @@
-     <display-name>Chinese TV29</display-name>
-   </channel>
-   <channel id="mjh-parliament-tv">
--    <display-name>Parliament TV</display-name>
-+    <display-name>Parliament</display-name>
-   </channel>
-   <channel id="mjh-apna-television">
-     <display-name>APNA Television</display-name>
--- 
-2.30.2
-

0004-remove.patch

@@ -1,15 +0,0 @@
---- a/epg.xml
-+++ b/epg.xml
-@@ -52,9 +52,6 @@
-   <channel id="mjh-parliament-tv">
-     <display-name>Parliament TV</display-name>
-   </channel>
--  <channel id="mjh-wairarapa-tv">
--    <display-name>Wairarapa TV</display-name>
--  </channel>
-   <channel id="mjh-trackside-1">
-     <display-name>TAB Trackside 1</display-name>
-   </channel>
--- 
-2.30.2
-

0004-rename.patch

@@ -1,14 +0,0 @@
---- a/epg.xml
-+++ b/epg.xml
-@@ -14,7 +14,7 @@
-     <display-name>Bravo</display-name>
-   </channel>
-   <channel id="mjh-maori-tv">
--    <display-name>Whakaata Māori</display-name>
-+    <display-name>Whakaata Maori</display-name>
-   </channel>
-   <channel id="mjh-tvnz-duke">
-     <display-name>DUKE</display-name>
--- 
-2.30.2
-

0005-remove.patch

@@ -1,15 +0,0 @@
---- a/epg.xml
-+++ b/epg.xml
-@@ -52,9 +52,6 @@
-   <channel id="mjh-parliament-tv">
-     <display-name>Parliament TV</display-name>
-   </channel>
--  <channel id="mjh-trackside-1">
--    <display-name>TAB Trackside 1</display-name>
--  </channel>
-   <channel id="mjh-trackside-2">
-     <display-name>TAB Trackside 2</display-name>
-   </channel>
--- 
-2.30.2
-

0005-rename.patch

@@ -1,14 +0,0 @@
---- a/epg.xml
-+++ b/epg.xml
-@@ -17,7 +17,7 @@
-     <display-name>Whakaata Maori</display-name>
-   </channel>
-   <channel id="mjh-tvnz-duke">
--    <display-name>DUKE</display-name>
-+    <display-name>TVNZ DUKE</display-name>
-   </channel>
-   <channel id="mjh-eden">
-     <display-name>eden</display-name>
--- 
-2.30.2
-

0006-remove.patch

@@ -1,15 +0,0 @@
---- a/epg.xml
-+++ b/epg.xml
-@@ -52,9 +52,6 @@
-   <channel id="mjh-parliament-tv">
-     <display-name>Parliament TV</display-name>
-   </channel>
--  <channel id="mjh-trackside-2">
--    <display-name>TAB Trackside 2</display-name>
--  </channel>
-   <channel id="mjh-ch200">
-     <display-name>CH200</display-name>
-   </channel>
--- 
-2.30.2
-

0006-rename.patch

@@ -1,11 +0,0 @@
---- a/epg.xml	2022-12-26 09:13:51.480782463 +1300
-+++ b/epg.xml	2022-12-26 09:13:54.284849347 +1300
-@@ -32,7 +32,7 @@
-     <display-name>PRIME</display-name>
-   </channel>
-   <channel id="mjh-tvnz-1-plus1">
--    <display-name>TVNZ 1 plus 1</display-name>
-+    <display-name>TVNZ 1 +1</display-name>
-   </channel>
-   <channel id="mjh-tvnz-duke-plus1">
-     <display-name>TVNZ DUKE+1</display-name>

0007-remove.patch

@@ -1,15 +0,0 @@
---- a/epg.xml
-+++ b/epg.xml
-@@ -55,9 +55,6 @@
-   <channel id="mjh-ch200">
-     <display-name>CH200</display-name>
-   </channel>
--  <channel id="mjh-juice-tv">
--    <display-name>Juice TV</display-name>
--  </channel>
-   <channel id="mjh-tvsn-shopping">
-     <display-name>TVSN Shopping</display-name>
-   </channel>
--- 
-2.30.2
-

0008-remove.patch

@@ -1,15 +0,0 @@
---- a/epg.xml
-+++ b/epg.xml
-@@ -55,9 +55,6 @@
-   <channel id="mjh-ch200">
-     <display-name>CH200</display-name>
-   </channel>
--  <channel id="mjh-tvsn-shopping">
--    <display-name>TVSN Shopping</display-name>
--  </channel>
-   <channel id="mjh-redbull-tv">
-     <display-name>Redbull TV</display-name>
-   </channel>
--- 
-2.30.2
-

0009-remove.patch

@@ -1,15 +0,0 @@
---- a/epg.xml
-+++ b/epg.xml
-@@ -55,9 +55,6 @@
-   <channel id="mjh-ch200">
-     <display-name>CH200</display-name>
-   </channel>
--  <channel id="mjh-redbull-tv">
--    <display-name>Redbull TV</display-name>
--  </channel>
-   <channel id="mjh-channel-news-asia">
-     <display-name>Channel News Asia (CNA)</display-name>
-   </channel>
--- 
-2.30.2
-

0010-remove.patch

@@ -1,15 +0,0 @@
---- a/epg.xml
-+++ b/epg.xml
-@@ -55,9 +55,6 @@
-   <channel id="mjh-ch200">
-     <display-name>CH200</display-name>
-   </channel>
--  <channel id="mjh-channel-news-asia">
--    <display-name>Channel News Asia (CNA)</display-name>
--  </channel>
-   <channel id="mjh-metv">
-     <display-name>MeTV</display-name>
-   </channel>
--- 
-2.30.2
-

0011-remove.patch

@@ -1,15 +0,0 @@
---- a/epg.xml
-+++ b/epg.xml
-@@ -55,9 +55,6 @@
-   <channel id="mjh-ch200">
-     <display-name>CH200</display-name>
-   </channel>
--  <channel id="mjh-metv">
--    <display-name>MeTV</display-name>
--  </channel>
-   <programme start="20230116060000 +0000" stop="20230116063000 +0000" channel="mjh-tvnz-1">
-     <title>Country House Hunters: New Zealand</title>
-     <sub-title>Kaikoura</sub-title>
--- 
-2.30.2
-

Readme.md

@@ -32,7 +32,7 @@ To generate the patches, just download the epg.xml from Matt Huisman's site, and
 
 2. Make sure the channel names in epg-modified.xml match the output from mythtv db:
 ```bash
-sudo mysql -u root -p mythconverg -e "SELECT channum,chanid,icon,name,xmltvid,sourceid FROM channel WHERE visible ORDER BY channum+0;"
+sudo mysql -u root -p mythconverg -e "SELECT channum,chanid,icon,name,xmltvid,useonairguide,sourceid FROM channel WHERE visible AND channum <> '' AND deleted IS NULL ORDER BY channum+0;"
 ```
 
 3. Generate the diff between the original and modified xml, and save as rename.patch:
@@ -42,11 +42,4 @@ diff -u epg.xml epg-modified.xml > rename.patch
 
 4. Apply the rename.patch to the original xml
 
-5. Remove any channels in epg-modified.xml that mythtv hasn't found, so long as you are sure you can't get from your location
-
-6. Generate the diff between the the (patched) original xml and the modified xml, and save as remove.patch:
-```bash
-diff -u epg.xml epg-modified.xml > remove.patch
-```
-
 The modifications are split up in the case that some users neeed renames but not removals.

epg-grab-mjh.sh

@@ -1,13 +1,13 @@
 #!/bin/bash
 set -euo pipefail
-EPGGZ=epg.xml.gz
-EPG="${EPGGZ%.gz}"
-curl -sL https://i.mjh.nz/nz/epg.xml.gz > "$EPGGZ"
-gunzip -f "$EPGGZ"
+EPG=epg.xml
+curl --compressed -sL https://i.mjh.nz/nz/epg.xml > "$EPG"
 for p in ????-rename.patch; do
-  patch -p1 --fuzz=3 < $p || echo "Failed to apply patch $p" >&2
+  echo Patching with $p
+  patch -sNp1 -r $p.rej --fuzz=3 < $p || echo "Failed to apply patch $p" >&2
 done
-for p in ????-remove.patch; do
-  patch -p1 --fuzz=3 < $p || echo "Failed to apply patch $p" >&2
-done
-mythfilldatabase --file --sourceid --xmlfile "$EPG"
+#for p in ????-remove.patch; do
+#  echo Patching with $p
+#  patch -sNp1 -r $p.rej --fuzz=3 < $p || echo "Failed to apply patch $p" >&2
+#done
+mythfilldatabase --file --sourceid 1 --xmlfile "$EPG"