");
body.Append($@"
▶ WebImageViewerで動画を再生する
");
body.Append($@"
missav公式ページで開く
");
@@ -200,13 +240,19 @@ internal static class missav
body.Append($@"
タグ: {WebUtility.HtmlEncode(string.Join(", ", tags))}
");
}
- var item = new SyndicationItem(
+ var now = DateTimeOffset.Now;
+ item = new SyndicationItem(
title,
- string.Empty,
+ (string?)null,
itemUri,
- CmnUtil.CreateGuid(linkHref),
- DateTime.Now
- );
+ guid,
+ now
+ )
+ {
+ PublishDate = now,
+ LastUpdatedTime = now,
+ Summary = new TextSyndicationContent(body.ToString(), TextSyndicationContentKind.Html)
+ };
// カテゴリ登録(ジャンル、タグ、女優)
foreach (var g in genres)
@@ -231,14 +277,14 @@ internal static class missav
{
item.Authors.Add(new SyndicationPerson { Name = actresses[0] });
}
-
- item.Summary = new TextSyndicationContent(body.ToString(), TextSyndicationContentKind.Html);
- items.Add(item);
}
- }
- feed.Items = items;
- await CmnUtil.ExportXMLFileAsync("missav.xml", feed, client);
+ items.Add(item);
+ }
+ }
+
+ feed.Items = items;
+ await CmnUtil.ExportXMLFileAsync(fileName, feed, client, filter24Hours: false);
}
catch (Exception ex)
{
@@ -246,4 +292,68 @@ internal static class missav
CmnUtil.PrintCallStackToEvent(ex);
}
}
+
+ #endregion
+
+ #region □メソッド(Private)
+
+ ///
+ /// 既存の XML ファイルから各記事のタイトル・本文 HTML・公開日時・更新日時を読み込みます。
+ ///
+ ///
XML ファイル名
+ ///
URL または GUID をキーとする既存エントリの辞書
+ private static Dictionary
LoadExistingEntries(string fileName)
+ {
+ var existingEntries = new Dictionary(StringComparer.OrdinalIgnoreCase);
+ try
+ {
+ string xmlPath = CmnUtil.GetExportXmlPath(fileName);
+ if (!File.Exists(xmlPath))
+ {
+ return existingEntries;
+ }
+
+ using var reader = XmlReader.Create(xmlPath);
+ var existingFeed = SyndicationFeed.Load(reader);
+ if (existingFeed?.Items != null)
+ {
+ foreach (var item in existingFeed.Items)
+ {
+ var linkUrl = item.Links.FirstOrDefault()?.Uri?.AbsoluteUri;
+ var guid = item.Id;
+
+ var entry = new ExistingFeedEntry
+ {
+ Title = item.Title?.Text?.Trim() ?? string.Empty,
+ SummaryHtml = item.Summary?.Text?.Trim() ?? string.Empty,
+ PublishDate = item.PublishDate != DateTimeOffset.MinValue
+ ? item.PublishDate
+ : (item.LastUpdatedTime != DateTimeOffset.MinValue ? item.LastUpdatedTime : DateTimeOffset.Now),
+ LastUpdatedTime = item.LastUpdatedTime != DateTimeOffset.MinValue
+ ? item.LastUpdatedTime
+ : (item.PublishDate != DateTimeOffset.MinValue ? item.PublishDate : DateTimeOffset.Now),
+ Categories = item.Categories.Select(c => c.Name).ToList(),
+ Authors = item.Authors.Select(a => a.Name).ToList()
+ };
+
+ if (!string.IsNullOrWhiteSpace(linkUrl) && !existingEntries.ContainsKey(linkUrl))
+ {
+ existingEntries[linkUrl] = entry;
+ }
+ if (!string.IsNullOrWhiteSpace(guid) && !existingEntries.ContainsKey(guid))
+ {
+ existingEntries[guid] = entry;
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ LogManager.AddLog($"[情報] missav 既存エントリ読み込みスキップ: {ex.Message}");
+ }
+
+ return existingEntries;
+ }
+
+ #endregion
}
\ No newline at end of file
diff --git a/rss-generator/Class/MissAV123/missav123.cs b/rss-generator/Class/MissAV123/missav123.cs
index 162abd2..e9f900f 100644
--- a/rss-generator/Class/MissAV123/missav123.cs
+++ b/rss-generator/Class/MissAV123/missav123.cs
@@ -3,219 +3,224 @@ using AngleSharp.Html.Dom;
using AngleSharp.Html.Parser;
using System;
using System.Collections.Generic;
+using System.IO;
using System.Linq;
using System.Net;
using System.ServiceModel.Syndication;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
+using System.Xml;
using rss_generator.Class.Common;
namespace rss_generator.Class.MissAV123;
+///
+/// 123av.com の新着動画を取得し、WebImageViewer (https://udukipc-web.armonica-vps.work/) で動画を視聴できるリンクを含むRSSを生成します。
+/// 既存のフィードが存在する場合は同一記事の情報を引き継ぎ、FreshRSS 等で「更新された記事を未読とする」が有効な場合でも不要な未読化が発生しないようにします。
+///
internal class missav123
{
+ #region □クラス(Private)
+
///
- /// 123av.com の新着動画を取得し、WebImageViewer (https://udukipc-web.armonica-vps.work/) で動画を視聴できるリンクを含むRSSを生成します。
+ /// 既存の RSS フィードから読み込んだ記事情報を保持する内部クラスです。
+ ///
+ private sealed class ExistingFeedEntry
+ {
+ public string Title { get; set; } = string.Empty;
+ public string SummaryHtml { get; set; } = string.Empty;
+ public DateTimeOffset PublishDate { get; set; }
+ public DateTimeOffset LastUpdatedTime { get; set; }
+ public List Categories { get; set; } = new();
+ public List Authors { get; set; } = new();
+ }
+
+ #endregion
+
+ #region □メソッド(Public)
+
+ ///
+ /// 123av.com の新着動画を取得し、RSS フィード (123av.xml) を生成・出力します。
///
/// HttpClient インスタンス
+ /// FlareSolverr セッションID
public static async Task CreateRSSAsync(HttpClient client, string? sessionId = null)
{
var pageMaster = "https://123av.com";
+ var fileName = "123av.xml";
var feed = new SyndicationFeed("123av.com", "123av Recent Videos", new Uri($"{pageMaster}/ja/recent"));
var items = new List();
try
{
sessionId ??= CmnUtil.SharedFlareSolverrSessionId;
- var docList = new List();
- for (int pageId = 1; pageId <= 2; pageId++)
+
+ // 既存フィードの読み込み(相対時間の再計算による未読化防止および高速化)
+ var existingEntries = LoadExistingEntries(fileName);
+
+ 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)
{
- var pageURL = $"{pageMaster}/ja/recent{(pageId > 1 ? $"?page={pageId}" : "")}";
- var document = await CmnUtil.GetDocumentFlareSolverr(client, pageURL, session: sessionId);
- if (document != null)
- {
- docList.Add(document);
- }
+ docList.Add(document);
}
+ }
- var linkList = new List();
- foreach (var document in docList)
+ 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 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))
{
- 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");
+ continue;
+ }
- var title = titleElement?.TextContent?.Trim() ?? "タイトルなし";
- var relHref = linkElement?.GetAttribute("href") ?? string.Empty;
- if (string.IsNullOrWhiteSpace(relHref))
+ var linkHref = relHref.StartsWith("http", StringComparison.OrdinalIgnoreCase)
+ ? relHref
+ : $"{pageMaster.TrimEnd('/')}/{relHref.TrimStart('/')}";
+
+ var imageSrc = imgElement?.GetAttribute("data-src") ?? 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;
+ var guid = CmnUtil.CreateGuid(linkHref);
+
+ existingEntries.TryGetValue(linkHref, out var prevEntry);
+ if (prevEntry == null && !string.IsNullOrEmpty(guid))
+ {
+ existingEntries.TryGetValue(guid, out prevEntry);
+ }
+
+ SyndicationItem item;
+ if (prevEntry != null && !string.IsNullOrEmpty(prevEntry.SummaryHtml))
+ {
+ // 【未更新記事】
+ // 前回の本文HTMLおよび日時(PublishDate / LastUpdatedTime)をそのまま維持
+ item = new SyndicationItem(
+ title,
+ (string?)null,
+ itemUri,
+ guid,
+ prevEntry.LastUpdatedTime
+ )
{
- continue;
- }
+ PublishDate = prevEntry.PublishDate,
+ LastUpdatedTime = prevEntry.LastUpdatedTime,
+ Summary = new TextSyndicationContent(prevEntry.SummaryHtml, TextSyndicationContentKind.Html)
+ };
- var linkHref = relHref.StartsWith("http", StringComparison.OrdinalIgnoreCase)
- ? relHref
- : $"{pageMaster.TrimEnd('/')}/{relHref.TrimStart('/')}";
-
- var imageSrc = imgElement?.GetAttribute("src");
- if (!linkList.Contains(linkHref))
+ foreach (var cat in prevEntry.Categories)
{
- linkList.Add(linkHref);
+ item.Categories.Add(new SyndicationCategory(cat));
}
- else
+ foreach (var auth in prevEntry.Authors)
{
- continue;
+ item.Authors.Add(new SyndicationPerson { Name = auth });
}
+ }
+ else
+ {
+ // 【新規記事】
+ // カード上の時間表記
+ var cardMetaTimeText = div.QuerySelector(".card__meta")?.TextContent?.Trim();
- var cardMetaTimeText = div.QuerySelector(".card__meta span")?.TextContent?.Trim();
-
- 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();
- var actresses = new List();
- string? maker = null;
- string? series = null;
string? releaseDateText = null;
string? detailMetaTimeText = null;
+ string? maker = null;
+ string? series = null;
+ var actresses = new List();
+ var genres = new List();
+ var tags = new List();
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");
+ // 詳細テキスト(説明文)
+ descText = docDetail.QuerySelector("meta[name='description']")?.GetAttribute("content")
+ ?? docDetail.QuerySelector("meta[property='og:description']")?.GetAttribute("content")
+ ?? docDetail.QuerySelector(".detail__description")?.TextContent?.Trim();
- // 2. HTML内の javplayer.cc URL から正規表現で取得(フォールバック)
- if (string.IsNullOrEmpty(playerUrl))
+ // 発売日および更新日時
+ var metaDivs = docDetail.QuerySelectorAll(".detail__meta, .card__meta, .video-info span, .detail__info div");
+ foreach (var m in metaDivs)
{
- var match = Regex.Match(docDetail.Source.Text, @"https?:\\?/\\?/javplayer\.cc[^\s""'\\]+");
- if (match.Success)
+ var txt = m.TextContent?.Trim();
+ if (string.IsNullOrEmpty(txt)) continue;
+
+ if (txt.Contains("発売日") || txt.Contains("リリース") || txt.Contains("Release"))
{
- playerUrl = match.Value.Replace(@"\/", "/");
+ var mMatch = Regex.Match(txt, @"\d{4}[-/年]\d{1,2}[-/月]\d{1,2}");
+ if (mMatch.Success)
+ {
+ releaseDateText = mMatch.Value;
+ }
+ }
+ if (txt.Contains("前") || txt.Contains("ago"))
+ {
+ detailMetaTimeText = txt;
}
}
- // 3. 詳細ページ上部の相対更新日時(例: "1分 56秒前", "31m 26s ago")
- detailMetaTimeText = docDetail.QuerySelector(".watch__meta--stats .watch__metaitem")?.TextContent?.Trim();
- if (!string.IsNullOrEmpty(detailMetaTimeText))
+ // メーカー / レーベル
+ maker = docDetail.QuerySelector("a[href*='/makers/'], a[href*='/maker/'], a[href*='/labels/'], a[href*='/label/']")?.TextContent?.Trim();
+
+ // シリーズ
+ series = docDetail.QuerySelector("a[href*='/series/'], a[href*='/serie/']")?.TextContent?.Trim();
+
+ // 出演者
+ var actressElements = docDetail.QuerySelectorAll("a[href*='/actresses/'], a[href*='/actress/']");
+ foreach (var a in actressElements)
{
- detailMetaTimeText = Regex.Replace(detailMetaTimeText, @"\s+", " ").Trim();
- }
-
- // 4. 詳細説明文
- descText = docDetail.QuerySelector(".watch__desc-text")?.TextContent?.Trim();
-
- // 5. 詳細情報ブロック () 内の各項目を抽出
- var infoRows = docDetail.QuerySelectorAll(".watch__info-row");
- foreach (var row in infoRows)
- {
- var dtText = row.QuerySelector("dt")?.TextContent?.Trim() ?? string.Empty;
- var ddElement = row.QuerySelector("dd");
- if (string.IsNullOrEmpty(dtText) || ddElement == null) continue;
-
- if (dtText.Contains("発売日") || dtText.Contains("公開日") || dtText.Contains("配信日") || dtText.Equals("Release date", StringComparison.OrdinalIgnoreCase))
+ var aName = a.TextContent?.Trim();
+ if (!string.IsNullOrEmpty(aName) && !actresses.Contains(aName))
{
- releaseDateText = ddElement.TextContent?.Trim();
- }
- else if (dtText.Contains("出演者") || dtText.Contains("女優") || dtText.Equals("Cast", StringComparison.OrdinalIgnoreCase))
- {
- var actressLinks = ddElement.QuerySelectorAll("a");
- foreach (var a in actressLinks)
- {
- var aName = a.TextContent?.Trim();
- if (!string.IsNullOrEmpty(aName) && !actresses.Contains(aName))
- {
- actresses.Add(aName);
- }
- }
- if (actresses.Count == 0 && !string.IsNullOrWhiteSpace(ddElement.TextContent))
- {
- var textVal = ddElement.TextContent.Trim();
- if (!actresses.Contains(textVal))
- {
- actresses.Add(textVal);
- }
- }
- }
- else if (dtText.Contains("メーカー") || dtText.Equals("Maker", StringComparison.OrdinalIgnoreCase))
- {
- if (string.IsNullOrEmpty(maker))
- {
- maker = ddElement.TextContent?.Trim();
- }
- }
- else if (dtText.Contains("シリーズ") || dtText.Equals("Series", StringComparison.OrdinalIgnoreCase))
- {
- series = ddElement.TextContent?.Trim();
- }
- else if (dtText.Contains("ジャンル") || dtText.Equals("Genres", StringComparison.OrdinalIgnoreCase))
- {
- var gLinks = ddElement.QuerySelectorAll("a");
- foreach (var g in gLinks)
- {
- var gName = g.TextContent?.Trim();
- if (!string.IsNullOrEmpty(gName) && !genres.Contains(gName))
- {
- genres.Add(gName);
- }
- }
- }
- else if (dtText.Contains("タグ") || dtText.Equals("Tags", StringComparison.OrdinalIgnoreCase))
- {
- var tLinks = ddElement.QuerySelectorAll("a");
- foreach (var t in tLinks)
- {
- var tName = t.TextContent?.Trim();
- if (!string.IsNullOrEmpty(tName) && !tags.Contains(tName))
- {
- tags.Add(tName);
- }
- }
+ actresses.Add(aName);
}
}
- // フォールバック: メーカー
- if (string.IsNullOrEmpty(maker))
+ // ジャンル
+ var genreElements = docDetail.QuerySelectorAll("a[href*='/genres/'], a[href*='/genre/']");
+ foreach (var g in genreElements)
{
- maker = docDetail.QuerySelector("a[href*='/makers/']")?.TextContent?.Trim();
- }
-
- // フォールバック: ジャンル
- if (genres.Count == 0)
- {
- var genreElements = docDetail.QuerySelectorAll("a[href*='/genres/']");
- foreach (var g in genreElements)
+ var gName = g.TextContent?.Trim();
+ if (!string.IsNullOrEmpty(gName) && !genres.Contains(gName))
{
- var gName = g.TextContent?.Trim();
- if (!string.IsNullOrEmpty(gName) && !genres.Contains(gName))
- {
- genres.Add(gName);
- }
+ genres.Add(gName);
}
}
- // フォールバック: タグ
- if (tags.Count == 0)
+ // タグ
+ var tagElements = docDetail.QuerySelectorAll("a[href*='/tags/'], a[href*='/tag/']");
+ foreach (var t in tagElements)
{
- var tagElements = docDetail.QuerySelectorAll("a[href*='/tags/']");
- foreach (var t in tagElements)
+ var tName = t.TextContent?.Trim();
+ if (!string.IsNullOrEmpty(tName) && !tags.Contains(tName))
{
- var tName = t.TextContent?.Trim();
- if (!string.IsNullOrEmpty(tName) && !tags.Contains(tName))
- {
- tags.Add(tName);
- }
+ tags.Add(tName);
}
}
}
@@ -228,7 +233,7 @@ internal class missav123
// WebImageViewer統一リンクの生成 (https://udukipc-web.armonica-vps.work/?url=[ページURL])
string viewerUrl = $"https://udukipc-web.armonica-vps.work/?url={Uri.EscapeDataString(linkHref)}";
- // 更新日時(サイト上の追加・更新日時)の算出
+ // 更新日時の算出
DateTimeOffset? updatedDate = null;
var timeTextToParse = !string.IsNullOrWhiteSpace(detailMetaTimeText) ? detailMetaTimeText : cardMetaTimeText;
if (!string.IsNullOrWhiteSpace(timeTextToParse))
@@ -250,23 +255,19 @@ internal class missav123
// 本文 HTML(Summary)の生成
var body = new StringBuilder();
- // 1. WebImageViewer への再生リンク & 外部リンク(記事への直接埋め込みは行わない)
+ // 1. WebImageViewer への再生リンク & 外部リンク
body.Append($@"");
+ body.Append($@"123av公式ページで開く
");
+ body.Append($@"
");
- // 3. サムネイル画像
+ // 2. サムネイル画像
if (imageUri != null)
{
body.Append($@"