diff --git a/rss-generator/Class/RSS/missav123.cs b/rss-generator/Class/RSS/missav123.cs index 721acdf..cc6b477 100644 --- a/rss-generator/Class/RSS/missav123.cs +++ b/rss-generator/Class/RSS/missav123.cs @@ -1,92 +1,224 @@ using AngleSharp.Dom; +using AngleSharp.Html.Dom; +using AngleSharp.Html.Parser; using System; using System.Collections.Generic; +using System.Linq; +using System.Net; using System.ServiceModel.Syndication; using System.Text; +using System.Text.RegularExpressions; +using System.Threading.Tasks; namespace rss_generator.Class.RSS; internal class missav123 { + /// + /// 123av.com の新着動画を取得し、FreshRSS等のRSSリーダー内で動画を直接再生できるiframeを埋め込んだRSSを生成します。 + /// + /// HttpClient インスタンス public static async Task CreateRSSAsync(HttpClient client) { var pageMaster = "https://123av.com"; - var feed = new SyndicationFeed("123av.com", "", new Uri($"{pageMaster}/ja/recent")); + var feed = new SyndicationFeed("123av.com", "123av Recent Videos", new Uri($"{pageMaster}/ja/recent")); var items = new List(); try { - // 複数ページをまとめる場合に先に取得する - var docList = new List(); - for (int pageId = 1; pageId <= 2; pageId++) + // FlareSolverr セッションを作成して複数ページおよび詳細ページ取得を高速化 + string? sessionId = await CmnUtil.CreateFlareSolverrSession(client); + try { - var pageURL = $"{pageMaster}/ja/recent{(pageId > 1 ? $"?page={pageId}" : "")}"; - var document = await CmnUtil.GetDocument(client, pageURL); - docList.Add(document); + var docList = new List(); + for (int pageId = 1; pageId <= 2; pageId++) + { + var pageURL = $"{pageMaster}/ja/recent{(pageId > 1 ? $"?page={pageId}" : "")}"; + var document = await CmnUtil.GetDocumentFlareSolverr(client, pageURL, session: sessionId); + if (document != null) + { + docList.Add(document); + } + } + + var linkList = new List(); + foreach (var document in docList) + { + var elements = document.QuerySelectorAll("div.card"); + var targetDivs = elements.Where(e => e.ClassList.Length == 1 || e.QuerySelector("a.card__link") != null).ToList(); + foreach (var div in targetDivs) + { + var linkElement = div.QuerySelector("a.card__link") ?? div.QuerySelector("a.card__cover"); + var titleElement = div.QuerySelector(".card__title a") ?? div.QuerySelector("a.card__link"); + var imgElement = div.QuerySelector("img"); + + var title = titleElement?.TextContent?.Trim() ?? "タイトルなし"; + var relHref = linkElement?.GetAttribute("href") ?? string.Empty; + if (string.IsNullOrWhiteSpace(relHref)) + { + continue; + } + + var linkHref = relHref.StartsWith("http", StringComparison.OrdinalIgnoreCase) + ? relHref + : $"{pageMaster.TrimEnd('/')}/{relHref.TrimStart('/')}"; + + var imageSrc = imgElement?.GetAttribute("src"); + if (!linkList.Contains(linkHref)) + { + linkList.Add(linkHref); + } + else + { + continue; + } + + var itemUri = new Uri(linkHref); + var imageUri = !string.IsNullOrEmpty(imageSrc) ? new Uri(imageSrc) : null; + + // 詳細ページから動画プレイヤーURLおよび詳細情報を取得 + string? playerUrl = null; + string? descText = null; + var genres = new List(); + var tags = new List(); + string? maker = null; + + try + { + var docDetail = await CmnUtil.GetDocumentFlareSolverr(client, linkHref, session: sessionId); + if (docDetail != null) + { + // 1. iframe.player__frame の src から取得 + playerUrl = docDetail.QuerySelector("iframe.player__frame")?.GetAttribute("src") + ?? docDetail.QuerySelector(".player iframe")?.GetAttribute("src"); + + // 2. HTML内の javplayer.cc URL から正規表現で取得(フォールバック) + if (string.IsNullOrEmpty(playerUrl)) + { + var match = Regex.Match(docDetail.Source.Text, @"https?:\\?/\\?/javplayer\.cc[^\s""'\\]+"); + if (match.Success) + { + playerUrl = match.Value.Replace(@"\/", "/"); + } + } + + // 詳細情報の抽出 + descText = docDetail.QuerySelector(".watch__desc-text")?.TextContent?.Trim(); + maker = docDetail.QuerySelector("a[href*='/makers/']")?.TextContent?.Trim(); + + var genreElements = docDetail.QuerySelectorAll("a[href*='/genres/']"); + foreach (var g in genreElements) + { + var gName = g.TextContent?.Trim(); + if (!string.IsNullOrEmpty(gName) && !genres.Contains(gName)) + { + genres.Add(gName); + } + } + + var tagElements = docDetail.QuerySelectorAll("a[href*='/tags/']"); + foreach (var t in tagElements) + { + var tName = t.TextContent?.Trim(); + if (!string.IsNullOrEmpty(tName) && !tags.Contains(tName)) + { + tags.Add(tName); + } + } + } + } + catch (Exception ex) + { + LogManager.AddLog($"[警告] 123av 詳細ページ取得失敗 ({linkHref}): {ex.Message}"); + } + + // 本文 HTML(Summary)の生成 + var body = new StringBuilder(); + + // 1. タイトルリンク + //body.Append($@""); + + // 2. FreshRSS等で直接再生できる動画埋め込み iframe + if (!string.IsNullOrEmpty(playerUrl)) + { + body.Append($@"
"); + body.Append($@""); + body.Append($@"
"); + body.Append($@""); + } + else + { + body.Append($@""); + } + + // 3. サムネイル画像 + if (imageUri != null) + { + body.Append($@"
"); + } + + // 4. メタ情報(詳細、メーカー、ジャンル、タグ) + if (!string.IsNullOrWhiteSpace(descText)) + { + body.Append($@"
詳細: {WebUtility.HtmlEncode(descText)}
"); + } + if (!string.IsNullOrWhiteSpace(maker)) + { + body.Append($@"
メーカー: {WebUtility.HtmlEncode(maker)}
"); + } + if (genres.Count > 0) + { + body.Append($@"
ジャンル: {WebUtility.HtmlEncode(string.Join(", ", genres))}
"); + } + if (tags.Count > 0) + { + body.Append($@"
タグ: {WebUtility.HtmlEncode(string.Join(", ", tags))}
"); + } + + var item = new SyndicationItem( + title, + string.Empty, + itemUri, + CmnUtil.CreateGuid(linkHref), + DateTime.Now + ); + + // カテゴリ登録 + foreach (var g in genres) + { + item.Categories.Add(new SyndicationCategory(g)); + } + foreach (var t in tags) + { + item.Categories.Add(new SyndicationCategory(t)); + } + + if (!string.IsNullOrEmpty(maker)) + { + item.Authors.Add(new SyndicationPerson { Name = maker }); + } + + item.Summary = new TextSyndicationContent(body.ToString(), TextSyndicationContentKind.Html); + + items.Add(item); + } + } + feed.Items = items; + + CmnUtil.ExportXMLFile("123av.xml", feed); } - - var linkList = new List(); - foreach (var document in docList) + finally { - if (document == null) + if (sessionId != null) { - continue; - } - - var pageTitle = document.QuerySelector("title")?.TextContent; - if (pageTitle == null) - { - continue; - } - var elements = document.QuerySelectorAll("div.card"); - var targetDivs = elements.Where(e => e.ClassList.Length == 1).ToList(); - foreach (var div in targetDivs) - { - var titleElement = div.QuerySelector("a.card__link"); - var linkElement = div.QuerySelector("a.card__link"); - var imgElement = div.QuerySelector("img"); - - var title = titleElement?.TextContent?.Trim() ?? "タイトルなし"; - var linkHref = $"{pageMaster}{linkElement?.GetAttribute("href")}"; - var imageSrc = imgElement?.GetAttribute("src"); - if (linkHref != string.Empty && !linkList.Contains(linkHref)) - { - linkList.Add(linkHref); - } - else - { - continue; - } - - var itemUri = !string.IsNullOrEmpty(linkHref) ? new Uri(linkHref) : null; - var imageUri = !string.IsNullOrEmpty(imageSrc) ? new Uri(imageSrc) : null; - - var body = new StringBuilder(); - body.Append($@""); - body.Append($@"
"); - - var item = new SyndicationItem( - title, - string.Empty, - itemUri, - CmnUtil.CreateGuid(linkHref), - DateTime.Now // 取得できた公開日時があればそれをセット - ); - // item.Content = SyndicationContent.CreateHtmlContent(body.ToString()); - // ※ RSS 2.0の場合は Content よりも Summary(タグ)が使われることが多いため、 - // 両方に設定しておくか、Summary側にHTMLを設定すると大半のリーダーで確実です。 - item.Summary = new TextSyndicationContent(body.ToString(), TextSyndicationContentKind.Html); - - items.Add(item); + await CmnUtil.DestroyFlareSolverrSession(client, sessionId); } } - feed.Items = items; - - CmnUtil.ExportXMLFile("123av.xml", feed); } - catch(Exception ex) + catch (Exception ex) { LogManager.AddLog($"[エラー] 123av:{ex.Message}"); + CmnUtil.PrintCallStackToEvent(ex); } } } diff --git a/rss-generator/Program.cs b/rss-generator/Program.cs index bcda4d3..1c8a13b 100644 --- a/rss-generator/Program.cs +++ b/rss-generator/Program.cs @@ -77,6 +77,7 @@ while (true) } #if DEBUG //tasks.Add(index_japanese.CreateRSSAsync(client)); + tasks.Add(missav123.CreateRSSAsync(client)); #else tasks.Add(Youtube.CreateRSSAsync(client));