Merge pull request #44 from hmlendea/dev

Improvements and fixes
hmlendea · Jun 24, 2020 · ff079df · ff079df
2 parents 582adf5 + e346f73
commit ff079df
Show file tree

Hide file tree

Showing 18 changed files with 717 additions and 276 deletions.
diff --git a/Configuration/CacheSettings.cs b/Configuration/CacheSettings.cs
@@ -3,5 +3,15 @@ namespace IptvPlaylistAggregator.Configuration
     public sealed class CacheSettings
     {
         public string CacheDirectoryPath { get; set; }
+
+        public int HostCacheTimeout { get; set; }
+
+        public int StreamAliveStatusCacheTimeout { get; set; }
+
+        public int StreamDeadStatusCacheTimeout { get; set; }
+
+        public int StreamUnauthorisedStatusCacheTimeout { get; set; }
+
+        public int StreamNotFoundStatusCacheTimeout { get; set; }
     }
 }
diff --git a/Data/channels.xml b/Data/channels.xml
@@ -148,6 +148,7 @@
     <GroupId>local-dobrogea</GroupId>
     <LogoUrl>https://raw.githubusercontent.com/hmlendea/tv-logos/master/logos/alpha_media.png</LogoUrl>
     <Aliases>
+      <string>RO: Alfa Media TV</string>
       <string>RO: Alfa Media</string>
       <string>RO: Alpha Media TV</string>
       <string>RO: TV Alpha Media</string>
@@ -185,6 +186,7 @@
     <Aliases>
       <string>RO: Antena Comedy</string>
       <string>RO: Antena Play Comedy</string>
+      <string>RO: Antenna Comedy</string>
       <string>RO: Comedy Play</string>
     </Aliases>
   </ChannelDefinitionEntity>
@@ -2111,6 +2113,7 @@
     <GroupId>local-transilvania</GroupId>
     <LogoUrl>http://stvron.com/canale/mari/nova-tv-brasov.png</LogoUrl>
     <Aliases>
+      <string>RO: Nova Press</string>
       <string>RO: Nova TV Brasov</string>
     </Aliases>
   </ChannelDefinitionEntity>
@@ -2386,6 +2389,15 @@
       <string>RO: TV Publika</string>
     </Aliases>
   </ChannelDefinitionEntity>
+  <ChannelDefinitionEntity>
+    <Id>QTV.ro</Id>
+    <Name>QTV</Name>
+    <GroupId>unknown</GroupId>
+    <LogoUrl></LogoUrl>
+    <Aliases>
+      <string>RO: QTV</string>
+    </Aliases>
+  </ChannelDefinitionEntity>
   <ChannelDefinitionEntity>
     <Id>RadioCluj.ro</Id>
     <Name>Radio Cluj</Name>
@@ -2457,6 +2469,12 @@
     <GroupId>music</GroupId>
     <LogoUrl>https://upload.wikimedia.org/wikipedia/commons/7/7b/Retro_Music_TV_logo.png</LogoUrl>
   </ChannelDefinitionEntity>
+  <ChannelDefinitionEntity>
+    <Id>ROChannel.ro</Id>
+    <Name>RO Channel</Name>
+    <GroupId>international</GroupId>
+    <LogoUrl></LogoUrl>
+  </ChannelDefinitionEntity>
   <ChannelDefinitionEntity>
     <Id>RockTV.ro</Id>
     <Name>Rock TV</Name>
@@ -2609,6 +2627,9 @@
     <Name>Super TV</Name>
     <GroupId>local-muntenia</GroupId>
     <LogoUrl>https://raw.githubusercontent.com/hmlendea/tv-logos/master/logos/super_tv.png</LogoUrl>
+    <Aliases>
+      <string>RO: Super TV Argeș</string>
+    </Aliases>
   </ChannelDefinitionEntity>
   <ChannelDefinitionEntity>
     <Id>SuperTennis.ro</Id>
@@ -2636,9 +2657,13 @@
   </ChannelDefinitionEntity>
   <ChannelDefinitionEntity>
     <Id>TeleEuropaNova.ro</Id>
-    <Name>TeleEuropa Nova</Name>
+    <Name>Tele Nova</Name>
     <GroupId>local-banat</GroupId>
     <LogoUrl>https://raw.githubusercontent.com/hmlendea/tv-logos/master/logos/telenova.png</LogoUrl>
+    <Aliases>
+      <string>RO: Tele Nova Timișoara</string>
+      <string>RO: TeleEuropa Nova</string>
+    </Aliases>
   </ChannelDefinitionEntity>
   <ChannelDefinitionEntity>
     <Id>TelekomSport1.ro</Id>