/// 対象ギャラリーの詳細ページ・ビューアページを巡回し、日本語タイトルおよび画像の直接URLを取得します。
@@ -392,63 +390,31 @@ internal static class e_hentai_common
// 本文 HTML の整形
var body = new StringBuilder();
- body.Append($@"");
- body.Append("");
- if (!string.IsNullOrWhiteSpace(gallery.Category))
+ // ギャラリー表示リンク
+ var match = System.Text.RegularExpressions.Regex.Match(gallery.Url, @"/g/(\d+)/([a-zA-Z0-9]+)", System.Text.RegularExpressions.RegexOptions.IgnoreCase);
+ if (match.Success)
{
- body.Append($"Category: {WebUtility.HtmlEncode(gallery.Category)} ");
- }
- if (!string.IsNullOrWhiteSpace(gallery.Pages))
- {
- body.Append($"| Pages: {WebUtility.HtmlEncode(gallery.Pages)} ");
- }
- if (!string.IsNullOrWhiteSpace(gallery.Uploader))
- {
- body.Append($"| Uploader: {WebUtility.HtmlEncode(gallery.Uploader)}");
- }
- body.Append("
");
-
- if (gallery.Tags.Count > 0)
- {
- body.Append($"Tags: {WebUtility.HtmlEncode(string.Join(", ", gallery.Tags))}
");
+ string galleryId = match.Groups[1].Value;
+ string token = match.Groups[2].Value;
+ string galleryUrl = $"https://udukipc-web.armonica-vps.work/ehentai/{galleryId}/{token}";
+ body.Append($"");
+ body.Append($"
[Gallery]");
+ body.Append($"
");
}
- // ----------------------------------------------------
- // 403 Forbidden 対策:
- // 1. referrerpolicy="no-referrer" によるリファラー送信防止
- // 2. loading="lazy" による順次遅延読み込み
- // 3. 大量画像(数百枚)によるレートリミット防止(上限30枚+全ページ閲覧リンク)
- // ----------------------------------------------------
- if (gallery.ImageUrls.Count > 0)
+ // ギャラリーの1枚目画像
+ string? firstImg = gallery.ImageUrls.FirstOrDefault();
+ if (string.IsNullOrEmpty(firstImg))
{
- int pageNum = 1;
- foreach (var imgUrl in gallery.ImageUrls)
- {
- body.Append($@"");
- pageNum++;
- }
-
- // ページ数表記(例: "804 pages")から総ページ数を抽出し、上限を超えている場合は案内リンクを表示
- int totalPages = 0;
- if (!string.IsNullOrEmpty(gallery.Pages))
- {
- var match = System.Text.RegularExpressions.Regex.Match(gallery.Pages, @"\d+");
- if (match.Success) int.TryParse(match.Value, out totalPages);
- }
-
- if (totalPages > gallery.ImageUrls.Count)
- {
- body.Append($@"");
- }
+ firstImg = gallery.ThumbnailUrl;
}
- else if (!string.IsNullOrWhiteSpace(gallery.ThumbnailUrl))
+
+ if (!string.IsNullOrEmpty(firstImg))
{
- // フォールバック: 全画像が取得できなかった場合はサムネイルを表示
- body.Append($@"");
+ body.Append($"");
+ body.Append($"

");
+ body.Append($"
");
}
item.Summary = new TextSyndicationContent(body.ToString(), TextSyndicationContentKind.Html);
diff --git a/rss-generator/Class/RSS/hitomi_la/index_japanese.cs b/rss-generator/Class/RSS/hitomi_la/index_japanese.cs
index 7528790..e7d4b6f 100644
--- a/rss-generator/Class/RSS/hitomi_la/index_japanese.cs
+++ b/rss-generator/Class/RSS/hitomi_la/index_japanese.cs
@@ -1,3 +1,4 @@
+using AngleSharp.Dom;
using AngleSharp.Html.Dom;
using AngleSharp.Html.Parser;
using System;
@@ -7,7 +8,6 @@ using System.Net.Http;
using System.ServiceModel.Syndication;
using System.Text;
using System.Text.RegularExpressions;
-using System.Threading;
using System.Threading.Tasks;
namespace rss_generator.Class.RSS.hitomi_la;
@@ -16,160 +16,193 @@ internal class index_japanese
{
public static async Task CreateRSSAsync(HttpClient client)
{
- var pageMaster = "https://hitomi.la/index-japanese.html";
+ var baseURL = "https://hitomi.la/index-japanese.html";
+
+ var feed = new SyndicationFeed("hitomi.la", "", new Uri(baseURL));
+ var items = new List();
try
{
- var linkList = new List();
- for (int pageId = 1; pageId <= 10; pageId++)
+ // セッションを作成して複数ページ取得を高速化
+ string? sessionId = await CmnUtil.CreateFlareSolverrSession(client);
+ try
{
- var pageURL = $"{pageMaster}/feed/atom/{(pageId > 1 ? $"?paged={pageId}" : "")}";
- linkList.Add(pageURL);
+ for (int pageId = 1; pageId <= 5; pageId++)
+ {
+ var pageURL = pageId == 1 ? baseURL : $"{baseURL}?page={pageId}";
+ var document = await CmnUtil.GetDocumentFlareSolverr(client, pageURL, session: sessionId);
+ if (document == null)
+ {
+ continue;
+ }
+
+ var newItems = ParseGalleryItems(document);
+ items.AddRange(newItems);
+ }
+ }
+ finally
+ {
+ if (sessionId != null)
+ {
+ await CmnUtil.DestroyFlareSolverrSession(client, sessionId);
+ }
}
- var tasks = linkList.Select(url => CmnUtil.GetFeedItems(client, url)).ToList();
- var results = await Task.WhenAll(tasks);
- var allItems = results.SelectMany(items => items).ToList();
+ // 重複除外(IDベース)
+ var uniqueItems = items
+ .GroupBy(x => x.Id)
+ .Select(g => g.First())
+ .ToList();
- var semaphore = new SemaphoreSlim(5);
- // 簡潔なRSSに非同期で整形
- var itemTasks = allItems.OrderByDescending(x => x.PublishDate).Select(async originalItem =>
- {
- await semaphore.WaitAsync();
- try
- {
- List getAddCategory()
- {
- List result = new List();
+ feed.Items = uniqueItems;
- string orgText = originalItem.Summary?.Text ?? "";
- var parser = new HtmlParser();
- var document = parser.ParseDocument(orgText);
-
- var firstP = document.QuerySelector("p");
- if (firstP != null)
- {
- var targetText = firstP.TextContent;
- int tagIndex = targetText.IndexOf("【タグ】");
- if (tagIndex >= 0)
- {
- targetText = targetText.Substring(0, tagIndex);
- }
- string pattern = @"【[^】]+】([^【]*)";
- var matches = Regex.Matches(targetText, pattern);
-
- foreach (Match match in matches)
- {
- string valuesStr = match.Groups[1].Value;
-
- if (string.IsNullOrWhiteSpace(valuesStr))
- {
- continue;
- }
-
- string[] splitValues = valuesStr.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-
- foreach (var val in splitValues)
- {
- string categoryName = val.Trim();
-
- if (!string.IsNullOrEmpty(categoryName))
- {
- result.Add(new SyndicationCategory(categoryName));
- }
- }
- }
- }
- return result;
- }
-
- var newItem = new SyndicationItem()
- {
- Title = new TextSyndicationContent(originalItem.Title?.Text ?? "No Title"),
- Id = CmnUtil.CreateGuid(originalItem.Id),
- PublishDate = originalItem.PublishDate,
- LastUpdatedTime = originalItem.LastUpdatedTime
- };
-
- var link = originalItem.Links.FirstOrDefault()?.Uri;
- if (link != null)
- {
- newItem.Links.Add(new SyndicationLink(link));
- }
- foreach (var category in getAddCategory())
- {
- newItem.Categories.Add(category);
- }
- foreach (var category in originalItem.Categories)
- {
- category.Scheme = null;
- newItem.Categories.Add(category);
- }
- foreach (var author in originalItem.Authors)
- {
- newItem.Authors.Add(author);
- }
-
- var body = new StringBuilder();
- var originalSummary = originalItem.Summary?.Text ?? "";
- body.Append(originalSummary);
- if (link != null)
- {
- var docContents = await CmnUtil.GetDocument(client, link.ToString());
- var imgElements = docContents.QuerySelectorAll("#post-hentai img, img");
- const int maxImages = 30;
- int addedCount = 0;
-
- foreach (var img in imgElements)
- {
- var src = img.GetAttribute("src");
- if (!string.IsNullOrEmpty(src))
- {
- if (Uri.TryCreate(link, src, out var absoluteUri))
- {
- body.Append($@"![]()
");
- addedCount++;
- if (addedCount >= maxImages)
- {
- break;
- }
- }
- }
- }
-
- if (imgElements.Length > maxImages)
- {
- body.Append($@"");
- }
- }
- newItem.Summary = new TextSyndicationContent(body.ToString(), TextSyndicationContentKind.Html);
-
- return newItem;
- }
- finally
- {
- semaphore.Release();
- }
- }).ToList();
-
- var simplifiedItems = await Task.WhenAll(itemTasks);
-
- var mergedFeed = new SyndicationFeed(
- "hitomi.la",
- "",
- new Uri("https://hitomi.la/index-japanese.html"),
- simplifiedItems
- );
-
- CmnUtil.ExportXMLFile("hitomi-japanese.xml", mergedFeed);
- LogManager.AddLog($"[情報] hitomi-japanese.xml を正常に出力しました (記事数: {simplifiedItems.Length})");
+ CmnUtil.ExportXMLFile("hitomi-japanese.xml", feed);
+ LogManager.AddLog($"[情報] hitomi-japanese.xml を正常に出力しました (記事数: {uniqueItems.Count})");
}
catch (Exception ex)
{
LogManager.AddLog($"[エラー] hitomi-japanese:{ex.Message}");
+ CmnUtil.PrintCallStackToEvent(ex);
}
}
+
+ private static List ParseGalleryItems(IDocument document)
+ {
+ var result = new List();
+ var cards = document.QuerySelectorAll(".gallery-content > div");
+
+ foreach (var card in cards)
+ {
+ var titleElem = card.QuerySelector("h1.lillie a, h1 a");
+ if (titleElem == null)
+ {
+ continue;
+ }
+
+ var title = titleElem.TextContent?.Trim() ?? "No Title";
+ var relLink = titleElem.GetAttribute("href") ?? string.Empty;
+ var linkHref = !string.IsNullOrEmpty(relLink)
+ ? (relLink.StartsWith("http") ? relLink : $"https://hitomi.la{(relLink.StartsWith("/") ? "" : "/")}{relLink}")
+ : string.Empty;
+
+ if (string.IsNullOrEmpty(linkHref))
+ {
+ continue;
+ }
+
+ // 作品IDの抽出
+ string galleryId = "";
+ var matchId = Regex.Match(linkHref, @"(\d+)\.html", RegexOptions.IgnoreCase);
+ if (!matchId.Success)
+ {
+ matchId = Regex.Match(linkHref, @"(\d{5,})");
+ }
+ if (matchId.Success)
+ {
+ galleryId = matchId.Groups[1].Value;
+ }
+
+ var item = new SyndicationItem
+ {
+ Title = new TextSyndicationContent(title),
+ Id = CmnUtil.CreateGuid(linkHref)
+ };
+
+ item.Links.Add(new SyndicationLink(new Uri(linkHref)));
+
+ // 投稿日時の取得
+ var dateElem = card.QuerySelector(".date");
+ var dateStr = dateElem?.GetAttribute("data-posted") ?? dateElem?.TextContent?.Trim();
+ if (!string.IsNullOrEmpty(dateStr) && DateTimeOffset.TryParse(dateStr, out var parsedOffset))
+ {
+ var jstDate = parsedOffset.ToOffset(TimeSpan.FromHours(9)).DateTime;
+ item.PublishDate = jstDate;
+ item.LastUpdatedTime = jstDate;
+ }
+ else
+ {
+ item.PublishDate = DateTime.Now;
+ item.LastUpdatedTime = DateTime.Now;
+ }
+
+ // 作家の取得
+ var artistElems = card.QuerySelectorAll(".artist-list li a");
+ foreach (var artistElem in artistElems)
+ {
+ var artist = artistElem.TextContent?.Trim();
+ if (!string.IsNullOrEmpty(artist) && !string.Equals(artist, "N/A", StringComparison.OrdinalIgnoreCase))
+ {
+ item.Authors.Add(new SyndicationPerson { Name = artist });
+ item.Categories.Add(new SyndicationCategory(artist));
+ }
+ }
+
+ // シリーズの取得
+ var seriesElems = card.QuerySelectorAll(".series-list li a");
+ foreach (var seriesElem in seriesElems)
+ {
+ var series = seriesElem.TextContent?.Trim();
+ if (!string.IsNullOrEmpty(series) && !string.Equals(series, "N/A", StringComparison.OrdinalIgnoreCase))
+ {
+ item.Categories.Add(new SyndicationCategory(series));
+ }
+ }
+
+ // タイプの取得
+ var typeElem = card.QuerySelector(".dj-desc a[href*='/type/']");
+ if (typeElem != null)
+ {
+ var typeName = typeElem.TextContent?.Trim();
+ if (!string.IsNullOrEmpty(typeName) && !string.Equals(typeName, "N/A", StringComparison.OrdinalIgnoreCase))
+ {
+ item.Categories.Add(new SyndicationCategory(typeName));
+ }
+ }
+
+ // タグの取得
+ var tagElems = card.QuerySelectorAll(".relatedtags li a");
+ foreach (var tagElem in tagElems)
+ {
+ var tag = tagElem.TextContent?.Trim();
+ if (!string.IsNullOrEmpty(tag))
+ {
+ // 記号(♀ ♂ など)をトリム
+ tag = Regex.Replace(tag, @"[\s♀♂]+$", "").Trim();
+ if (!string.IsNullOrEmpty(tag))
+ {
+ item.Categories.Add(new SyndicationCategory(tag));
+ }
+ }
+ }
+
+ // サムネイル画像の取得
+ var imgElem = card.QuerySelector("img");
+ var imgSrc = imgElem?.GetAttribute("data-src") ?? imgElem?.GetAttribute("src") ?? string.Empty;
+ if (!string.IsNullOrEmpty(imgSrc) && imgSrc.StartsWith("//"))
+ {
+ imgSrc = $"https:{imgSrc}";
+ }
+
+ // HTML構築
+ var body = new StringBuilder();
+ if (!string.IsNullOrEmpty(galleryId))
+ {
+ string galleryUrl = $"https://udukipc-web.armonica-vps.work/hitomi/{galleryId}";
+ body.Append($"");
+ body.Append($"
[Gallery]");
+ body.Append($"
");
+ }
+ if (!string.IsNullOrEmpty(imgSrc))
+ {
+ body.Append($"");
+ body.Append($"

");
+ body.Append($"
");
+ }
+
+ item.Summary = new TextSyndicationContent(body.ToString(), TextSyndicationContentKind.Html);
+ result.Add(item);
+ }
+
+ return result;
+ }
}
diff --git a/rss-generator/Program.cs b/rss-generator/Program.cs
index 84c8415..c0e5af2 100644
--- a/rss-generator/Program.cs
+++ b/rss-generator/Program.cs
@@ -3,6 +3,7 @@ using rss_generator.Class;
using rss_generator.Class.RSS;
using rss_generator.Class.RSS.e_hentai;
using rss_generator.Class.RSS.hitomi_la;
+using rss_generator.Class.RSS.YouTube;
using System.Diagnostics;
@@ -78,14 +79,13 @@ while (true)
tasks.Add(momonga_magazine.CreateRSSAsync(client));
}
#if DEBUG
- //tasks.Add(index_japanese.CreateRSSAsync(client));
- tasks.Add(mangalear.CreateRSSAsync(client));
- tasks.Add(momonga_fanzine.CreateRSSAsync(client));
- tasks.Add(momonga_magazine.CreateRSSAsync(client));
- tasks.Add(e_hentai_ai.CreateRSSAsync(client));
- tasks.Add(e_hentai_non_ai.CreateRSSAsync(client));
+ tasks.Add(YouTubeFeedManager.CreateRSSAsync(client));
+ //tasks.Add(momonga_fanzine.CreateRSSAsync(client));
+ //tasks.Add(momonga_magazine.CreateRSSAsync(client));
+ //tasks.Add(e_hentai_non_ai.CreateRSSAsync(client));
#else
tasks.Add(Youtube.CreateRSSAsync(client));
+ tasks.Add(YouTubeFeedManager.CreateRSSAsync(client));
tasks.Add(rss_generator.Class.RSS.X.x_list.CreateRSSAsync(client));
tasks.Add(kimochiinfo.CreateRSSAsync(client));
@@ -100,6 +100,8 @@ while (true)
tasks.Add(mangalear.CreateRSSAsync(client));
tasks.Add(e_hentai_ai.CreateRSSAsync(client));
tasks.Add(e_hentai_non_ai.CreateRSSAsync(client));
+
+ tasks.Add(index_japanese.CreateRSSAsync(client));
#endif