From 6309a918e2833d8e7beb95bd6b6b841f30d86ef8 Mon Sep 17 00:00:00 2001
From: Aleksandr Statciuk <github@oiya.xyz>
Date: Tue, 23 Aug 2022 18:54:53 +0300
Subject: [PATCH] Moved all Canadian channels to ca/tvtv.us

Fixes bug: https://github.com/iptv-org/epg/actions/runs/2908910223
---
 sites/tvtv.us/tvtv.us_ca.channels.xml | 26 ++++++++++++++++++++++++++
 sites/tvtv.us/tvtv.us_us.channels.xml | 26 --------------------------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/sites/tvtv.us/tvtv.us_ca.channels.xml b/sites/tvtv.us/tvtv.us_ca.channels.xml
index 6d477ea8..70b8a666 100644
--- a/sites/tvtv.us/tvtv.us_ca.channels.xml
+++ b/sites/tvtv.us/tvtv.us_ca.channels.xml
@@ -101,5 +101,31 @@
     <channel lang="fr" xmltv_id="IciRDI.ca" site_id="60327">ICI RDI</channel>
     <channel lang="fr" xmltv_id="LCN.ca" site_id="67231">LCN</channel>
     <channel lang="fr" xmltv_id="Noovo.ca" site_id="58688">Noovo</channel>
+    <channel lang="en" xmltv_id="ShawPayPerView1.ca" site_id="22016">Pay Per View 1</channel>
+    <channel lang="en" xmltv_id="ShawPayPerView2.ca" site_id="22017">Pay Per View 2</channel>
+    <channel lang="en" xmltv_id="ShawPayPerView3.ca" site_id="22018">Pay Per View 3</channel>
+    <channel lang="en" xmltv_id="ShawPayPerView4.ca" site_id="22019">Pay Per View 4</channel>
+    <channel lang="en" xmltv_id="ShawPayPerView5.ca" site_id="22020">Pay Per View 5</channel>
+    <channel lang="en" xmltv_id="ShawPayPerView6.ca" site_id="22021">Pay Per View 6</channel>
+    <channel lang="en" xmltv_id="ShawPayPerView7.ca" site_id="22022">Pay Per View 7</channel>
+    <channel lang="en" xmltv_id="ShawPayPerView8.ca" site_id="22023">Pay Per View 8</channel>
+    <channel lang="en" xmltv_id="StingrayClassica.ca" site_id="67641">Stingray Classica</channel>
+    <channel lang="en" xmltv_id="StingrayClassicRock.ca" site_id="67567">Stingray Classic Rock</channel>
+    <channel lang="en" xmltv_id="StingrayEasyListening.ca" site_id="67573">Stingray Easy Listening</channel>
+    <channel lang="en" xmltv_id="StingrayEverything80s.ca" site_id="67566">Stingray Remember the 80's</channel>
+    <channel lang="en" xmltv_id="StingrayFlashback70s.ca" site_id="67565">Stingray Flashback 70s</channel>
+    <channel lang="en" xmltv_id="StingrayGreatestHits.ca" site_id="110433">Stingray Greatest Hits</channel>
+    <channel lang="en" xmltv_id="StingrayHitList.ca" site_id="67555">Stingray Hit List</channel>
+    <channel lang="en" xmltv_id="StingrayHotCountry.ca" site_id="67557">Stingray Hot Country</channel>
+    <channel lang="en" xmltv_id="StingrayKaraoke.ca" site_id="110657">Stingray Karaoke</channel>
+    <channel lang="en" xmltv_id="StingrayNothinBut90s.ca" site_id="68620">Stingray Nothin' But 90's</channel>
+    <channel lang="en" xmltv_id="StingrayPopAdult.ca" site_id="67558">Stingray Pop Adult</channel>
+    <channel lang="en" xmltv_id="StingrayQello.ca" site_id="113296">Qello Concerts by Stingray</channel>
+    <channel lang="en" xmltv_id="StingrayRockAlternative.ca" site_id="67568">Stingray Rock Alternative</channel>
+    <channel lang="en" xmltv_id="StingraySmoothJazz.ca" site_id="67571">Stingray Smooth Jazz</channel>
+    <channel lang="en" xmltv_id="StingraySoulStorm.ca" site_id="67563">Stingray Soul Storm</channel>
+    <channel lang="en" xmltv_id="StingrayTodaysLatinPop.ca" site_id="68639">Stingray Exitos del Momento</channel>
+    <channel lang="en" xmltv_id="StingrayUrbanBeat.ca" site_id="67564">Stingray Hip-Hop/R&amp;B</channel>
+    <channel lang="en" xmltv_id="WildBrainTV.ca" site_id="10176">Family CHRGD</channel>
   </channels>
 </site>
diff --git a/sites/tvtv.us/tvtv.us_us.channels.xml b/sites/tvtv.us/tvtv.us_us.channels.xml
index 989f3d81..9063030f 100644
--- a/sites/tvtv.us/tvtv.us_us.channels.xml
+++ b/sites/tvtv.us/tvtv.us_us.channels.xml
@@ -552,14 +552,6 @@
     <channel lang="en" xmltv_id="ScreenPixWesterns.us" site_id="113002">ScreenPix Westerns</channel>
     <channel lang="en" xmltv_id="SECNetwork.us" site_id="89535">SEC Network</channel>
     <channel lang="en" xmltv_id="SETInternational.tw" site_id="54253">SET International</channel>
-    <channel lang="en" xmltv_id="ShawPayPerView1.ca" site_id="22016">Pay Per View 1</channel>
-    <channel lang="en" xmltv_id="ShawPayPerView2.ca" site_id="22017">Pay Per View 2</channel>
-    <channel lang="en" xmltv_id="ShawPayPerView3.ca" site_id="22018">Pay Per View 3</channel>
-    <channel lang="en" xmltv_id="ShawPayPerView4.ca" site_id="22019">Pay Per View 4</channel>
-    <channel lang="en" xmltv_id="ShawPayPerView5.ca" site_id="22020">Pay Per View 5</channel>
-    <channel lang="en" xmltv_id="ShawPayPerView6.ca" site_id="22021">Pay Per View 6</channel>
-    <channel lang="en" xmltv_id="ShawPayPerView7.ca" site_id="22022">Pay Per View 7</channel>
-    <channel lang="en" xmltv_id="ShawPayPerView8.ca" site_id="22023">Pay Per View 8</channel>
     <channel lang="en" xmltv_id="ShepherdsChapel.us" site_id="32518">Shepherd's Chapel</channel>
     <channel lang="en" xmltv_id="ShopHQ.us" site_id="14948">ShopHQ</channel>
     <channel lang="en" xmltv_id="ShopLC.us" site_id="56032">Shop LC</channel>
@@ -628,24 +620,7 @@
     <channel lang="en" xmltv_id="StarzKidsFamilyEast.us" site_id="50671">Starz Kids &amp; Family East</channel>
     <channel lang="en" xmltv_id="StarzKidsFamilyWest.us" site_id="57583">Starz Kids &amp; Family West</channel>
     <channel lang="en" xmltv_id="StarzWest.us" site_id="12741">Starz West</channel>
-    <channel lang="en" xmltv_id="StingrayClassica.ca" site_id="67641">Stingray Classica</channel>
-    <channel lang="en" xmltv_id="StingrayClassicRock.ca" site_id="67567">Stingray Classic Rock</channel>
-    <channel lang="en" xmltv_id="StingrayEasyListening.ca" site_id="67573">Stingray Easy Listening</channel>
-    <channel lang="en" xmltv_id="StingrayEverything80s.ca" site_id="67566">Stingray Remember the 80's</channel>
-    <channel lang="en" xmltv_id="StingrayFlashback70s.ca" site_id="67565">Stingray Flashback 70s</channel>
-    <channel lang="en" xmltv_id="StingrayGreatestHits.ca" site_id="110433">Stingray Greatest Hits</channel>
-    <channel lang="en" xmltv_id="StingrayHitList.ca" site_id="67555">Stingray Hit List</channel>
-    <channel lang="en" xmltv_id="StingrayHotCountry.ca" site_id="67557">Stingray Hot Country</channel>
-    <channel lang="en" xmltv_id="StingrayKaraoke.ca" site_id="110657">Stingray Karaoke</channel>
     <channel lang="en" xmltv_id="StingrayNaturescape.us" site_id="90613">Stingray Naturescape</channel>
-    <channel lang="en" xmltv_id="StingrayNothinBut90s.ca" site_id="68620">Stingray Nothin' But 90's</channel>
-    <channel lang="en" xmltv_id="StingrayPopAdult.ca" site_id="67558">Stingray Pop Adult</channel>
-    <channel lang="en" xmltv_id="StingrayQello.ca" site_id="113296">Qello Concerts by Stingray</channel>
-    <channel lang="en" xmltv_id="StingrayRockAlternative.ca" site_id="67568">Stingray Rock Alternative</channel>
-    <channel lang="en" xmltv_id="StingraySmoothJazz.ca" site_id="67571">Stingray Smooth Jazz</channel>
-    <channel lang="en" xmltv_id="StingraySoulStorm.ca" site_id="67563">Stingray Soul Storm</channel>
-    <channel lang="en" xmltv_id="StingrayTodaysLatinPop.ca" site_id="68639">Stingray Exitos del Momento</channel>
-    <channel lang="en" xmltv_id="StingrayUrbanBeat.ca" site_id="67564">Stingray Hip-Hop/R&amp;B</channel>
     <channel lang="en" xmltv_id="Studiocanal.fr" site_id="35751">StudioCanal</channel>
     <channel lang="en" xmltv_id="SundanceTVEast.us" site_id="71280">SundanceTV East</channel>
     <channel lang="en" xmltv_id="SundanceTVWest.us" site_id="78806">SundanceTV West</channel>
@@ -727,7 +702,6 @@
     <channel lang="en" xmltv_id="WeatherNation.us" site_id="72413">WeatherNation</channel>
     <channel lang="en" xmltv_id="WeTVEast.us" site_id="16409">We TV East</channel>
     <channel lang="en" xmltv_id="WeTVWest.us" site_id="54292">We TV West</channel>
-    <channel lang="en" xmltv_id="WildBrainTV.ca" site_id="10176">Family CHRGD</channel>
     <channel lang="en" xmltv_id="Willow.us" site_id="68605">Willow</channel>
     <channel lang="en" xmltv_id="WorldHarvestTV.us" site_id="11514">World Harvest TV</channel>
     <channel lang="en" xmltv_id="WorldPokerTour.us" site_id="113372">World Poker Tour</channel>