diff --git a/SharpRss/Services/RssService.cs b/SharpRss/Services/RssService.cs index 0fc22a5..c5e46c7 100644 --- a/SharpRss/Services/RssService.cs +++ b/SharpRss/Services/RssService.cs @@ -107,12 +107,12 @@ namespace SharpRss.Services if (newsCategory != null) { await AddSubscriptionAsync("https://www.nu.nl/rss/Algemeen", newsCategory); + await AddSubscriptionAsync("https://www.ad.nl/home/rss.xml", newsCategory); await AddSubscriptionAsync("https://www.nasa.gov/rss/dyn/breaking_news.rss", newsCategory); await AddSubscriptionAsync("http://news.google.com/?output=atom", newsCategory); - await AddSubscriptionAsync("https://www.ad.nl/home/rss.xml", newsCategory); - } + }*/ - CategoryModel? techCategory = await CreateCategoryAsync(new CategoryModel() { Name = "Tech" }); + /*CategoryModel? techCategory = await CreateCategoryAsync(new CategoryModel() { Name = "Tech" }); if (techCategory != null) { await AddSubscriptionAsync("https://itsfoss.com/feed", techCategory); diff --git a/SharpRss/SyndicationManager.cs b/SharpRss/SyndicationManager.cs index b60b0da..a4959be 100644 --- a/SharpRss/SyndicationManager.cs +++ b/SharpRss/SyndicationManager.cs @@ -114,8 +114,8 @@ namespace SharpRss Title = entry.Title?.Content ?? string.Empty, Description = entry.Summary?.Content ?? string.Empty, Link = entry.Id?.Uri.ToString() ?? string.Empty, - LastUpdated = entry.UpdatedOn is not { Ticks: <= 0 } ? new DateTimeOffset(entry.UpdatedOn) : DateTimeOffset.MinValue, - PublishingDate = entry.PublishedOn is not { Ticks: <= 0 } ? new DateTimeOffset(entry.PublishedOn) : DateTimeOffset.MinValue, + LastUpdated = entry.UpdatedOn is { Ticks: > 0 } ? new DateTimeOffset(entry.UpdatedOn) : DateTimeOffset.Now, + PublishingDate = entry.PublishedOn is { Ticks: > 0 } ? new DateTimeOffset(entry.PublishedOn) : entry.UpdatedOn, Authors = entry.Authors?.Select(auth => auth.Name).ToArray() ?? Array.Empty(), Categories = entry.Categories?.Select(cat => cat.Label).ToArray() ?? Array.Empty(), Content = entry.Content?.Content ?? string.Empty diff --git a/WebSharpRSS/Bootstrapper.cs b/WebSharpRSS/Bootstrapper.cs index 4b27b27..ff52262 100644 --- a/WebSharpRSS/Bootstrapper.cs +++ b/WebSharpRSS/Bootstrapper.cs @@ -39,8 +39,9 @@ namespace WebSharpRSS if (_configuration != null) return; _configuration = new LoggerConfiguration() .WriteTo.Console() - .WriteTo.File(new JsonFormatter(), Caretaker.Settings["Paths"].GetString("LogPath"), rollingInterval: RollingInterval.Day) - .MinimumLevel.Verbose(); // ONLY FOR DEBUGGING!!! + .WriteTo.File(new JsonFormatter(), Caretaker.Settings["Paths"].GetString("LogPath"), + rollingInterval: RollingInterval.Day); + /*.MinimumLevel.Verbose(); // ONLY FOR DEBUGGING!!!*/ Log.Logger = _configuration.CreateLogger(); } diff --git a/WebSharpRSS/WebSharpRSS.csproj b/WebSharpRSS/WebSharpRSS.csproj index 1598710..7fd8070 100644 --- a/WebSharpRSS/WebSharpRSS.csproj +++ b/WebSharpRSS/WebSharpRSS.csproj @@ -44,6 +44,9 @@ <_ContentIncludedByDefault Remove="logs\log_20230602.json" /> <_ContentIncludedByDefault Remove="logs\log_20230603.json" /> <_ContentIncludedByDefault Remove="logs\log_20230604.json" /> + <_ContentIncludedByDefault Remove="logs\log_20230605.json" /> + <_ContentIncludedByDefault Remove="logs\log_20230610.json" /> + <_ContentIncludedByDefault Remove="logs\log_20230611.json" /> diff --git a/WebSharpRSS/sharp_rss.sqlite b/WebSharpRSS/sharp_rss.sqlite index 40c2704..da222fd 100644 Binary files a/WebSharpRSS/sharp_rss.sqlite and b/WebSharpRSS/sharp_rss.sqlite differ