nuget updates + useragent changes

hagaygo · hagaygo · commit 22d16eb702ca · 2025-05-14T19:45:03.000+03:00
diff --git a/Config.xml b/Config.xml
@@ -60,7 +60,7 @@
         <EndDate>1</EndDate>        
       </Parameters>  
     </Grabber>-->
-		<Grabber path="CyfrowyPolsat.pl.dll" channelPrefix="CyfrowyPolsat_">      
+		<!--<Grabber path="CyfrowyPolsat.pl.dll" channelPrefix="CyfrowyPolsat_">      
       <Parameters>
         <Channels>
 			<Channel>polsat-sport-1</Channel>
@@ -69,7 +69,7 @@
 			<Channel>polsat-sport-premium-2</Channel>			
 		</Channels>
       </Parameters>
-    </Grabber>
+    </Grabber>-->
 		<!--<Grabber path="sky.it.dll" channelPrefix="sky.it_">
       <Parameters>                   
         <Channels>
@@ -189,17 +189,16 @@
 				</Channels>
 			</Parameters>
 		</Grabber>-->
-		<!--<Grabber path="livesoccertv.com.dll" channelPrefix="livesoccertv.com_">
+		<Grabber path="livesoccertv.com.dll" channelPrefix="livesoccertv.com_">
 			<Parameters>				
 				<Channels>
-					<Channel>match-tv-football-1-russia</Channel>
 					<Channel>match-tv-football-2-russia</Channel>
+					<Channel>nova-sport-czech-republic</Channel>
+					<Channel>match-tv-football-1-russia</Channel>					
 					<Channel>match-tv-football-3-russia</Channel>
-					<Channel>dazn1-germany</Channel>
-					<Channel>dazn2-germany</Channel>
 				</Channels>
 			</Parameters>
-		</Grabber>-->
+		</Grabber>
 	</Grabbers>
 </Config>
 
diff --git a/Grabbers/Sky.it/Sky.it.csproj b/Grabbers/Sky.it/Sky.it.csproj
@@ -9,7 +9,7 @@
     <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="TimeZoneConverter" Version="6.1.0" />
+    <PackageReference Include="TimeZoneConverter" Version="7.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\XmlTvGenerator.Core\XmlTvGenerator.Core.csproj" />
diff --git a/Grabbers/entertainment.ie/entertainment.ie.csproj b/Grabbers/entertainment.ie/entertainment.ie.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="HtmlAgilityPack" Version="1.11.63" />
+    <PackageReference Include="HtmlAgilityPack" Version="1.12.1" />
     <PackageReference Include="HtmlAgilityPack.CssSelectors.NetCore" Version="1.2.1" />
-    <PackageReference Include="TimeZoneConverter" Version="6.1.0" />
+    <PackageReference Include="TimeZoneConverter" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Grabbers/livesoccertv.com/WebSiteGrabber.cs b/Grabbers/livesoccertv.com/WebSiteGrabber.cs
@@ -13,8 +13,29 @@ namespace livesoccertv.com
 {
     public class WebSiteGrabber : GrabberBase
     {
+        string[] userAgents = { 
+            "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:138.0) Gecko/20100101 Firefox/138.0",
+            "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:134.0) Gecko/20100101 Firefox/134.0",
+            "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:129.0) Gecko/20100101 Firefox/129.0"
+        };
+
+        int _userAgentCounter = 0;
+
+        string GetNextUserAgent()
+        {
+            if (_userAgentCounter >= userAgents.Length)
+            {
+                _userAgentCounter = 0;
+            }
+            return userAgents[_userAgentCounter++];
+        }
+
         public override List<Show> Grab(string xmlParameters, ILogger logger)
         {
+            const string ErrorPrefix = "livesoccertv.com";
+
+            logger.WriteEntry("Started livesoccertv.com grab", LogType.Info);
+
             var shows = new List<Show>();
 
             const string BaseUrl = "https://www.livesoccertv.com/channels/";
@@ -28,7 +49,7 @@ public override List<Show> Grab(string xmlParameters, ILogger logger)
                     logger.WriteEntry($"Grabbing Channel {channel}", LogType.Info);
                     var url = $"{BaseUrl}{channel}/";
                     var wr = (HttpWebRequest)WebRequest.Create(url);
-                    wr.UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:129.0) Gecko/20100101 Firefox/129.0";
+                    wr.UserAgent = GetNextUserAgent();
                     wr.Timeout = 10000;
                     var channelShows = new List<Show>();
                     using (var res = wr.GetResponse())
@@ -43,8 +64,8 @@ public override List<Show> Grab(string xmlParameters, ILogger logger)
                             {
                                 var show = new Show();
                                 show.Channel = channel;
-                                show.Title = row.QuerySelector("td[id=match]").InnerText;
-                                show.Description = row.QuerySelector("td.compcell_right").InnerText;
+                                show.Title = row.QuerySelector("td[id=match]").InnerText?.Trim();
+                                show.Description = row.QuerySelector("td.compcell_right").InnerText?.Trim();
                                 var el = row.QuerySelector("td.timecol span.ts");
                                 if (el != null)
                                 {
@@ -54,7 +75,7 @@ public override List<Show> Grab(string xmlParameters, ILogger logger)
                             }
                             catch (Exception ex)
                             {
-                                logger.LogException(ex);
+                                logger.LogException(ex, ErrorPrefix);
                             }
                         }
                     }
@@ -64,9 +85,10 @@ public override List<Show> Grab(string xmlParameters, ILogger logger)
                 }
                 catch (Exception ex)
                 {
-                    logger.LogException(ex);
+                    logger.LogException(ex, ErrorPrefix);
                 }
             }
+            logger.WriteEntry("Finished livesoccertv.com grab", LogType.Info);
             return shows;
         }
     }
diff --git a/Grabbers/livesoccertv.com/livesoccertv.com.csproj b/Grabbers/livesoccertv.com/livesoccertv.com.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="HtmlAgilityPack" Version="1.11.63" />
+    <PackageReference Include="HtmlAgilityPack" Version="1.12.1" />
     <PackageReference Include="HtmlAgilityPack.CssSelectors.NetCore" Version="1.2.1" />
   </ItemGroup>
 
diff --git a/Grabbers/nos.pt/nos.pt.csproj b/Grabbers/nos.pt/nos.pt.csproj
@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="HtmlAgilityPack.CssSelectors.NetCore" Version="1.2.1" />
-    <PackageReference Include="TimeZoneConverter" Version="6.1.0" />
+    <PackageReference Include="TimeZoneConverter" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Grabbers/ontvtonight.com/ontvtonight.com.csproj b/Grabbers/ontvtonight.com/ontvtonight.com.csproj
@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="HtmlAgilityPack.CssSelectors.NetCore" Version="1.2.1" />
-    <PackageReference Include="TimeZoneConverter" Version="6.1.0" />
+    <PackageReference Include="TimeZoneConverter" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Grabbers/ontvtonight.com/ontvtonight.cs b/Grabbers/ontvtonight.com/ontvtonight.cs
@@ -82,7 +82,7 @@ public override List<Show> Grab(string xmlParameters, ILogger logger)
                 }
                 catch (Exception ex)
                 {
-                    logger.LogException(ex);
+                    logger.LogException(ex, "ontvtonight.com");
                 }
             }
 
diff --git a/Grabbers/streamingtvguides.com/WebSiteGrabber.cs b/Grabbers/streamingtvguides.com/WebSiteGrabber.cs
@@ -80,7 +80,7 @@ public override List<Show> Grab(string xmlParameters, ILogger logger)
                 }
                 catch (Exception ex)
                 {
-                    logger.LogException(ex);
+                    logger.LogException(ex, "streamingtvguides.com");
                 }
             }
             
diff --git a/Grabbers/streamingtvguides.com/streamingtvguides.com.csproj b/Grabbers/streamingtvguides.com/streamingtvguides.com.csproj
@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="HtmlAgilityPack.CssSelectors.NetCore" Version="1.2.1" />
-    <PackageReference Include="TimeZoneConverter" Version="6.1.0" />
+    <PackageReference Include="TimeZoneConverter" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Grabbers/tv-guide-listings.co.uk/tv-guide-listings.co.uk.csproj b/Grabbers/tv-guide-listings.co.uk/tv-guide-listings.co.uk.csproj
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="HtmlAgilityPack.CssSelectors.NetCore" Version="1.2.1" />
-    <PackageReference Include="TimeZoneConverter" Version="6.1.0" />
+    <PackageReference Include="TimeZoneConverter" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Grabbers/yes.co.il/yes.co.il.csproj b/Grabbers/yes.co.il/yes.co.il.csproj
@@ -7,7 +7,7 @@
   <ItemGroup>
     <PackageReference Include="HtmlAgilityPack.CssSelectors.NetCore" Version="1.2.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="TimeZoneConverter" Version="6.1.0" />
+    <PackageReference Include="TimeZoneConverter" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Logger/FileLogger.cs b/Logger/FileLogger.cs
@@ -36,7 +36,7 @@ public void LogException(Exception ex, string errorPrefix = null)
         {
             while (ex.InnerException != null)
                 ex = ex.InnerException;
-            if (string.IsNullOrEmpty(errorPrefix))
+            if (!string.IsNullOrEmpty(errorPrefix))
                 errorPrefix += " ";
             WriteEntry($"{errorPrefix}{ex.Message}\n{ex.StackTrace}", LogType.Error);
         }
diff --git a/XmlTvGenerator.Core/XmlTvGenerator.Core.csproj b/XmlTvGenerator.Core/XmlTvGenerator.Core.csproj
@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="GoogleTranslateFreeApi" Version="1.1.1" />
-    <PackageReference Include="HtmlAgilityPack" Version="1.11.63" />
+    <PackageReference Include="HtmlAgilityPack" Version="1.12.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
diff --git a/XmlTvGenerator.csproj b/XmlTvGenerator.csproj
@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="HtmlAgilityPack" Version="1.11.63" />
+    <PackageReference Include="HtmlAgilityPack" Version="1.12.1" />
   </ItemGroup>  
 
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,29 @@ namespace livesoccertv.com`
`13`	`13`	`{`
`14`	`14`	`public class WebSiteGrabber : GrabberBase`
`15`	`15`	`{`
	`16`	`+ string[] userAgents = {`
	`17`	`+ "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:138.0) Gecko/20100101 Firefox/138.0",`
	`18`	`+ "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:134.0) Gecko/20100101 Firefox/134.0",`
	`19`	`+ "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:129.0) Gecko/20100101 Firefox/129.0"`
	`20`	`+ };`
	`21`	`+`
	`22`	`+ int _userAgentCounter = 0;`
	`23`	`+`
	`24`	`+ string GetNextUserAgent()`
	`25`	`+ {`
	`26`	`+ if (_userAgentCounter >= userAgents.Length)`
	`27`	`+ {`
	`28`	`+ _userAgentCounter = 0;`
	`29`	`+ }`
	`30`	`+ return userAgents[_userAgentCounter++];`
	`31`	`+ }`
	`32`	`+`
`16`	`33`	`public override List<Show> Grab(string xmlParameters, ILogger logger)`
`17`	`34`	`{`
	`35`	`+ const string ErrorPrefix = "livesoccertv.com";`
	`36`	`+`
	`37`	`+ logger.WriteEntry("Started livesoccertv.com grab", LogType.Info);`
	`38`	`+`
`18`	`39`	`var shows = new List<Show>();`
`19`	`40`
`20`	`41`	`const string BaseUrl = "https://www.livesoccertv.com/channels/";`
`@@ -28,7 +49,7 @@ public override List<Show> Grab(string xmlParameters, ILogger logger)`
`28`	`49`	`logger.WriteEntry($"Grabbing Channel {channel}", LogType.Info);`
`29`	`50`	`var url = $"{BaseUrl}{channel}/";`
`30`	`51`	`var wr = (HttpWebRequest)WebRequest.Create(url);`
`31`		`- wr.UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:129.0) Gecko/20100101 Firefox/129.0";`
	`52`	`+ wr.UserAgent = GetNextUserAgent();`
`32`	`53`	`wr.Timeout = 10000;`
`33`	`54`	`var channelShows = new List<Show>();`
`34`	`55`	`using (var res = wr.GetResponse())`
`@@ -43,8 +64,8 @@ public override List<Show> Grab(string xmlParameters, ILogger logger)`
`43`	`64`	`{`
`44`	`65`	`var show = new Show();`
`45`	`66`	`show.Channel = channel;`
`46`		`- show.Title = row.QuerySelector("td[id=match]").InnerText;`
`47`		`- show.Description = row.QuerySelector("td.compcell_right").InnerText;`
	`67`	`+ show.Title = row.QuerySelector("td[id=match]").InnerText?.Trim();`
	`68`	`+ show.Description = row.QuerySelector("td.compcell_right").InnerText?.Trim();`
`48`	`69`	`var el = row.QuerySelector("td.timecol span.ts");`
`49`	`70`	`if (el != null)`
`50`	`71`	`{`
`@@ -54,7 +75,7 @@ public override List<Show> Grab(string xmlParameters, ILogger logger)`
`54`	`75`	`}`
`55`	`76`	`catch (Exception ex)`
`56`	`77`	`{`
`57`		`- logger.LogException(ex);`
	`78`	`+ logger.LogException(ex, ErrorPrefix);`
`58`	`79`	`}`
`59`	`80`	`}`
`60`	`81`	`}`
`@@ -64,9 +85,10 @@ public override List<Show> Grab(string xmlParameters, ILogger logger)`
`64`	`85`	`}`
`65`	`86`	`catch (Exception ex)`
`66`	`87`	`{`
`67`		`- logger.LogException(ex);`
	`88`	`+ logger.LogException(ex, ErrorPrefix);`
`68`	`89`	`}`
`69`	`90`	`}`
	`91`	`+ logger.WriteEntry("Finished livesoccertv.com grab", LogType.Info);`
`70`	`92`	`return shows;`
`71`	`93`	`}`
`72`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public override List<Show> Grab(string xmlParameters, ILogger logger)`
`82`	`82`	`}`
`83`	`83`	`catch (Exception ex)`
`84`	`84`	`{`
`85`		`- logger.LogException(ex);`
	`85`	`+ logger.LogException(ex, "ontvtonight.com");`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public override List<Show> Grab(string xmlParameters, ILogger logger)`
`80`	`80`	`}`
`81`	`81`	`catch (Exception ex)`
`82`	`82`	`{`
`83`		`- logger.LogException(ex);`
	`83`	`+ logger.LogException(ex, "streamingtvguides.com");`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`