diff --git a/rss-generator/Class/RSS/Danbooru/rank.cs b/rss-generator/Class/RSS/Danbooru/rank.cs
index 66d0ae9..8d2c1e7 100644
--- a/rss-generator/Class/RSS/Danbooru/rank.cs
+++ b/rss-generator/Class/RSS/Danbooru/rank.cs
@@ -272,7 +272,7 @@ internal class rank
// 画像の配置
if (!string.IsNullOrEmpty(imageUrl))
{
- body.Append($@"
");
+ body.Append($@"");
}
// 画像のすぐ下に作者コメントを追加
diff --git a/rss-generator/Class/RSS/YouTube/YouTubeFeedManager.cs b/rss-generator/Class/RSS/YouTube/YouTubeFeedManager.cs
index bfa1bdb..084ea79 100644
--- a/rss-generator/Class/RSS/YouTube/YouTubeFeedManager.cs
+++ b/rss-generator/Class/RSS/YouTube/YouTubeFeedManager.cs
@@ -395,7 +395,7 @@ public static class YouTubeFeedManager
if (!string.IsNullOrWhiteSpace(video.ThumbnailUrl))
{
- body.Append($@"");
+ body.Append($@"");
}
body.Append($@"");
diff --git a/rss-generator/Class/RSS/aurahentai.cs b/rss-generator/Class/RSS/aurahentai.cs
index 1f5d1e4..bb17214 100644
--- a/rss-generator/Class/RSS/aurahentai.cs
+++ b/rss-generator/Class/RSS/aurahentai.cs
@@ -209,7 +209,7 @@ internal class aurahentai
// 1枚目画像
body.Append($"");
- body.Append($"

");
+ body.Append($"

");
body.Append($"
");
if (!string.IsNullOrWhiteSpace(pageCount) || !string.IsNullOrWhiteSpace(category))
diff --git a/rss-generator/Class/RSS/ci_en.cs b/rss-generator/Class/RSS/ci_en.cs
index 8653a8a..b6f981f 100644
--- a/rss-generator/Class/RSS/ci_en.cs
+++ b/rss-generator/Class/RSS/ci_en.cs
@@ -96,7 +96,7 @@ internal class ci_en
if (!string.IsNullOrEmpty(targetImgSrc))
{
var linkUrl = !string.IsNullOrEmpty(rawSrc) ? rawSrc : targetImgSrc;
- var imgTagHtml = $@"
";
+ var imgTagHtml = $@"
";
var fragment = parser.ParseDocument(imgTagHtml);
var newElement = fragment.Body?.FirstElementChild;
@@ -131,6 +131,7 @@ internal class ci_en
img.SetAttribute("src", dataSrc);
}
+ img.SetAttribute("referrerpolicy", "no-referrer");
img.SetAttribute("style", "max-width: 100%; height: auto;");
}
@@ -151,7 +152,7 @@ internal class ci_en
if (!string.IsNullOrEmpty(coverImageUrl))
{
- body.Append($@"");
+ body.Append($@"");
}
body.Append(CmnUtil.GetHtmlWithoutJavaScript(divDetail));
diff --git a/rss-generator/Class/RSS/e_hentai/e_hentai_common.cs b/rss-generator/Class/RSS/e_hentai/e_hentai_common.cs
index 23a3ead..6465421 100644
--- a/rss-generator/Class/RSS/e_hentai/e_hentai_common.cs
+++ b/rss-generator/Class/RSS/e_hentai/e_hentai_common.cs
@@ -205,127 +205,51 @@ internal static class e_hentai_common
public const int MaxImagesPerGallery = 1;
///
- /// 対象ギャラリーの詳細ページ・ビューアページを巡回し、日本語タイトルおよび画像の直接URLを取得します。
+ /// 対象ギャラリーの詳細ページ(p=0)を取得し、日本語タイトルを取得します。
+ /// (画像は一覧ページの静的サムネイルを使用するため、H@H ビューアページへのアクセスは行いません)
///
/// HttpClient インスタンス
/// ギャラリー情報オブジェクト
- /// 取得する最大画像数(デフォルト: MaxImagesPerGallery)
- /// 画像URLリスト(順序保持)
+ /// 取得する最大画像数(互換性のための引数)
+ /// 空の画像リスト(ThumbnailUrl を使用するため)
public static async Task> FetchAllGalleryImagesAsync(HttpClient client, GalleryItem gallery, int maxImages = MaxImagesPerGallery)
{
var parser = new HtmlParser();
- var viewerLinks = new List();
try
{
- // 1. ギャラリー詳細ページから必要な枚数分のビューアリンク(/s/...)を収集
- int p = 0;
- while (viewerLinks.Count < maxImages)
+ // ギャラリー詳細ページ(p == 0)で日本語タイトル (#gj) が存在すればタイトルを更新
+ var pageUrl = $"{gallery.Url}?p=0";
+ using var req = new HttpRequestMessage(HttpMethod.Get, pageUrl);
+ req.Headers.Add("Cookie", "nw=1");
+
+ using var res = await client.SendAsync(req);
+ if (res.IsSuccessStatusCode)
{
- var pageUrl = $"{gallery.Url}?p={p}";
- using var req = new HttpRequestMessage(HttpMethod.Get, pageUrl);
- req.Headers.Add("Cookie", "nw=1");
-
- using var res = await client.SendAsync(req);
- if (!res.IsSuccessStatusCode) break;
-
var html = await res.Content.ReadAsStringAsync();
var doc = await parser.ParseDocumentAsync(html);
- // 最初の詳細ページ(p == 0)で日本語タイトル (#gj) が存在すればタイトルを更新
- if (p == 0)
+ var japaneseTitle = doc.QuerySelector("#gd2 #gj, #gj")?.TextContent.Trim();
+ if (!string.IsNullOrEmpty(japaneseTitle))
{
- var japaneseTitle = doc.QuerySelector("#gd2 #gj, #gj")?.TextContent.Trim();
- if (!string.IsNullOrEmpty(japaneseTitle))
+ gallery.Title = japaneseTitle;
+ }
+ else
+ {
+ var englishTitle = doc.QuerySelector("#gd2 #gn, #gn")?.TextContent.Trim();
+ if (!string.IsNullOrEmpty(englishTitle) && (string.IsNullOrEmpty(gallery.Title) || gallery.Title == "No Title"))
{
- gallery.Title = japaneseTitle;
- }
- else
- {
- var englishTitle = doc.QuerySelector("#gd2 #gn, #gn")?.TextContent.Trim();
- if (!string.IsNullOrEmpty(englishTitle) && (string.IsNullOrEmpty(gallery.Title) || gallery.Title == "No Title"))
- {
- gallery.Title = englishTitle;
- }
+ gallery.Title = englishTitle;
}
}
-
- var links = doc.QuerySelectorAll("#gdt a")
- .Select(a => a.GetAttribute("href"))
- .Where(href => !string.IsNullOrEmpty(href) && href.Contains("/s/"))
- .ToList();
-
- if (links.Count == 0) break;
- if (viewerLinks.Contains(links[0]!)) break;
-
- viewerLinks.AddRange(links!);
-
- // 最大枚数に達した場合はこれ以上のページ取得をスキップ
- if (viewerLinks.Count >= maxImages)
- {
- break;
- }
-
- // ページネーション末尾の確認
- var ptb = doc.QuerySelector("table.ptb");
- var nextPtb = ptb?.QuerySelector("td:last-child a");
- if (nextPtb == null)
- {
- break;
- }
- p++;
}
-
- if (viewerLinks.Count == 0)
- {
- return new List();
- }
-
- // 必要枚数(maxImages)までに絞り込む
- var targetViewerLinks = viewerLinks.Take(maxImages).ToList();
-
- // 2. 各ビューアページから画像URL(#img src)を並行取得
- var imageUrls = new string[targetViewerLinks.Count];
- var semaphore = new System.Threading.SemaphoreSlim(8); // 最大同時8接続
-
- var tasks = targetViewerLinks.Select(async (vLink, index) =>
- {
- await semaphore.WaitAsync();
- try
- {
- using var vReq = new HttpRequestMessage(HttpMethod.Get, vLink);
- vReq.Headers.Add("Cookie", "nw=1");
- using var vRes = await client.SendAsync(vReq);
- if (vRes.IsSuccessStatusCode)
- {
- var vHtml = await vRes.Content.ReadAsStringAsync();
- var vDoc = await parser.ParseDocumentAsync(vHtml);
- var imgSrc = vDoc.QuerySelector("#img")?.GetAttribute("src");
- if (!string.IsNullOrEmpty(imgSrc))
- {
- imageUrls[index] = imgSrc;
- }
- }
- }
- catch (Exception ex)
- {
- LogManager.AddLog($"[警告] ビューア画像取得エラー ({vLink}): {ex.Message}");
- }
- finally
- {
- semaphore.Release();
- }
- });
-
- await Task.WhenAll(tasks);
-
- return imageUrls.Where(url => !string.IsNullOrEmpty(url)).ToList();
}
catch (Exception ex)
{
- LogManager.AddLog($"[エラー] ギャラリー画像取得エラー ({gallery.Url}): {ex.Message}");
- return new List();
+ LogManager.AddLog($"[警告] ギャラリー詳細取得エラー ({gallery.Url}): {ex.Message}");
}
+
+ return new List();
}
///
@@ -335,14 +259,14 @@ internal static class e_hentai_common
{
var galleryList = galleries.ToList();
- // 各ギャラリーの画像取得を並行して実行(最大8ギャラリー同時)
+ // 各ギャラリーの詳細ページ取得を並行して実行(最大8ギャラリー同時)
var gallerySemaphore = new System.Threading.SemaphoreSlim(8);
var fetchImageTasks = galleryList.Select(async gallery =>
{
await gallerySemaphore.WaitAsync();
try
{
- gallery.ImageUrls = await FetchAllGalleryImagesAsync(client, gallery, MaxImagesPerGallery);
+ await FetchAllGalleryImagesAsync(client, gallery);
}
finally
{
@@ -356,39 +280,37 @@ internal static class e_hentai_common
foreach (var gallery in galleryList)
{
- var item = new SyndicationItem
+ var itemUri = new Uri(gallery.Url);
+ var item = new SyndicationItem(
+ gallery.Title,
+ string.Empty,
+ itemUri,
+ CmnUtil.CreateGuid(gallery.Url),
+ gallery.PublishedDate
+ )
{
- Title = new TextSyndicationContent(gallery.Title),
PublishDate = gallery.PublishedDate,
- LastUpdatedTime = gallery.PublishedDate,
- Id = CmnUtil.CreateGuid(gallery.Url)
+ LastUpdatedTime = gallery.PublishedDate
};
- // ギャラリーへのリンク
- if (Uri.TryCreate(gallery.Url, UriKind.Absolute, out var uri))
- {
- item.Links.Add(new SyndicationLink(uri));
- }
-
- // カテゴリ(作品ジャンル)の追加
- if (!string.IsNullOrWhiteSpace(gallery.Category))
+ // カテゴリ
+ if (!string.IsNullOrEmpty(gallery.Category))
{
item.Categories.Add(new SyndicationCategory(gallery.Category));
}
- // 各タグをカテゴリに追加
+ // タグ
foreach (var tag in gallery.Tags)
{
item.Categories.Add(new SyndicationCategory(tag));
}
- // アップローダーを著者に追加
- if (!string.IsNullOrWhiteSpace(gallery.Uploader))
+ // アップローダー
+ if (!string.IsNullOrEmpty(gallery.Uploader))
{
item.Authors.Add(new SyndicationPerson { Name = gallery.Uploader });
}
- // 本文 HTML の整形
var body = new StringBuilder();
// ギャラリー表示リンク
@@ -403,17 +325,15 @@ internal static class e_hentai_common
body.Append($"");
}
- // ギャラリーの1枚目画像
- string? firstImg = gallery.ImageUrls.FirstOrDefault();
- if (string.IsNullOrEmpty(firstImg))
- {
- firstImg = gallery.ThumbnailUrl;
- }
+ // 静的一覧サムネイル URL を最優先で使用(H@H 一時 URL の 403 回避)
+ string? firstImg = !string.IsNullOrEmpty(gallery.ThumbnailUrl)
+ ? gallery.ThumbnailUrl
+ : gallery.ImageUrls.FirstOrDefault();
if (!string.IsNullOrEmpty(firstImg))
{
body.Append($"");
- body.Append($"

");
+ body.Append($"

");
body.Append($"
");
}
diff --git a/rss-generator/Class/RSS/hitomi_la/index_japanese.cs b/rss-generator/Class/RSS/hitomi_la/index_japanese.cs
index 9a05045..d255e31 100644
--- a/rss-generator/Class/RSS/hitomi_la/index_japanese.cs
+++ b/rss-generator/Class/RSS/hitomi_la/index_japanese.cs
@@ -198,7 +198,7 @@ internal class index_japanese
if (!string.IsNullOrEmpty(imgSrc))
{
body.Append($"");
- body.Append($"

");
+ body.Append($"

");
body.Append($"
");
}
diff --git a/rss-generator/Class/RSS/kimochiinfo.cs b/rss-generator/Class/RSS/kimochiinfo.cs
index c7ca367..478e63c 100644
--- a/rss-generator/Class/RSS/kimochiinfo.cs
+++ b/rss-generator/Class/RSS/kimochiinfo.cs
@@ -1,4 +1,4 @@
-using AngleSharp.Dom;
+using AngleSharp.Dom;
using AngleSharp.Html.Dom;
using System;
using System.Collections.Generic;
@@ -95,7 +95,7 @@ internal class kimochiinfo
body.Append($@"バージョン:{versionText}
");
body.Append($@"");
- body.Append($@"");
+ body.Append($@"");
body.Append(CmnUtil.GetHtmlWithoutJavaScript(divDetail));
var item = new SyndicationItem(
diff --git a/rss-generator/Class/RSS/mangalear.cs b/rss-generator/Class/RSS/mangalear.cs
index 784988e..51389c0 100644
--- a/rss-generator/Class/RSS/mangalear.cs
+++ b/rss-generator/Class/RSS/mangalear.cs
@@ -115,7 +115,7 @@ internal class mangalear
{
if (Uri.TryCreate(link, eyeCatchUrl, out var absoluteEyeCatchUri))
{
- body.Append($@"");
+ body.Append($@"");
}
}
@@ -165,7 +165,7 @@ internal class mangalear
var finalUrl = absoluteImgUri.ToString();
if (addedImages.Add(finalUrl))
{
- body.Append($@"");
+ body.Append($@"");
}
}
}
diff --git a/rss-generator/Class/RSS/missav.cs b/rss-generator/Class/RSS/missav.cs
index 680b589..39e789a 100644
--- a/rss-generator/Class/RSS/missav.cs
+++ b/rss-generator/Class/RSS/missav.cs
@@ -75,7 +75,7 @@ internal static class missav
var body = new StringBuilder();
body.Append($@"");
- body.Append($@"");
+ body.Append($@"");
var item = new SyndicationItem(
title,
diff --git a/rss-generator/Class/RSS/missav123.cs b/rss-generator/Class/RSS/missav123.cs
index 98965fa..a7fb02c 100644
--- a/rss-generator/Class/RSS/missav123.cs
+++ b/rss-generator/Class/RSS/missav123.cs
@@ -158,7 +158,7 @@ internal class missav123
// 3. サムネイル画像
if (imageUri != null)
{
- body.Append($@"");
+ body.Append($@"");
}
// 4. メタ情報(詳細、メーカー、ジャンル、タグ)
diff --git a/rss-generator/Class/RSS/momonga_fanzine.cs b/rss-generator/Class/RSS/momonga_fanzine.cs
index 9ffdee0..d581400 100644
--- a/rss-generator/Class/RSS/momonga_fanzine.cs
+++ b/rss-generator/Class/RSS/momonga_fanzine.cs
@@ -143,7 +143,7 @@ internal class momonga_fanzine
if (Uri.TryCreate(link, src, out var absoluteUri))
{
body.Append($"");
- body.Append($"

");
+ body.Append($"

");
body.Append($"
");
break;
}
diff --git a/rss-generator/Class/RSS/momonga_magazine.cs b/rss-generator/Class/RSS/momonga_magazine.cs
index eebd7e4..1d26e55 100644
--- a/rss-generator/Class/RSS/momonga_magazine.cs
+++ b/rss-generator/Class/RSS/momonga_magazine.cs
@@ -143,7 +143,7 @@ internal class momonga_magazine
if (Uri.TryCreate(link, src, out var absoluteUri))
{
body.Append($"");
- body.Append($"

");
+ body.Append($"

");
body.Append($"
");
break;
}
diff --git a/rss-generator/Class/RSS/npb_6.cs b/rss-generator/Class/RSS/npb_6.cs
index 7611880..f22ebf7 100644
--- a/rss-generator/Class/RSS/npb_6.cs
+++ b/rss-generator/Class/RSS/npb_6.cs
@@ -59,7 +59,7 @@ internal class npb_6
var body = new StringBuilder();
body.Append($@"");
- body.Append($@"");
+ body.Append($@"");
var updateTime = DateTime.Now;
if (DateTime.TryParse(elemTime?.TextContent?.Trim(), out DateTime itemTime))