feat: MissAV123のフィードの日時を実際の公開日および更新日時に変更
This commit is contained in:
1 parent
0f67b782b3
commit
465d53765c
1 file changed
+234
-7
@@ -78,6 +78,8 @@ internal class missav123
|
||||
continue;
|
||||
}
|
||||
|
||||
var cardMetaTimeText = div.QuerySelector(".card__meta span")?.TextContent?.Trim();
|
||||
|
||||
var itemUri = new Uri(linkHref);
|
||||
var imageUri = !string.IsNullOrEmpty(imageSrc) ? new Uri(imageSrc) : null;
|
||||
|
||||
@@ -86,7 +88,11 @@ internal class missav123
|
||||
string? descText = null;
|
||||
var genres = new List<string>();
|
||||
var tags = new List<string>();
|
||||
var actresses = new List<string>();
|
||||
string? maker = null;
|
||||
string? series = null;
|
||||
string? releaseDateText = null;
|
||||
string? detailMetaTimeText = null;
|
||||
|
||||
try
|
||||
{
|
||||
@@ -107,10 +113,94 @@ internal class missav123
|
||||
}
|
||||
}
|
||||
|
||||
// 詳細情報の抽出
|
||||
descText = docDetail.QuerySelector(".watch__desc-text")?.TextContent?.Trim();
|
||||
maker = docDetail.QuerySelector("a[href*='/makers/']")?.TextContent?.Trim();
|
||||
// 3. 詳細ページ上部の相対更新日時(例: "1分 56秒前", "31m 26s ago")
|
||||
detailMetaTimeText = docDetail.QuerySelector(".watch__meta--stats .watch__metaitem")?.TextContent?.Trim();
|
||||
if (!string.IsNullOrEmpty(detailMetaTimeText))
|
||||
{
|
||||
detailMetaTimeText = Regex.Replace(detailMetaTimeText, @"\s+", " ").Trim();
|
||||
}
|
||||
|
||||
// 4. 詳細説明文
|
||||
descText = docDetail.QuerySelector(".watch__desc-text")?.TextContent?.Trim();
|
||||
|
||||
// 5. 詳細情報ブロック (<dl class="watch__info">) 内の各項目を抽出
|
||||
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))
|
||||
{
|
||||
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);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// フォールバック: メーカー
|
||||
if (string.IsNullOrEmpty(maker))
|
||||
{
|
||||
maker = docDetail.QuerySelector("a[href*='/makers/']")?.TextContent?.Trim();
|
||||
}
|
||||
|
||||
// フォールバック: ジャンル
|
||||
if (genres.Count == 0)
|
||||
{
|
||||
var genreElements = docDetail.QuerySelectorAll("a[href*='/genres/']");
|
||||
foreach (var g in genreElements)
|
||||
{
|
||||
@@ -120,7 +210,11 @@ internal class missav123
|
||||
genres.Add(gName);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// フォールバック: タグ
|
||||
if (tags.Count == 0)
|
||||
{
|
||||
var tagElements = docDetail.QuerySelectorAll("a[href*='/tags/']");
|
||||
foreach (var t in tagElements)
|
||||
{
|
||||
@@ -132,6 +226,7 @@ internal class missav123
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
LogManager.AddLog($"[警告] 123av 詳細ページ取得失敗 ({linkHref}): {ex.Message}");
|
||||
@@ -146,6 +241,25 @@ internal class missav123
|
||||
viewerUrl += $"?play={Uri.EscapeDataString(playerUrl)}";
|
||||
}
|
||||
|
||||
// 更新日時(サイト上の追加・更新日時)の算出
|
||||
DateTimeOffset? updatedDate = null;
|
||||
var timeTextToParse = !string.IsNullOrWhiteSpace(detailMetaTimeText) ? detailMetaTimeText : cardMetaTimeText;
|
||||
if (!string.IsNullOrWhiteSpace(timeTextToParse))
|
||||
{
|
||||
updatedDate = ParseRelativeTime(timeTextToParse);
|
||||
}
|
||||
|
||||
// 公開日(発売日)の算出
|
||||
DateTimeOffset? releaseDate = null;
|
||||
if (!string.IsNullOrWhiteSpace(releaseDateText) && DateTime.TryParse(releaseDateText, out var parsedRelDate))
|
||||
{
|
||||
releaseDate = new DateTimeOffset(parsedRelDate.Year, parsedRelDate.Month, parsedRelDate.Day, 0, 0, 0, TimeSpan.FromHours(9));
|
||||
}
|
||||
|
||||
// アイテムの公開日と更新日時の決定
|
||||
var publishDate = releaseDate ?? updatedDate ?? DateTimeOffset.Now;
|
||||
var lastUpdatedDate = updatedDate ?? releaseDate ?? DateTimeOffset.Now;
|
||||
|
||||
// 本文 HTML(Summary)の生成
|
||||
var body = new StringBuilder();
|
||||
|
||||
@@ -165,15 +279,31 @@ internal class missav123
|
||||
body.Append($@"<div><img src=""{imageUri}"" referrerpolicy=""no-referrer"" alt=""{WebUtility.HtmlEncode(title)}"" style=""max-width: 100%; height: auto; margin-top: 8px;"" /></div>");
|
||||
}
|
||||
|
||||
// 4. メタ情報(詳細、メーカー、ジャンル、タグ)
|
||||
// 4. メタ情報(詳細、発売日、更新日時、メーカー、シリーズ、出演者、ジャンル、タグ)
|
||||
if (!string.IsNullOrWhiteSpace(descText))
|
||||
{
|
||||
body.Append($@"<div style=""margin-top: 8px;""><strong>詳細:</strong> {WebUtility.HtmlEncode(descText)}</div>");
|
||||
}
|
||||
if (releaseDate.HasValue)
|
||||
{
|
||||
body.Append($@"<div><strong>発売日:</strong> {releaseDate.Value:yyyy-MM-dd}</div>");
|
||||
}
|
||||
if (updatedDate.HasValue)
|
||||
{
|
||||
body.Append($@"<div><strong>更新日時:</strong> {updatedDate.Value:yyyy/MM/dd HH:mm:ss}</div>");
|
||||
}
|
||||
if (!string.IsNullOrWhiteSpace(maker))
|
||||
{
|
||||
body.Append($@"<div><strong>メーカー:</strong> {WebUtility.HtmlEncode(maker)}</div>");
|
||||
}
|
||||
if (!string.IsNullOrWhiteSpace(series))
|
||||
{
|
||||
body.Append($@"<div><strong>シリーズ:</strong> {WebUtility.HtmlEncode(series)}</div>");
|
||||
}
|
||||
if (actresses.Count > 0)
|
||||
{
|
||||
body.Append($@"<div><strong>出演者:</strong> {WebUtility.HtmlEncode(string.Join(", ", actresses))}</div>");
|
||||
}
|
||||
if (genres.Count > 0)
|
||||
{
|
||||
body.Append($@"<div><strong>ジャンル:</strong> {WebUtility.HtmlEncode(string.Join(", ", genres))}</div>");
|
||||
@@ -188,10 +318,14 @@ internal class missav123
|
||||
string.Empty,
|
||||
itemUri,
|
||||
CmnUtil.CreateGuid(linkHref),
|
||||
DateTime.Now
|
||||
);
|
||||
lastUpdatedDate
|
||||
)
|
||||
{
|
||||
PublishDate = publishDate,
|
||||
LastUpdatedTime = lastUpdatedDate
|
||||
};
|
||||
|
||||
// カテゴリ登録
|
||||
// カテゴリ登録(ジャンル、タグ、出演者)
|
||||
foreach (var g in genres)
|
||||
{
|
||||
item.Categories.Add(new SyndicationCategory(g));
|
||||
@@ -200,11 +334,19 @@ internal class missav123
|
||||
{
|
||||
item.Categories.Add(new SyndicationCategory(t));
|
||||
}
|
||||
foreach (var a in actresses)
|
||||
{
|
||||
item.Categories.Add(new SyndicationCategory(a));
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(maker))
|
||||
{
|
||||
item.Authors.Add(new SyndicationPerson { Name = maker });
|
||||
}
|
||||
foreach (var a in actresses)
|
||||
{
|
||||
item.Authors.Add(new SyndicationPerson { Name = a });
|
||||
}
|
||||
|
||||
item.Summary = new TextSyndicationContent(body.ToString(), TextSyndicationContentKind.Html);
|
||||
|
||||
@@ -229,4 +371,89 @@ internal class missav123
|
||||
CmnUtil.PrintCallStackToEvent(ex);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 相対時間文字列(例: "30分 39秒前", "1時間 7分前", "1日 32分前", "31m 26s ago" など)を DateTimeOffset に変換します。
|
||||
/// </summary>
|
||||
/// <param name="text">日時文字列</param>
|
||||
/// <param name="baseTime">基準日時(nullの場合は現在日時)</param>
|
||||
/// <returns>計算された DateTimeOffset</returns>
|
||||
public static DateTimeOffset ParseRelativeTime(string text, DateTimeOffset? baseTime = null)
|
||||
{
|
||||
var now = baseTime ?? DateTimeOffset.Now;
|
||||
if (string.IsNullOrWhiteSpace(text)) return now;
|
||||
|
||||
text = text.Trim();
|
||||
var span = TimeSpan.Zero;
|
||||
bool matched = false;
|
||||
|
||||
// 年 (日本語: "1年前", 英語: "1y ago", "1 year ago")
|
||||
var yearMatch = Regex.Match(text, @"(\d+)\s*(?:年|y(?:ears?)?)(?:\s*前|\s*ago)?", RegexOptions.IgnoreCase);
|
||||
if (yearMatch.Success && int.TryParse(yearMatch.Groups[1].Value, out int years))
|
||||
{
|
||||
now = now.AddYears(-years);
|
||||
matched = true;
|
||||
}
|
||||
|
||||
// 月 (日本語: "1か月前", "1ヶ月前", "1月前", 英語: "1mo ago", "1 month ago")
|
||||
var monthMatch = Regex.Match(text, @"(\d+)\s*(?:(?:か|ヶ|ケ)?月|mo(?:nths?)?)(?:\s*前|\s*ago)?", RegexOptions.IgnoreCase);
|
||||
if (monthMatch.Success && int.TryParse(monthMatch.Groups[1].Value, out int months))
|
||||
{
|
||||
now = now.AddMonths(-months);
|
||||
matched = true;
|
||||
}
|
||||
|
||||
// 週 (日本語: "1週間前", "1週前", 英語: "1w ago", "1 week ago")
|
||||
var weekMatch = Regex.Match(text, @"(\d+)\s*(?:(?:週|週間)|w(?:eeks?)?)(?:\s*前|\s*ago)?", RegexOptions.IgnoreCase);
|
||||
if (weekMatch.Success && int.TryParse(weekMatch.Groups[1].Value, out int weeks))
|
||||
{
|
||||
span = span.Add(TimeSpan.FromDays(weeks * 7));
|
||||
matched = true;
|
||||
}
|
||||
|
||||
// 日 (日本語: "1日前", "1日 2時間前", 英語: "1d ago", "1 day ago")
|
||||
var dayMatch = Regex.Match(text, @"(\d+)\s*(?:日|d(?:ays?)?)(?:\s*前|\s*ago)?", RegexOptions.IgnoreCase);
|
||||
if (dayMatch.Success && int.TryParse(dayMatch.Groups[1].Value, out int days))
|
||||
{
|
||||
span = span.Add(TimeSpan.FromDays(days));
|
||||
matched = true;
|
||||
}
|
||||
|
||||
// 時間 (日本語: "1時間前", "1時間 30分前", 英語: "1h ago", "1 hour ago")
|
||||
var hourMatch = Regex.Match(text, @"(\d+)\s*(?:時間|h(?:ours?)?)(?:\s*前|\s*ago)?", RegexOptions.IgnoreCase);
|
||||
if (hourMatch.Success && int.TryParse(hourMatch.Groups[1].Value, out int hours))
|
||||
{
|
||||
span = span.Add(TimeSpan.FromHours(hours));
|
||||
matched = true;
|
||||
}
|
||||
|
||||
// 分 (日本語: "30分前", "30分 20秒前", 英語: "30m ago", "30 mins ago")
|
||||
var minMatch = Regex.Match(text, @"(\d+)\s*(?:分|m(?:in(?:ute)?s?)?)(?:\s*前|\s*ago)?", RegexOptions.IgnoreCase);
|
||||
if (minMatch.Success && int.TryParse(minMatch.Groups[1].Value, out int mins))
|
||||
{
|
||||
span = span.Add(TimeSpan.FromMinutes(mins));
|
||||
matched = true;
|
||||
}
|
||||
|
||||
// 秒 (日本語: "39秒前", 英語: "39s ago", "39 secs ago")
|
||||
var secMatch = Regex.Match(text, @"(\d+)\s*(?:秒|s(?:ec(?:ond)?s?)?)(?:\s*前|\s*ago)?", RegexOptions.IgnoreCase);
|
||||
if (secMatch.Success && int.TryParse(secMatch.Groups[1].Value, out int secs))
|
||||
{
|
||||
span = span.Add(TimeSpan.FromSeconds(secs));
|
||||
matched = true;
|
||||
}
|
||||
|
||||
if (matched)
|
||||
{
|
||||
return now.Subtract(span);
|
||||
}
|
||||
|
||||
// 絶対日付表記(例: 2026-09-07 など)のパース
|
||||
if (DateTimeOffset.TryParse(text, out var parsedDto))
|
||||
{
|
||||
return parsedDto;
|
||||
}
|
||||
|
||||
return now;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user