From bd5728b504fa8b658d1b33e35ab4aa555353576e Mon Sep 17 00:00:00 2001 From: "KOUJIRI-WIN11\\koujiri" Date: Mon, 7 Sep 2026 17:41:57 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20HentaiPaw=E3=81=AE=E3=82=AB=E3=83=90?= =?UTF-8?q?=E3=83=BC=E7=94=BB=E5=83=8FLast-Modified=E3=81=8B=E3=82=89?= =?UTF-8?q?=E5=80=8B=E5=88=A5=E3=81=AE=E5=85=AC=E9=96=8B=E3=83=BB=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=99=82=E9=96=93=E3=82=92=E5=8F=96=E5=BE=97=E3=83=BB?= =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rss-generator/Class/HentaiPaw/hentaipaw.cs | 102 ++++++++++++++++++++- 1 file changed, 98 insertions(+), 4 deletions(-) diff --git a/rss-generator/Class/HentaiPaw/hentaipaw.cs b/rss-generator/Class/HentaiPaw/hentaipaw.cs index 4b7fb1c..64d1024 100644 --- a/rss-generator/Class/HentaiPaw/hentaipaw.cs +++ b/rss-generator/Class/HentaiPaw/hentaipaw.cs @@ -74,6 +74,14 @@ internal static class hentaipaw .Where(a => !string.Equals(a.GetAttribute("href"), "/articles/rank", StringComparison.OrdinalIgnoreCase)) .ToList(); + // カードに掲載されているカバー画像 URL を収集し、Last-Modified(公開・更新日時)を一括並列取得 + var coverImageUrls = articleCards + .Select(card => card.QuerySelector("img")?.GetAttribute("src")?.Trim() + ?? card.QuerySelector("img")?.GetAttribute("data-src")?.Trim() + ?? string.Empty) + .Where(src => !string.IsNullOrEmpty(src)); + var imageLastModifiedMap = await FetchImagesLastModifiedAsync(client, coverImageUrls); + var linkList = new HashSet(StringComparer.OrdinalIgnoreCase); int itemIndex = 0; @@ -129,19 +137,28 @@ internal static class hentaipaw var categories = new List(); var authors = new List(); + // カバー画像の Last-Modified から正確な個別公開日時を取得 + DateTimeOffset? detectedDate = null; + if (!string.IsNullOrEmpty(imgSrc) && imageLastModifiedMap.TryGetValue(imgSrc, out var imgDate)) + { + detectedDate = imgDate; + } + if (prevEntry != null && !string.IsNullOrEmpty(prevEntry.SummaryHtml)) { // 既に取得済みの記事はキャッシュを活用(FlareSolverrへのアクセスを削減) - itemPubDate = prevEntry.PublishDate; summaryHtml = prevEntry.SummaryHtml; categories.AddRange(prevEntry.Categories); authors.AddRange(prevEntry.Authors); + + // キャッシュされた日時は、カバー画像の日時が取得できればそちらに更新(過去の生成日時キャッシュを修復) + itemPubDate = detectedDate ?? (prevEntry.PublishDate != DateTimeOffset.MinValue + ? prevEntry.PublishDate + : new DateTimeOffset(DateTime.Now.AddSeconds(-itemIndex))); } else { // 新規記事の場合、個別ページから詳細メタ情報を取得 - itemPubDate = new DateTimeOffset(DateTime.Now.AddSeconds(-itemIndex)); - string? author = null; string? circle = null; string? parody = null; @@ -230,6 +247,25 @@ internal static class hentaipaw LogManager.AddLog($"[警告] hentaipaw 詳細ページ取得失敗 ({fullUrl}): {ex.Message}"); } + // カバー画像の日時を最終決定(詳細ページで imgSrc が変更された場合のフォールバック含む) + if (!string.IsNullOrEmpty(imgSrc)) + { + if (imageLastModifiedMap.TryGetValue(imgSrc, out var updatedDate)) + { + detectedDate = updatedDate; + } + else if (!detectedDate.HasValue) + { + detectedDate = await GetImageLastModifiedAsync(client, imgSrc); + if (detectedDate.HasValue) + { + imageLastModifiedMap[imgSrc] = detectedDate.Value; + } + } + } + + itemPubDate = detectedDate ?? new DateTimeOffset(DateTime.Now.AddSeconds(-itemIndex)); + // 本文 HTML (Summary) の生成 var body = new StringBuilder(); string viewerUrl = $"https://ja.hentaipaw.com/viewer?articleId={Uri.EscapeDataString(articleId)}&page=1"; @@ -319,7 +355,7 @@ internal static class hentaipaw } feed.Items = items; - await CmnUtil.ExportXMLFileAsync("hentaipaw.xml", feed, client); + await CmnUtil.ExportXMLFileAsync("hentaipaw.xml", feed, client, filter24Hours: false); } finally { @@ -390,4 +426,62 @@ internal static class hentaipaw return existingEntries; } + + /// + /// カバー画像 URL 群の Last-Modified ヘッダーを一括並列取得し、URL と公開・更新日時(JST)のマッピングを返します。 + /// + private static async Task> FetchImagesLastModifiedAsync(HttpClient client, IEnumerable imageUrls) + { + var dict = new Dictionary(StringComparer.OrdinalIgnoreCase); + var distinctUrls = imageUrls.Where(u => !string.IsNullOrEmpty(u)).Distinct(StringComparer.OrdinalIgnoreCase).ToList(); + if (distinctUrls.Count == 0) + { + return dict; + } + + var tasks = distinctUrls.Select(async url => + { + var date = await GetImageLastModifiedAsync(client, url); + return (Url: url, Date: date); + }); + + var results = await Task.WhenAll(tasks); + foreach (var r in results) + { + if (r.Date.HasValue) + { + dict[r.Url] = r.Date.Value; + } + } + + return dict; + } + + /// + /// 単一のカバー画像 URL に対して HTTP HEAD リクエストを送信し、Last-Modified ヘッダーから公開・更新日時(JST)を取得します。 + /// + private static async Task GetImageLastModifiedAsync(HttpClient client, string imageUrl) + { + if (string.IsNullOrEmpty(imageUrl)) + { + return null; + } + + try + { + using var req = new HttpRequestMessage(HttpMethod.Head, imageUrl); + using var resp = await client.SendAsync(req, HttpCompletionOption.ResponseHeadersRead); + if (resp.IsSuccessStatusCode && resp.Content.Headers.LastModified.HasValue) + { + // JST (+09:00) に変換 + return resp.Content.Headers.LastModified.Value.ToOffset(TimeSpan.FromHours(9)); + } + } + catch + { + // 取得失敗時は null を返す + } + + return null; + } }