Merge pull request #48 from hmlendea/dev

More channels and providers
hmlendea · Oct 14, 2020 · cd57125 · cd57125
2 parents b0cbf54 + 575fa3f
commit cd57125
Show file tree

Hide file tree

Showing 4 changed files with 98 additions and 5 deletions.
diff --git a/Data/channels.xml b/Data/channels.xml
@@ -133,6 +133,13 @@
     <GroupId>unknown</GroupId>
     <LogoUrl>http://stvron.com/canale/mari/alege-tv.png</LogoUrl>
   </ChannelDefinitionEntity>
+  <ChannelDefinitionEntity>
+    <Id>AlephNews.ro</Id>
+    <IsEnabled>true</IsEnabled>
+    <Name>Aleph News</Name>
+    <GroupId>news</GroupId>
+    <LogoUrl>https://raw.githubusercontent.com/hmlendea/tv-logos/master/logos/aleph_news.png</LogoUrl>
+  </ChannelDefinitionEntity>
   <ChannelDefinitionEntity>
     <Id>AlfaOmegaTV.ro</Id>
     <Name>Alfa &amp; Omega</Name>
@@ -422,8 +429,9 @@
     <GroupId>movies</GroupId>
     <LogoUrl>https://raw.githubusercontent.com/hmlendea/tv-logos/master/logos/bollywood.png</LogoUrl>
     <Aliases>
-      <string>RO: BO</string>
+      <string>Bollywood TV Romania</string>
       <string>RO: BO TV</string>
+      <string>RO: BO</string>
       <string>RO: Bollywood TV Film</string>
       <string>RO: Bollywood TV</string>
       <string>RO: Bolywood</string>
@@ -1129,9 +1137,10 @@
     <GroupId>movies</GroupId>
     <LogoUrl>https://raw.githubusercontent.com/hmlendea/tv-logos/master/logos/filmnow.png</LogoUrl>
     <Aliases>
-      <string>RO: Digi Film</string>
       <string>RO: Digi Filim</string>
       <string>RO: Digi Film Now</string>
+      <string>RO: Digi Film</string>
+      <string>RO: Digi Filmi</string>
     </Aliases>
   </ChannelDefinitionEntity>
   <ChannelDefinitionEntity>
@@ -2461,6 +2470,7 @@
     <LogoUrl>https://raw.githubusercontent.com/hmlendea/tv-logos/master/logos/profit.ro.png</LogoUrl>
     <Aliases>
       <string>Profit TV</string>
+      <string>Profit</string>
     </Aliases>
   </ChannelDefinitionEntity>
   <ChannelDefinitionEntity>
@@ -2484,6 +2494,13 @@
       <string>RO: QTV</string>
     </Aliases>
   </ChannelDefinitionEntity>
+  <ChannelDefinitionEntity>
+    <Id>QubTV.ro</Id>
+    <IsEnabled>true</IsEnabled>
+    <Name>Qub TV</Name>
+    <GroupId>local-banat</GroupId>
+    <LogoUrl>https://raw.githubusercontent.com/hmlendea/tv-logos/master/logos/qub.png</LogoUrl>
+  </ChannelDefinitionEntity>
   <ChannelDefinitionEntity>
     <Id>RadioCluj.ro</Id>
     <Name>Radio Cluj</Name>

diff --git a/Data/providers.xml b/Data/providers.xml
@@ -220,6 +220,22 @@
     <UrlFormat>https://dailyiptvlist.com/dl/ro-m3uplaylist-{0:yyyy-MM-dd}-5.m3u</UrlFormat>
   </PlaylistProviderEntity>
 
+  <PlaylistProviderEntity>
+    <Id>dailyiptvlist-list6</Id>
+    <IsEnabled>true</IsEnabled>
+    <Priority>505</Priority>
+    <Name>DailyIPTVList List 6</Name>
+    <UrlFormat>https://dailyiptvlist.com/dl/ro-m3uplaylist-{0:yyyy-MM-dd}-6.m3u</UrlFormat>
+  </PlaylistProviderEntity>
+
+  <PlaylistProviderEntity>
+    <Id>dailyiptvlist-list7</Id>
+    <IsEnabled>true</IsEnabled>
+    <Priority>506</Priority>
+    <Name>DailyIPTVList List 7</Name>
+    <UrlFormat>https://dailyiptvlist.com/dl/ro-m3uplaylist-{0:yyyy-MM-dd}-7.m3u</UrlFormat>
+  </PlaylistProviderEntity>
+
   <PlaylistProviderEntity>
     <Id>bestfreeiptv</Id>
     <IsEnabled>true</IsEnabled>
@@ -340,6 +356,22 @@
     <UrlFormat>https://iptvm3ulist.com/m3u/ro05_iptvm3ulist_com_{0:ddMMyy}.m3u</UrlFormat>
   </PlaylistProviderEntity>
 
+  <PlaylistProviderEntity>
+    <Id>iptvm3ulist-list6</Id>
+    <IsEnabled>true</IsEnabled>
+    <Priority>545</Priority>
+    <Name>IPTVM3UList List 6</Name>
+    <UrlFormat>https://iptvm3ulist.com/m3u/ro06_iptvm3ulist_com_{0:ddMMyy}.m3u</UrlFormat>
+  </PlaylistProviderEntity>
+
+  <PlaylistProviderEntity>
+    <Id>iptvm3ulist-list7</Id>
+    <IsEnabled>true</IsEnabled>
+    <Priority>546</Priority>
+    <Name>IPTVM3UList List 7</Name>
+    <UrlFormat>https://iptvm3ulist.com/m3u/ro07_iptvm3ulist_com_{0:ddMMyy}.m3u</UrlFormat>
+  </PlaylistProviderEntity>
+
   <PlaylistProviderEntity>
     <Id>iptvfile</Id>
     <IsEnabled>true</IsEnabled>
@@ -676,6 +708,46 @@
     <UrlFormat>http://www.source-iptv.com/files/ro_{0:ddMMyy}_source-iptv_com4.m3u</UrlFormat>
   </PlaylistProviderEntity>
 
+  <PlaylistProviderEntity>
+    <Id>github-yonni55555-ro</Id>
+    <IsEnabled>true</IsEnabled>
+    <Priority>950</Priority>
+    <Name>yonni55555's IPTV GitHub RO Channels</Name>
+    <UrlFormat>https://raw.githubusercontent.com/yonni55555/RP/master/Romania.m3u</UrlFormat>
+  </PlaylistProviderEntity>
+
+  <PlaylistProviderEntity>
+    <Id>github-vb6rocod-ro</Id>
+    <IsEnabled>true</IsEnabled>
+    <Priority>960</Priority>
+    <Name>vb6rocod's IPTV GitHub RO Channels</Name>
+    <UrlFormat>https://raw.githubusercontent.com/vb6rocod/hddlinks_android/master/tv/pl/Frecvente.m3u</UrlFormat>
+  </PlaylistProviderEntity>
+
+  <PlaylistProviderEntity>
+    <Id>github-vb6rocod-ro-tvr</Id>
+    <IsEnabled>true</IsEnabled>
+    <Priority>961</Priority>
+    <Name>vb6rocod's IPTV GitHub RO TVR Channels</Name>
+    <UrlFormat>https://raw.githubusercontent.com/vb6rocod/hddlinks_android/master/tv/pl/TVR.m3u</UrlFormat>
+  </PlaylistProviderEntity>
+
+  <PlaylistProviderEntity>
+    <Id>github-SharyRajpoot-ro</Id>
+    <IsEnabled>true</IsEnabled>
+    <Priority>970</Priority>
+    <Name>SharyRajpoot's IPTV GitHub RO Channels</Name>
+    <UrlFormat>https://raw.githubusercontent.com/SharyRajpoot/iptv/master/channels/countries/ro.m3u</UrlFormat>
+  </PlaylistProviderEntity>
+
+  <PlaylistProviderEntity>
+    <Id>github-SharyRajpoot-md</Id>
+    <IsEnabled>true</IsEnabled>
+    <Priority>971</Priority>
+    <Name>SharyRajpoot's IPTV GitHub MD Channels</Name>
+    <UrlFormat>https://raw.githubusercontent.com/SharyRajpoot/iptv/master/channels/countries/md.m3u</UrlFormat>
+  </PlaylistProviderEntity>
+
   <PlaylistProviderEntity>
     <Id>github-salex777-ro</Id>
     <IsEnabled>true</IsEnabled>

diff --git a/Service/ChannelMatcher.cs b/Service/ChannelMatcher.cs
@@ -13,7 +13,7 @@ public sealed class ChannelMatcher : IChannelMatcher
     {
         static readonly string[] SubstringsToStrip = new string[]
         {
-            "www.iptvsource.com", "iptvsource.com"
+            "www.iptvsource.com", "iptvsource.com", "backup"
         };
 
         static readonly IDictionary<string, string> TextReplacements = new Dictionary<string, string>

diff --git a/UnitTests/Service/ChannelMatcherTests.cs b/UnitTests/Service/ChannelMatcherTests.cs
@@ -59,7 +59,7 @@ public void SetUp()
         [TestCase("Vivid TV", null, "Vivid TV HD(18+)")]
         [TestCase("VSV De Niro", "VSV Robert de Niro", "VSV Robert de Niro HD")]
         [Test]
-        public void DoesMatch_NamesMatch_ReturnsTrue(
+        public void ChannelNamesDoMatch(
             string definedName,
             string alias,
             string providerName)
@@ -70,9 +70,10 @@ public void DoesMatch_NamesMatch_ReturnsTrue(
         }
 
         [TestCase("Cromtel", "Cmrotel", "Cmtel")]
+        [TestCase("Pro TV", null, "MD: ProTV Chisinau")]
         [TestCase("Telekom Sport 2", "RO: Telekom Sport 2", "RO: Digi Sport 2")]
         [Test]
-        public void DoesMatch_NamesDoNotMatch_ReturnsFalse(
+        public void ChannelNamesDoNotMatch(
             string definedName,
             string alias,
             string providerName)
@@ -91,6 +92,7 @@ public void DoesMatch_NamesDoNotMatch_ReturnsFalse(
         [TestCase("DIGI SPORT 4 (RO)", "DIGISPORT4")]
         [TestCase("Jurnal TV Moldova", "MDJURNALTV")]
         [TestCase("MD: Canal Regional (Moldova)", "MDCANALREGIONAL")]
+        [TestCase("MD: ProTV Chisinau", "MDPROTVCHISINAU")]
         [TestCase("MINIMAX ROMANIA HD", "MINIMAXROMANIA")]
         [TestCase("Pro TV [B] RO", "PROTV")]
         [TestCase("RO    \" DIGI SPORT 1 HD RO", "DIGISPORT1")]
@@ -102,6 +104,8 @@ public void DoesMatch_NamesDoNotMatch_ReturnsFalse(
         [TestCase("RO: HBO HD RO", "HBO")]
         [TestCase("RO: Nașul TV (New!)", "NASULTV")]
         [TestCase("RO: Nickelodeon (RO)", "NICKELODEON")]
+        [TestCase("Ro: Pro TV backup", "PROTV")]
+        [TestCase("Ro: Romania TV backup", "ROMANIATV")]
         [TestCase("RO: Tele Moldova", "TELEMOLDOVA")]
         [TestCase("RO: TVR Moldova", "TVRMOLDOVA")]
         [TestCase("RO: U TV S1-1", "UTV")]