From 12a1f48fbdef12cca43bcea59b9c1f86883b0bdc Mon Sep 17 00:00:00 2001 From: littlefoot Date: Sun, 17 Jul 2022 22:26:22 -0400 Subject: [PATCH] Fix up times and remove extraneous api inject from NovelList.razor --- WebNovelPortal/Shared/Components/Display/NovelList.razor | 3 --- WebNovelPortalAPI/Scrapers/AbstractScraper.cs | 8 ++++---- WebNovelPortalAPI/Scrapers/KakuyomuScraper.cs | 2 +- WebNovelPortalAPI/Scrapers/SyosetuScraper.cs | 8 ++++---- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/WebNovelPortal/Shared/Components/Display/NovelList.razor b/WebNovelPortal/Shared/Components/Display/NovelList.razor index 7c53f66..ecdadea 100644 --- a/WebNovelPortal/Shared/Components/Display/NovelList.razor +++ b/WebNovelPortal/Shared/Components/Display/NovelList.razor @@ -39,7 +39,4 @@ [Parameter] public bool InputDisabled { get; set; } - [Inject] - private WebApiAccessLayer Api { get; set; } - } \ No newline at end of file diff --git a/WebNovelPortalAPI/Scrapers/AbstractScraper.cs b/WebNovelPortalAPI/Scrapers/AbstractScraper.cs index 8a0d625..511c930 100644 --- a/WebNovelPortalAPI/Scrapers/AbstractScraper.cs +++ b/WebNovelPortalAPI/Scrapers/AbstractScraper.cs @@ -72,8 +72,8 @@ public abstract class AbstractScraper : IScraper ChapterNumber = i + 1, Url = $"{baseUrl}{node.Attributes["href"].Value}", Name = node.SelectSingleNode(namexpath).InnerText, - DatePosted = dates.Posted, - DateUpdated = dates.Updated + DatePosted = dates.Posted?.ToUniversalTime(), + DateUpdated = dates.Updated?.ToUniversalTime() }; }); @@ -93,13 +93,13 @@ public abstract class AbstractScraper : IScraper protected virtual DateTime GetPostedDate(HtmlDocument document, string baseUrl, string novelUrl) { var xpath = DatePostedPattern; - return DateTime.Parse(document.DocumentNode.SelectSingleNode(xpath).InnerText); + return DateTime.Parse(document.DocumentNode.SelectSingleNode(xpath).InnerText).ToUniversalTime(); } protected virtual DateTime GetLastUpdatedDate(HtmlDocument document, string baseUrl, string novelUrl) { var xpath = DateUpdatedPattern; - return DateTime.Parse(document.DocumentNode.SelectSingleNode(xpath).InnerText); + return DateTime.Parse(document.DocumentNode.SelectSingleNode(xpath).InnerText).ToUniversalTime(); } public Novel ScrapeNovel(string url) diff --git a/WebNovelPortalAPI/Scrapers/KakuyomuScraper.cs b/WebNovelPortalAPI/Scrapers/KakuyomuScraper.cs index e7792f0..96363f1 100644 --- a/WebNovelPortalAPI/Scrapers/KakuyomuScraper.cs +++ b/WebNovelPortalAPI/Scrapers/KakuyomuScraper.cs @@ -32,6 +32,6 @@ public class KakuyomuScraper : AbstractScraper string novelUrl) { var datePosted = linkNode.SelectSingleNode(ChapterPostedPattern).Attributes["datetime"].Value; - return (DateTime.Parse(datePosted), null); + return (DateTime.Parse(datePosted).ToUniversalTime(), null); } } \ No newline at end of file diff --git a/WebNovelPortalAPI/Scrapers/SyosetuScraper.cs b/WebNovelPortalAPI/Scrapers/SyosetuScraper.cs index a5a8b5b..f1acd8f 100644 --- a/WebNovelPortalAPI/Scrapers/SyosetuScraper.cs +++ b/WebNovelPortalAPI/Scrapers/SyosetuScraper.cs @@ -62,8 +62,8 @@ public class SyosetuScraper : AbstractScraper Name = node.InnerText, Url = baseUrl + node.Attributes["href"].Value, ChapterNumber = i+1, - DatePosted = datePosted, - DateUpdated = dateUpdated + DatePosted = datePosted.ToUniversalTime(), + DateUpdated = dateUpdated.ToUniversalTime() }; }).ToList(); } @@ -92,7 +92,7 @@ public class SyosetuScraper : AbstractScraper } var node = doc.DocumentNode.SelectSingleNode(DatePostedPattern); - return DateTime.Parse(node.InnerText); + return DateTime.Parse(node.InnerText).ToUniversalTime(); } protected override DateTime GetLastUpdatedDate(HtmlDocument document, string baseUrl, string novelUrl) @@ -102,7 +102,7 @@ public class SyosetuScraper : AbstractScraper { return DateTime.MinValue; } - return DateTime.Parse(doc.DocumentNode.SelectNodes(DateUpdatedPattern)[1].InnerText); + return DateTime.Parse(doc.DocumentNode.SelectNodes(DateUpdatedPattern)[1].InnerText).ToUniversalTime(); } protected override List GetTags(HtmlDocument document, string baseUrl, string novelUrl)