From ebeff9a65fd94ecd04bfbe6ee53f86ebbd2d76a1 Mon Sep 17 00:00:00 2001 From: uduki Date: Wed, 9 Sep 2026 19:10:31 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20galgaldoga=E3=81=AE=E5=8B=95=E7=94=BB?= =?UTF-8?q?=E3=81=AE=E5=86=8D=E7=94=9F=E3=81=AF=E3=81=93=E3=81=A1=E3=82=89?= =?UTF-8?q?=E3=81=8B=E3=82=89=E3=83=AA=E3=83=B3=E3=82=AF=E6=8A=BD=E5=87=BA?= =?UTF-8?q?=E3=81=8A=E3=82=88=E3=81=B3InPorn/BDSMx=E3=83=AA=E3=82=BE?= =?UTF-8?q?=E3=83=AB=E3=83=90=E3=83=BC=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Blogterest/BlogterestSiteResolver.cs | 17 ++- .../Eroterest/Core/SiteResolverRegistry.cs | 4 + .../GalgalDoga/GalgalDogaSiteResolver.cs | 112 ++++++++++++++++++ .../Eroterest/Inporn/InpornSiteResolver.cs | 52 ++++++++ .../Eroterest/MovieEroterestVideoParser.cs | 14 +++ .../WordPressBlogSiteResolver.cs | 4 +- 6 files changed, 201 insertions(+), 2 deletions(-) create mode 100644 rss-generator/Class/Eroterest/GalgalDoga/GalgalDogaSiteResolver.cs create mode 100644 rss-generator/Class/Eroterest/Inporn/InpornSiteResolver.cs diff --git a/rss-generator/Class/Eroterest/Blogterest/BlogterestSiteResolver.cs b/rss-generator/Class/Eroterest/Blogterest/BlogterestSiteResolver.cs index 570312c..8fa01f8 100644 --- a/rss-generator/Class/Eroterest/Blogterest/BlogterestSiteResolver.cs +++ b/rss-generator/Class/Eroterest/Blogterest/BlogterestSiteResolver.cs @@ -44,9 +44,22 @@ internal class BlogterestSiteResolver : IEroterestSiteResolver } // 2. ブログ内の主要エリアからリンクを走査 + // 「動画の再生はこちらから」リンクおよび .movie-frame a を最優先で確認 + var playTextEl = doc.QuerySelectorAll("a[href]") + .FirstOrDefault(a => (a.TextContent?.Contains("動画の再生はこちらから") == true) || + (a.TextContent?.Contains("動画の再生") == true)); + var movieFrameEl = doc.QuerySelector(".movie-frame a[href]"); + var topVideoLink = playTextEl?.GetAttribute("href")?.Trim() ?? movieFrameEl?.GetAttribute("href")?.Trim(); + var priorityLinks = doc.QuerySelectorAll(".entryImage a, .entryParts a, .pagePiece a, .entryBody a, .entry a"); var seenLinks = new HashSet(StringComparer.OrdinalIgnoreCase); + if (!string.IsNullOrWhiteSpace(topVideoLink)) + { + seenLinks.Add(topVideoLink); + result.NextCandidateUrls.Add(topVideoLink); + } + foreach (var el in priorityLinks) { var rawHref = el.GetAttribute("href")?.Trim(); @@ -104,7 +117,9 @@ internal class BlogterestSiteResolver : IEroterestSiteResolver private static bool IsDirectVideoHostingUrl(string url) { - return url.Contains("do-ga.eroterest.net", StringComparison.OrdinalIgnoreCase) || + return url.Contains("inporn.com", StringComparison.OrdinalIgnoreCase) || + url.Contains("bdsmx.tube", StringComparison.OrdinalIgnoreCase) || + url.Contains("do-ga.eroterest.net", StringComparison.OrdinalIgnoreCase) || url.Contains("video.laxd.com", StringComparison.OrdinalIgnoreCase) || url.Contains("adult.contents.fc2.com", StringComparison.OrdinalIgnoreCase) || url.Contains("txxx.com", StringComparison.OrdinalIgnoreCase) || diff --git a/rss-generator/Class/Eroterest/Core/SiteResolverRegistry.cs b/rss-generator/Class/Eroterest/Core/SiteResolverRegistry.cs index 98b324e..544219e 100644 --- a/rss-generator/Class/Eroterest/Core/SiteResolverRegistry.cs +++ b/rss-generator/Class/Eroterest/Core/SiteResolverRegistry.cs @@ -3,7 +3,9 @@ using rss_generator.Class.Eroterest.Blog2nt; using rss_generator.Class.Eroterest.Blogterest; using rss_generator.Class.Eroterest.Doga; using rss_generator.Class.Eroterest.Fc2; +using rss_generator.Class.Eroterest.GalgalDoga; using rss_generator.Class.Eroterest.Generic; +using rss_generator.Class.Eroterest.Inporn; using rss_generator.Class.Eroterest.Laxd; using rss_generator.Class.Eroterest.Ltt; using rss_generator.Class.Eroterest.Senzuri; @@ -38,8 +40,10 @@ internal static class SiteResolverRegistry Register(new SenzuriSiteResolver()); Register(new VjavSiteResolver()); Register(new YouJizzSiteResolver()); + Register(new InpornSiteResolver()); // 2. 中間ブログ・アンテナリゾルバー + Register(new GalgalDogaSiteResolver()); Register(new LttSiteResolver()); Register(new BlogterestSiteResolver()); Register(new Blog2ntSiteResolver()); diff --git a/rss-generator/Class/Eroterest/GalgalDoga/GalgalDogaSiteResolver.cs b/rss-generator/Class/Eroterest/GalgalDoga/GalgalDogaSiteResolver.cs new file mode 100644 index 0000000..2f39a7b --- /dev/null +++ b/rss-generator/Class/Eroterest/GalgalDoga/GalgalDogaSiteResolver.cs @@ -0,0 +1,112 @@ +using AngleSharp.Dom; +using rss_generator.Class.Common; +using rss_generator.Class.Eroterest.Core; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading; +using System.Threading.Tasks; + +namespace rss_generator.Class.Eroterest.GalgalDoga; + +/// +/// GalGalドーガ (galgaldoga.blogterest.net) 専用の解析リゾルバー +/// 記事内の「動画の再生はこちらから」リンク(.movie-frame a等)を最優先で特定し、 +/// リンク先の実動画(inporn.com, bdsmx.tube等)を解決します。 +/// +internal class GalgalDogaSiteResolver : IEroterestSiteResolver +{ + public string SiteName => "galgaldoga"; + public int Priority => 85; + + public bool CanHandle(string url, IDocument? doc = null) + { + if (string.IsNullOrWhiteSpace(url)) return false; + + return url.Contains("galgaldoga.blogterest.net", StringComparison.OrdinalIgnoreCase); + } + + public async Task ResolveAsync( + HttpClient client, + string url, + IDocument? preloadedDoc, + SiteResolveContext context, + CancellationToken ct) + { + var result = new SiteResolveResult(); + + var doc = preloadedDoc ?? await CmnUtil.GetDocument(client, url, cancellationToken: ct); + if (doc == null) return result; + + // 1. 記事投稿日の抽出 + var dateEl = doc.QuerySelector(".entryDate, .post-date, time, .date"); + var dateText = dateEl?.TextContent?.Trim(); + if (!string.IsNullOrWhiteSpace(dateText) && DateTimeOffset.TryParse(dateText, out var parsedDate)) + { + result.ArticlePublishDate = parsedDate; + } + + // 2. 「動画の再生はこちらから」リンク(および .movie-frame a)の最優先探索 + string? targetVideoUrl = null; + + // A. リンクテキストに「動画の再生はこちらから」が含まれる a タグ + var playTextEl = doc.QuerySelectorAll("a[href]") + .FirstOrDefault(a => (a.TextContent?.Contains("動画の再生はこちらから") == true) || + (a.TextContent?.Contains("動画の再生") == true)); + if (playTextEl != null) + { + targetVideoUrl = playTextEl.GetAttribute("href")?.Trim(); + } + + // B. .movie-frame 配下の a タグ + if (string.IsNullOrWhiteSpace(targetVideoUrl)) + { + var movieFrameEl = doc.QuerySelector(".movie-frame a[href]"); + targetVideoUrl = movieFrameEl?.GetAttribute("href")?.Trim(); + } + + // C. その他の動画リンク(entryParts 配下など) + if (string.IsNullOrWhiteSpace(targetVideoUrl)) + { + var entryPartsLinks = doc.QuerySelectorAll(".entryParts a[href], .entryImage a[href], .entryBody a[href]"); + foreach (var a in entryPartsLinks) + { + var href = a.GetAttribute("href")?.Trim(); + if (string.IsNullOrWhiteSpace(href)) continue; + + if (href.Contains("inporn.com", StringComparison.OrdinalIgnoreCase) || + href.Contains("bdsmx.tube", StringComparison.OrdinalIgnoreCase) || + href.Contains("senzuri.tube", StringComparison.OrdinalIgnoreCase) || + href.Contains("txxx.com", StringComparison.OrdinalIgnoreCase) || + href.Contains("do-ga.eroterest.net", StringComparison.OrdinalIgnoreCase)) + { + targetVideoUrl = href; + break; + } + } + } + + // 実動画リンクが特定できた場合、即座に対応リゾルバーで解決 + if (!string.IsNullOrWhiteSpace(targetVideoUrl)) + { + result.NextCandidateUrls.Insert(0, targetVideoUrl); + + var resolver = SiteResolverRegistry.GetResolver(targetVideoUrl); + var directResolve = await resolver.ResolveAsync(client, targetVideoUrl, null, context, ct); + if (directResolve.HasFinalVideo) + { + result.VideoPageUrl = directResolve.VideoPageUrl ?? targetVideoUrl; + result.VideoSiteName = directResolve.VideoSiteName; + result.VideoSiteId = directResolve.VideoSiteId; + result.StreamUrl = directResolve.StreamUrl; + result.VideoUploadDate = directResolve.VideoUploadDate; + } + else + { + result.VideoPageUrl = targetVideoUrl; + } + } + + return result; + } +} diff --git a/rss-generator/Class/Eroterest/Inporn/InpornSiteResolver.cs b/rss-generator/Class/Eroterest/Inporn/InpornSiteResolver.cs new file mode 100644 index 0000000..d620d3f --- /dev/null +++ b/rss-generator/Class/Eroterest/Inporn/InpornSiteResolver.cs @@ -0,0 +1,52 @@ +using AngleSharp.Dom; +using rss_generator.Class.Common; +using rss_generator.Class.Eroterest.Core; +using System; +using System.Text.RegularExpressions; +using System.Threading; +using System.Threading.Tasks; + +namespace rss_generator.Class.Eroterest.Inporn; + +/// +/// InPorn (inporn.com) および同系統KVSサイト (bdsmx.tube 等) の動画ページ解析リゾルバー +/// URLから動画IDを抽出し、公式埋め込みプレイヤー等の動画情報を確定します。 +/// +internal class InpornSiteResolver : IEroterestSiteResolver +{ + public string SiteName => "inporn"; + public int Priority => 90; + + public bool CanHandle(string url, IDocument? doc = null) + { + if (string.IsNullOrWhiteSpace(url)) return false; + + return url.Contains("inporn.com", StringComparison.OrdinalIgnoreCase) || + url.Contains("bdsmx.tube", StringComparison.OrdinalIgnoreCase); + } + + public Task ResolveAsync( + HttpClient client, + string url, + IDocument? preloadedDoc, + SiteResolveContext context, + CancellationToken ct) + { + var result = new SiteResolveResult + { + VideoPageUrl = url + }; + + bool isBdsmx = url.Contains("bdsmx.tube", StringComparison.OrdinalIgnoreCase); + result.VideoSiteName = isBdsmx ? "bdsmx" : "inporn"; + + var match = Regex.Match(url, @"/video/([0-9]+)"); + if (match.Success) + { + var videoId = match.Groups[1].Value; + result.VideoSiteId = videoId; + } + + return Task.FromResult(result); + } +} diff --git a/rss-generator/Class/Eroterest/MovieEroterestVideoParser.cs b/rss-generator/Class/Eroterest/MovieEroterestVideoParser.cs index 885c47e..374e7c8 100644 --- a/rss-generator/Class/Eroterest/MovieEroterestVideoParser.cs +++ b/rss-generator/Class/Eroterest/MovieEroterestVideoParser.cs @@ -323,6 +323,20 @@ internal static class MovieEroterestVideoParser return; } + if (info.VideoSiteName == "inporn" && !string.IsNullOrWhiteSpace(info.VideoSiteId)) + { + var play = $"https://inporn.com/embed/{info.VideoSiteId}/"; + info.ViewerUrl = $"{baseViewer}/video?site=inporn&id={Uri.EscapeDataString(info.VideoSiteId)}&play={Uri.EscapeDataString(play)}&url={Uri.EscapeDataString(info.ActualVideoUrl ?? "")}&title={Uri.EscapeDataString(info.Title)}"; + return; + } + + if (info.VideoSiteName == "bdsmx" && !string.IsNullOrWhiteSpace(info.VideoSiteId)) + { + var play = $"https://bdsmx.tube/embed/{info.VideoSiteId}/"; + info.ViewerUrl = $"{baseViewer}/video?site=bdsmx&id={Uri.EscapeDataString(info.VideoSiteId)}&play={Uri.EscapeDataString(play)}&url={Uri.EscapeDataString(info.ActualVideoUrl ?? "")}&title={Uri.EscapeDataString(info.Title)}"; + return; + } + // 7. 実動画URLが存在する場合 (LAXD, Xvideos, その他) if (!string.IsNullOrWhiteSpace(info.ActualVideoUrl)) { diff --git a/rss-generator/Class/Eroterest/WordPressBlog/WordPressBlogSiteResolver.cs b/rss-generator/Class/Eroterest/WordPressBlog/WordPressBlogSiteResolver.cs index bb88de4..6b7e5b9 100644 --- a/rss-generator/Class/Eroterest/WordPressBlog/WordPressBlogSiteResolver.cs +++ b/rss-generator/Class/Eroterest/WordPressBlog/WordPressBlogSiteResolver.cs @@ -91,7 +91,9 @@ internal class WordPressBlogSiteResolver : IEroterestSiteResolver if (!seen.Add(href)) continue; // 動画リンクかどうかの判定 - bool isVideoUrl = href.Contains("txxx.com", StringComparison.OrdinalIgnoreCase) || + bool isVideoUrl = href.Contains("inporn.com", StringComparison.OrdinalIgnoreCase) || + href.Contains("bdsmx.tube", StringComparison.OrdinalIgnoreCase) || + href.Contains("txxx.com", StringComparison.OrdinalIgnoreCase) || href.Contains("hclips.com", StringComparison.OrdinalIgnoreCase) || href.Contains("hdzog.com", StringComparison.OrdinalIgnoreCase) || href.Contains("senzuri.tube", StringComparison.OrdinalIgnoreCase) ||