tags)
{
- var docContents = await CmnUtil.GetDocument(client, link.ToString());
- var imgElements = docContents.QuerySelectorAll("#post-hentai img");
- foreach (var img in imgElements)
+ foreach (var tag in tags)
{
- var src = img.GetAttribute("src");
- if (!string.IsNullOrEmpty(src))
+ if (!string.IsNullOrWhiteSpace(tag) && addedCategories.Add(tag))
{
- // 相対URLの場合も考慮して、絶対URLに解決する
- if (Uri.TryCreate(link, src, out var absoluteUri))
+ newItem.Categories.Add(new SyndicationCategory(tag));
+ }
+ }
+ }
+
+ AddCategories(artistTags);
+ AddCategories(copyrightTags);
+ AddCategories(characterTags);
+ AddCategories(generalTags);
+ AddCategories(metaTags);
+
+ // 元のアイテムのカテゴリも引き継ぐ
+ foreach (var category in originalItem.Categories)
+ {
+ if (!string.IsNullOrWhiteSpace(category.Name) && addedCategories.Add(category.Name))
+ {
+ category.Scheme = null;
+ newItem.Categories.Add(category);
+ }
+ }
+
+ // 4. 作者(Authors)の設定
+ if (artistTags.Count > 0)
+ {
+ foreach (var artist in artistTags)
+ {
+ newItem.Authors.Add(new SyndicationPerson { Name = artist });
+ }
+ }
+ else
+ {
+ foreach (var author in originalItem.Authors)
+ {
+ newItem.Authors.Add(author);
+ }
+ }
+
+ // 5. 画像URLの取得(最高画質 / オリジナル画像)
+ string? imageUrl = null;
+ if (docContents != null)
+ {
+ // og:image はオリジナル画像URLであることが多い
+ imageUrl = docContents.QuerySelector("meta[property='og:image']")?.GetAttribute("content")
+ ?? docContents.QuerySelector("#image-container img")?.GetAttribute("src")
+ ?? docContents.QuerySelector("#image")?.GetAttribute("src")
+ ?? docContents.QuerySelector("meta[name='twitter:image']")?.GetAttribute("content");
+ }
+
+ // HTMLのフォールバック画像抽出
+ if (string.IsNullOrEmpty(imageUrl) && originalItem.Content is TextSyndicationContent textContent)
+ {
+ var contentParser = new HtmlParser();
+ var contentDoc = contentParser.ParseDocument(textContent.Text);
+ imageUrl = contentDoc.QuerySelector("img")?.GetAttribute("src");
+ }
+
+ // 6. 元ソースURLの取得
+ string? sourceUrl = null;
+ if (docContents != null)
+ {
+ var sourceElem = docContents.QuerySelector("#post-info-source a") ?? docContents.QuerySelector("#post-information a[href^='http']");
+ sourceUrl = sourceElem?.GetAttribute("href");
+ }
+ if (string.IsNullOrEmpty(sourceUrl))
+ {
+ var relatedLink = originalItem.Links.FirstOrDefault(l => l.RelationshipType == "related")?.Uri;
+ if (relatedLink != null)
+ {
+ sourceUrl = relatedLink.ToString();
+ }
+ }
+
+ // 7. 作者コメント(artist-commentary)の抽出
+ var commentaryHtml = new StringBuilder();
+ if (docContents != null)
+ {
+ var commentaryContainer = docContents.QuerySelector("#artist-commentary");
+ if (commentaryContainer != null)
+ {
+ var sections = commentaryContainer.QuerySelectorAll("section");
+ foreach (var sec in sections)
+ {
+ var isTranslated = sec.Id?.Contains("translated", StringComparison.OrdinalIgnoreCase) == true;
+ var label = isTranslated ? "翻訳コメント" : "作者コメント";
+
+ var h3Title = sec.QuerySelector("h3")?.TextContent?.Trim();
+ var proseElem = sec.QuerySelector(".prose") ?? sec.QuerySelector("div");
+ var contentHtml = proseElem?.InnerHtml?.Trim();
+
+ // 空文字やプレースホルダー("????")の除外判定
+ bool hasTitle = !string.IsNullOrWhiteSpace(h3Title);
+ bool hasContent = !string.IsNullOrWhiteSpace(contentHtml) && contentHtml != "????
" && contentHtml != "????";
+
+ if (hasTitle || hasContent)
{
- body.Append($"
");
- break;
+ commentaryHtml.Append($@"");
+ commentaryHtml.Append($@"
【{label}】{(hasTitle ? $" {WebUtility.HtmlEncode(h3Title)}" : "")}
");
+ if (hasContent)
+ {
+ commentaryHtml.Append($@"
{contentHtml}
");
+ }
+ commentaryHtml.Append("
");
}
}
}
}
+
+ // 8. HTML本文(Summary)の生成
+ var body = new StringBuilder();
+
+ // 画像の配置
+ if (!string.IsNullOrEmpty(imageUrl))
+ {
+ body.Append($@"");
+ }
+
+ // 画像のすぐ下に作者コメントを追加
+ if (commentaryHtml.Length > 0)
+ {
+ body.Append(commentaryHtml);
+ }
+
+ body.Append($@"タイトル: {WebUtility.HtmlEncode(title)}
");
+
+ if (copyrightTags.Count > 0)
+ {
+ body.Append($@"作品名: {WebUtility.HtmlEncode(string.Join(", ", copyrightTags))}
");
+ }
+
+ if (characterTags.Count > 0)
+ {
+ body.Append($@"キャラクター: {WebUtility.HtmlEncode(string.Join(", ", characterTags))}
");
+ }
+
+ if (artistTags.Count > 0)
+ {
+ body.Append($@"作者: {WebUtility.HtmlEncode(string.Join(", ", artistTags))}
");
+ }
+
+ if (!string.IsNullOrEmpty(sourceUrl))
+ {
+ body.Append($@"");
+ }
+
+ if (generalTags.Count > 0)
+ {
+ body.Append($@"タグ: {WebUtility.HtmlEncode(string.Join(", ", generalTags))}
");
+ }
+
newItem.Summary = new TextSyndicationContent(body.ToString(), TextSyndicationContentKind.Html);
return newItem;
diff --git a/rss-generator/Class/RSS/aurahentai.cs b/rss-generator/Class/RSS/aurahentai.cs
index e6aea58..142b313 100644
--- a/rss-generator/Class/RSS/aurahentai.cs
+++ b/rss-generator/Class/RSS/aurahentai.cs
@@ -68,6 +68,9 @@ internal class aurahentai
var relLink = linkElement.GetAttribute("href") ?? string.Empty;
var contentsUri = CmnUtil.GetAbsoluteUri(docListPage.BaseUrl!, relLink)!;
var linkHref = contentsUri.AbsoluteUri;
+ {
+ item.Links.Add(new SyndicationLink(new Uri(linkHref)));
+ }
var docContents = await CmnUtil.GetDocumentFlareSolverr(client, linkHref, session: sessionId);
var divDetail = docContents.QuerySelector("main>div:nth-of-type(2)")!;
diff --git a/rss-generator/Class/RSS/javtwi.cs b/rss-generator/Class/RSS/javtwi.cs
index f19deb3..1882fa7 100644
--- a/rss-generator/Class/RSS/javtwi.cs
+++ b/rss-generator/Class/RSS/javtwi.cs
@@ -64,8 +64,11 @@ internal class javtwi
var body = new StringBuilder();
body.Append($@"");
- body.Append($@"");
+ body.Append($@"");
var item = new SyndicationItem(
title,
diff --git a/rss-generator/Program.cs b/rss-generator/Program.cs
index 9ee665d..bcda4d3 100644
--- a/rss-generator/Program.cs
+++ b/rss-generator/Program.cs
@@ -1,16 +1,13 @@
-using AngleSharp.Dom;
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
using rss_generator.Class;
using rss_generator.Class.RSS;
-using rss_generator.Class.RSS.hitomi_la;
-using rss_generator.Class.RSS.X;
using System.Diagnostics;
// 1. 同期スレッド等の未処理例外
AppDomain.CurrentDomain.UnhandledException += (sender, e) =>
{
- var ex = e.ExceptionObject as Exception;
+ Exception? ex = e.ExceptionObject as Exception;
if (ex != null)
{
CmnUtil.PrintCallStackToEvent(ex);
@@ -27,7 +24,7 @@ TaskScheduler.UnobservedTaskException += (sender, e) =>
}
};
-var services = new ServiceCollection();
+ServiceCollection services = new ServiceCollection();
// 2. IHttpClientFactory の登録とクッキーの有効化設定(名前付きクライアント)
services.AddHttpClient("webClient");
// コンテナをビルド
@@ -58,7 +55,7 @@ while (true)
#endif
// 指定時刻になったら処理を実行
- var sw = new Stopwatch();
+ Stopwatch sw = new Stopwatch();
sw.Restart();
try
{
@@ -69,26 +66,32 @@ while (true)
// サイトによってはAcceptヘッダーがないと弾く場合もあるため、念のため追加
client.DefaultRequestHeaders.Add("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8");
- var tasks = new List();
+ List tasks = new List();
- var from = new DateTime(nowDate.Year, nowDate.Month, nowDate.Day, 5, 0, 0);
- var to = new DateTime(nowDate.Year, nowDate.Month, nowDate.Day, 7, 15, 0);
+ DateTime from = new DateTime(nowDate.Year, nowDate.Month, nowDate.Day, 5, 0, 0);
+ DateTime to = new DateTime(nowDate.Year, nowDate.Month, nowDate.Day, 7, 15, 0);
if (from < nowDate && nowDate < to)
{
tasks.Add(momonga_fanzine.CreateRSSAsync(client));
tasks.Add(momonga_magazine.CreateRSSAsync(client));
}
- //tasks.Add(Youtube.CreateRSSAsync(client));
- tasks.Add(x_list.CreateRSSAsync(client));
- tasks.Add(javtwi.CreateRSSAsync(client));
+#if DEBUG
+ //tasks.Add(index_japanese.CreateRSSAsync(client));
+#else
+ tasks.Add(Youtube.CreateRSSAsync(client));
+
+ tasks.Add(rss_generator.Class.RSS.X.x_list.CreateRSSAsync(client));
tasks.Add(kimochiinfo.CreateRSSAsync(client));
tasks.Add(missav.CreateRSSAsync(client));
tasks.Add(missav123.CreateRSSAsync(client));
tasks.Add(npb_6.CreateRSSAsync(client));
tasks.Add(ci_en.CreateRSSAsync(client));
-
- //tasks.Add(index_japanese.CreateRSSAsync(client));
+
tasks.Add(aurahentai.CreateRSSAsync(client));
+ tasks.Add(javtwi.CreateRSSAsync(client));
+ tasks.Add(rss_generator.Class.RSS.Danbooru.rank.CreateRSSAsync(client));
+#endif
+
await Task.WhenAll(tasks);