Home Explore Help
Sign In
gogsadmin
/
mythtv-xmltv-nz
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

separate patches into multiple files

Daniel Sheffield 2 years ago
parent
0b06f034cf
commit
e432b626e4
21 changed files with 263 additions and 103 deletions
Split View Show Diff Stats
  1. 15 0
      0001-remove.patch
  2. 14 0
      0001-rename.patch
  3. 15 0
      0002-remove.patch
  4. 14 0
      0002-rename.patch
  5. 15 0
      0003-remove.patch
  6. 14 0
      0003-rename.patch
  7. 15 0
      0004-remove.patch
  8. 14 0
      0004-rename.patch
  9. 15 0
      0005-remove.patch
  10. 14 0
      0005-rename.patch
  11. 15 0
      0006-remove.patch
  12. 11 0
      0006-rename.patch
  13. 15 0
      0007-remove.patch
  14. 11 0
      0007-rename.patch
  15. 15 0
      0008-remove.patch
  16. 15 0
      0009-remove.patch
  17. 15 0
      0010-remove.patch
  18. 15 0
      0011-remove.patch
  19. 6 2
      epg-grab-mjh.sh
  20. 0 48
      remove.patch
  21. 0 53
      rename.patch

+ 15 - 0
0001-remove.patch
View File 

@@ -0,0 +1,15 @@
 
+--- 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
 
+

+ 14 - 0
0001-rename.patch
View File 

@@ -0,0 +1,14 @@
 
+--- 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
 
+

+ 15 - 0
0002-remove.patch
View File 

@@ -0,0 +1,15 @@
 
+--- 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
 
+

+ 14 - 0
0002-rename.patch
View File 

@@ -0,0 +1,14 @@
 
+--- 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
 
+

+ 15 - 0
0003-remove.patch
View File 

@@ -0,0 +1,15 @@
 
+--- 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
 
+

+ 14 - 0
0003-rename.patch
View File 

@@ -0,0 +1,14 @@
 
+--- 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
 
+

+ 15 - 0
0004-remove.patch
View File 

@@ -0,0 +1,15 @@
 
+--- 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
 
+

+ 14 - 0
0004-rename.patch
View File 

@@ -0,0 +1,14 @@
 
+--- 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
 
+

+ 15 - 0
0005-remove.patch
View File 

@@ -0,0 +1,15 @@
 
+--- 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
 
+

+ 14 - 0
0005-rename.patch
View File 

@@ -0,0 +1,14 @@
 
+--- 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
 
+

+ 15 - 0
0006-remove.patch
View File 

@@ -0,0 +1,15 @@
 
+--- 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
 
+

+ 11 - 0
0006-rename.patch
View File 

@@ -0,0 +1,11 @@
 
+--- 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>

+ 15 - 0
0007-remove.patch
View File 

@@ -0,0 +1,15 @@
 
+--- 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
 
+

+ 11 - 0
0007-rename.patch
View File 

@@ -0,0 +1,11 @@
 
+--- 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-2-plus1">
 
+-    <display-name>TVNZ 2 plus 1</display-name>
 
++    <display-name>TVNZ 2 +1</display-name>
 
+   </channel>
 
+   <channel id="mjh-tvnz-duke-plus1">
 
+     <display-name>TVNZ DUKE+1</display-name>

+ 15 - 0
0008-remove.patch
View File 

@@ -0,0 +1,15 @@
 
+--- 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
 
+

+ 15 - 0
0009-remove.patch
View File 

@@ -0,0 +1,15 @@
 
+--- 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
 
+

+ 15 - 0
0010-remove.patch
View File 

@@ -0,0 +1,15 @@
 
+--- 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
 
+

+ 15 - 0
0011-remove.patch
View File 

@@ -0,0 +1,15 @@
 
+--- 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
 
+

+ 6 - 2
epg-grab-mjh.sh
View File 

@@ -4,6 +4,10 @@ EPGGZ=epg.xml.gz
 
 EPG="${EPGGZ%.gz}"
 
 curl -sL https://i.mjh.nz/nz/epg.xml.gz > "$EPGGZ"
 
 gunzip -f "$EPGGZ"
 
-patch -s < rename.patch
 
-patch -s --fuzz=3 < remove.patch
 
+for p in ????-rename.patch; do
 
+  patch -p1 --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"

+ 0 - 48
remove.patch
View File 

@@ -1,48 +0,0 @@
 
---- a/epg.xml	2022-12-26 09:17:53.286555154 +1300
 
-+++ b/epg.xml	2022-12-26 09:17:57.098646238 +1300
 
-@@ -67,45 +67,12 @@
 
-   <channel id="mjh-chinese-tv28">
 
-     <display-name>ChineseTV</display-name>
 
-   </channel>
 
--  <channel id="mjh-chinese-tv29">
 
--    <display-name>Chinese TV29</display-name>
 
--  </channel>
 
-   <channel id="mjh-parliament-tv">
 
-     <display-name>Parliament</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>
 
--  <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>
 
--  <channel id="mjh-trackside-2">
 
--    <display-name>TAB Trackside 2</display-name>
 
--  </channel>
 
-   <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>
 
--  <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>
 
--  <channel id="mjh-metv">
 
--    <display-name>MeTV</display-name>
 
--  </channel>
 
-   <programme start="20221225063500 +0000" stop="20221225072500 +0000" channel="mjh-tvnz-1">
 
-     <title>Alan Carr's Epic Christmas Gameshow</title>
 
-     <sub-title>The Price Is Right: Christmas Special</sub-title>

+ 0 - 53
rename.patch
View File 

@@ -1,53 +0,0 @@
 
---- a/epg.xml	2022-12-26 09:13:51.480782463 +1300
 
-+++ b/epg.xml	2022-12-26 09:13:54.284849347 +1300
 
-@@ -14,13 +14,13 @@
 
-     <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>
 
-+    <display-name>TVNZ DUKE</display-name>
 
-   </channel>
 
-   <channel id="mjh-tvnz-2-plus1">
 
--    <display-name>TVNZ 2 plus 1</display-name>
 
-+    <display-name>TVNZ 2 +1</display-name>
 
-   </channel>
 
-   <channel id="mjh-eden">
 
-     <display-name>eden</display-name>
 
-@@ -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>
 
-@@ -41,7 +41,7 @@
 
-     <display-name>ThreePlus1</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>
 
-@@ -65,13 +65,13 @@
 
-     <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>
 
-   </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>