diff --git a/rss-generator/Class/Eroterest/MovieEroterestVideoParser.cs b/rss-generator/Class/Eroterest/MovieEroterestVideoParser.cs index 904bd6e..39c8da7 100644 --- a/rss-generator/Class/Eroterest/MovieEroterestVideoParser.cs +++ b/rss-generator/Class/Eroterest/MovieEroterestVideoParser.cs @@ -252,173 +252,23 @@ internal static class MovieEroterestVideoParser } /// - /// WebImageViewer の再生リンクを生成します。 + /// WebImageViewer の再生リンクを統一URL方式(https://udukipc-web.armonica-vps.work/?url=[ページURL])で生成します。 /// private static void BuildViewerUrl(EroterestArticleInfo info) { string baseViewer = MovieEroterestConfig.WebImageViewerBaseUrl.TrimEnd('/'); - // 1. エロタレドーガで streamUrl (m3u8) が取得できた場合 - if (info.VideoSiteName == "doga" && !string.IsNullOrWhiteSpace(info.StreamUrl)) - { - info.ViewerUrl = $"{baseViewer}/video?site=doga&id={Uri.EscapeDataString(info.VideoSiteId ?? "doga")}&stream={Uri.EscapeDataString(info.StreamUrl)}&url={Uri.EscapeDataString(info.ActualVideoUrl ?? "")}&title={Uri.EscapeDataString(info.Title)}"; - return; - } + // 統一URLパターン: https://udukipc-web.armonica-vps.work/?url=[各ページURL] + // 優先度: 実動画URL > エロタレスト記事URL > 中継ブログURL + string targetUrl = !string.IsNullOrWhiteSpace(info.ActualVideoUrl) + ? info.ActualVideoUrl + : (!string.IsNullOrWhiteSpace(info.ArticlePageUrl) + ? info.ArticlePageUrl + : (!string.IsNullOrWhiteSpace(info.DestinationBlogUrl) + ? info.DestinationBlogUrl + : $"https://movie.eroterest.net/page/{info.ArticleId}/")); - // 2. SpankBang - if (info.VideoSiteName == "spankbang" && !string.IsNullOrWhiteSpace(info.VideoSiteId)) - { - info.ViewerUrl = $"{baseViewer}/spankbang/{Uri.EscapeDataString(info.VideoSiteId)}"; - return; - } - - // 3. 123av - if (info.VideoSiteName == "123av" && !string.IsNullOrWhiteSpace(info.VideoSiteId)) - { - info.ViewerUrl = $"{baseViewer}/123av/{Uri.EscapeDataString(info.VideoSiteId)}"; - return; - } - - // 4. MissAV - if (info.VideoSiteName == "missav" && !string.IsNullOrWhiteSpace(info.VideoSiteId)) - { - info.ViewerUrl = $"{baseViewer}/missav/{Uri.EscapeDataString(info.VideoSiteId)}"; - return; - } - - // 5. 直接ストリーム (m3u8 / mp4) - if (!string.IsNullOrWhiteSpace(info.StreamUrl)) - { - info.ViewerUrl = $"{baseViewer}/video?stream={Uri.EscapeDataString(info.StreamUrl)}&url={Uri.EscapeDataString(info.ActualVideoUrl ?? "")}&title={Uri.EscapeDataString(info.Title)}"; - return; - } - - // 6. 公式インライン埋め込みプレイヤー (embed iframe) に対応している動画サイト - if (info.VideoSiteName == "senzuri" && !string.IsNullOrWhiteSpace(info.VideoSiteId)) - { - var play = $"https://senzuri.tube/embed/{info.VideoSiteId}/"; - info.ViewerUrl = $"{baseViewer}/video?site=senzuri&id={Uri.EscapeDataString(info.VideoSiteId)}&play={Uri.EscapeDataString(play)}&url={Uri.EscapeDataString(info.ActualVideoUrl ?? "")}&title={Uri.EscapeDataString(info.Title)}"; - return; - } - - if ((info.VideoSiteName == "txxx" || info.VideoSiteName == "hclips" || info.VideoSiteName == "hdzog") && !string.IsNullOrWhiteSpace(info.VideoSiteId)) - { - var playHost = info.VideoSiteName == "hclips" ? "https://www.hclips.com" : (info.VideoSiteName == "hdzog" ? "https://www.hdzog.com" : "https://www.txxx.com"); - var play = $"{playHost}/embed/{info.VideoSiteId}/"; - info.ViewerUrl = $"{baseViewer}/video?site={info.VideoSiteName}&id={Uri.EscapeDataString(info.VideoSiteId)}&play={Uri.EscapeDataString(play)}&url={Uri.EscapeDataString(info.ActualVideoUrl ?? "")}&title={Uri.EscapeDataString(info.Title)}"; - return; - } - - if (info.VideoSiteName == "upornia" && !string.IsNullOrWhiteSpace(info.VideoSiteId)) - { - var play = $"https://upornia.com/embed/{info.VideoSiteId}/"; - info.ViewerUrl = $"{baseViewer}/video?site=upornia&id={Uri.EscapeDataString(info.VideoSiteId)}&play={Uri.EscapeDataString(play)}&url={Uri.EscapeDataString(info.ActualVideoUrl ?? "")}&title={Uri.EscapeDataString(info.Title)}"; - return; - } - - if (info.VideoSiteName == "youjizz" && !string.IsNullOrWhiteSpace(info.VideoSiteId)) - { - var play = $"https://www.youjizz.com/embed/{info.VideoSiteId}"; - info.ViewerUrl = $"{baseViewer}/video?site=youjizz&id={Uri.EscapeDataString(info.VideoSiteId)}&play={Uri.EscapeDataString(play)}&url={Uri.EscapeDataString(info.ActualVideoUrl ?? "")}&title={Uri.EscapeDataString(info.Title)}"; - 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; - } - - // VJAV - if (info.VideoSiteName == "vjav" && !string.IsNullOrWhiteSpace(info.VideoSiteId)) - { - var play = $"https://vjav.com/embed/{info.VideoSiteId}/"; - info.ViewerUrl = $"{baseViewer}/video?site=vjav&id={Uri.EscapeDataString(info.VideoSiteId)}&play={Uri.EscapeDataString(play)}&url={Uri.EscapeDataString(info.ActualVideoUrl ?? "")}&title={Uri.EscapeDataString(info.Title)}"; - return; - } - - // FC2動画 - if ((info.VideoSiteName == "fc2" || info.VideoSiteName == "fc2video") && !string.IsNullOrWhiteSpace(info.VideoSiteId)) - { - var play = $"https://video.fc2.com/a/embed/player/{info.VideoSiteId}/"; - info.ViewerUrl = $"{baseViewer}/video?site=fc2&id={Uri.EscapeDataString(info.VideoSiteId)}&play={Uri.EscapeDataString(play)}&url={Uri.EscapeDataString(info.ActualVideoUrl ?? "")}&title={Uri.EscapeDataString(info.Title)}"; - return; - } - - // LAXD - if (info.VideoSiteName == "laxd" && !string.IsNullOrWhiteSpace(info.VideoSiteId)) - { - var play = $"https://video.laxd.com/a/embed/player/{info.VideoSiteId}/"; - info.ViewerUrl = $"{baseViewer}/video?site=laxd&id={Uri.EscapeDataString(info.VideoSiteId)}&play={Uri.EscapeDataString(play)}&url={Uri.EscapeDataString(info.ActualVideoUrl ?? "")}&title={Uri.EscapeDataString(info.Title)}"; - return; - } - - // XVIDEOS - if (info.VideoSiteName == "xvideos" && !string.IsNullOrWhiteSpace(info.VideoSiteId)) - { - var play = $"https://www.xvideos.com/embedframe/{info.VideoSiteId}"; - info.ViewerUrl = $"{baseViewer}/video?site=xvideos&id={Uri.EscapeDataString(info.VideoSiteId)}&play={Uri.EscapeDataString(play)}&url={Uri.EscapeDataString(info.ActualVideoUrl ?? "")}&title={Uri.EscapeDataString(info.Title)}"; - return; - } - - // 7. 実動画URLが存在する場合 (上記以外の動画サイトまたは未知サイト) - if (!string.IsNullOrWhiteSpace(info.ActualVideoUrl)) - { - // URLから既知の動画サイト判定を試行し、埋め込み可能な場合はplayパラメータを付与 - string? fallbackPlay = null; - string? detectedSite = info.VideoSiteName; - string? detectedId = info.VideoSiteId; - - if (info.ActualVideoUrl.Contains("vjav.com", StringComparison.OrdinalIgnoreCase)) - { - detectedSite = "vjav"; - detectedId ??= System.Text.RegularExpressions.Regex.Match(info.ActualVideoUrl, @"/videos/([0-9]+)").Groups[1].Value; - if (!string.IsNullOrWhiteSpace(detectedId)) fallbackPlay = $"https://vjav.com/embed/{detectedId}/"; - } - else if (info.ActualVideoUrl.Contains("video.laxd.com", StringComparison.OrdinalIgnoreCase) || info.ActualVideoUrl.Contains("laxd.com", StringComparison.OrdinalIgnoreCase)) - { - detectedSite = "laxd"; - detectedId ??= System.Text.RegularExpressions.Regex.Match(info.ActualVideoUrl, @"laxd\.com/(?:content/|embed/)?([0-9a-zA-Z_\-]+)").Groups[1].Value; - if (!string.IsNullOrWhiteSpace(detectedId)) fallbackPlay = $"https://video.laxd.com/a/embed/player/{detectedId}/"; - } - else if (info.ActualVideoUrl.Contains("fc2.com", StringComparison.OrdinalIgnoreCase)) - { - detectedSite = "fc2"; - detectedId ??= System.Text.RegularExpressions.Regex.Match(info.ActualVideoUrl, @"(?:article/|aid=|content/)([0-9a-zA-Z_\-]+)").Groups[1].Value; - if (!string.IsNullOrWhiteSpace(detectedId)) fallbackPlay = $"https://video.fc2.com/a/embed/player/{detectedId}/"; - } - else if (info.ActualVideoUrl.Contains("xvideos.com", StringComparison.OrdinalIgnoreCase)) - { - detectedSite = "xvideos"; - detectedId ??= System.Text.RegularExpressions.Regex.Match(info.ActualVideoUrl, @"(?:video\.|video)([0-9]+)").Groups[1].Value; - if (!string.IsNullOrWhiteSpace(detectedId)) fallbackPlay = $"https://www.xvideos.com/embedframe/{detectedId}"; - } - - var siteParam = !string.IsNullOrWhiteSpace(detectedSite) ? $"&site={Uri.EscapeDataString(detectedSite)}" : ""; - var idParam = !string.IsNullOrWhiteSpace(detectedId) ? $"&id={Uri.EscapeDataString(detectedId)}" : ""; - var playParam = !string.IsNullOrWhiteSpace(fallbackPlay) ? $"&play={Uri.EscapeDataString(fallbackPlay)}" : ""; - - info.ViewerUrl = $"{baseViewer}/video?url={Uri.EscapeDataString(info.ActualVideoUrl)}{siteParam}{idParam}{playParam}&title={Uri.EscapeDataString(info.Title)}"; - return; - } - - // 7. まとめブログURLが存在する場合 - if (!string.IsNullOrWhiteSpace(info.DestinationBlogUrl)) - { - info.ViewerUrl = $"{baseViewer}/video?url={Uri.EscapeDataString(info.DestinationBlogUrl)}&title={Uri.EscapeDataString(info.Title)}"; - return; - } - - // 8. フォールバック: movie.eroterest.net 記事ページ - info.ViewerUrl = $"{baseViewer}/video?site=eroterest&id={Uri.EscapeDataString(info.ArticleId)}&url={Uri.EscapeDataString(info.ArticlePageUrl)}&title={Uri.EscapeDataString(info.Title)}"; + info.ViewerUrl = $"{baseViewer}/?url={Uri.EscapeDataString(targetUrl)}"; } /// diff --git a/rss-generator/Class/MissAV/missav.cs b/rss-generator/Class/MissAV/missav.cs index 1d3699b..24ae800 100644 --- a/rss-generator/Class/MissAV/missav.cs +++ b/rss-generator/Class/MissAV/missav.cs @@ -168,14 +168,8 @@ internal static class missav LogManager.AddLog($"[警告] missav 詳細ページ取得失敗 ({linkHref}): {ex.Message}"); } - // 動画IDの抽出とWebImageViewerリンクの生成 - var videoIdMatch = Regex.Match(linkHref, @"/ja/([^/?#]+)", RegexOptions.IgnoreCase); - string videoId = videoIdMatch.Success ? videoIdMatch.Groups[1].Value : linkHref.TrimEnd('/').Split('/').Last(); - string viewerUrl = $"https://udukipc-web.armonica-vps.work/missav/{Uri.EscapeDataString(videoId)}"; - if (!string.IsNullOrEmpty(streamUrl)) - { - viewerUrl += $"?stream={Uri.EscapeDataString(streamUrl)}"; - } + // WebImageViewer統一リンクの生成 (https://udukipc-web.armonica-vps.work/?url=[ページURL]) + string viewerUrl = $"https://udukipc-web.armonica-vps.work/?url={Uri.EscapeDataString(linkHref)}"; // 本文 HTML(Summary)の生成(123avと同様の構成) var body = new StringBuilder(); diff --git a/rss-generator/Class/MissAV123/missav123.cs b/rss-generator/Class/MissAV123/missav123.cs index 82eaab9..06a0f7d 100644 --- a/rss-generator/Class/MissAV123/missav123.cs +++ b/rss-generator/Class/MissAV123/missav123.cs @@ -232,14 +232,8 @@ internal class missav123 LogManager.AddLog($"[警告] 123av 詳細ページ取得失敗 ({linkHref}): {ex.Message}"); } - // 動画IDの抽出とWebImageViewerリンクの生成 - var videoIdMatch = Regex.Match(linkHref, @"/video/([^/?#]+)", RegexOptions.IgnoreCase); - string videoId = videoIdMatch.Success ? videoIdMatch.Groups[1].Value : linkHref.TrimEnd('/').Split('/').Last(); - string viewerUrl = $"https://udukipc-web.armonica-vps.work/123av/{Uri.EscapeDataString(videoId)}"; - if (!string.IsNullOrEmpty(playerUrl)) - { - viewerUrl += $"?play={Uri.EscapeDataString(playerUrl)}"; - } + // WebImageViewer統一リンクの生成 (https://udukipc-web.armonica-vps.work/?url=[ページURL]) + string viewerUrl = $"https://udukipc-web.armonica-vps.work/?url={Uri.EscapeDataString(linkHref)}"; // 更新日時(サイト上の追加・更新日時)の算出 DateTimeOffset? updatedDate = null; diff --git a/rss-generator/Class/SpankBang/spankbang.cs b/rss-generator/Class/SpankBang/spankbang.cs index f982fb7..de37b33 100644 --- a/rss-generator/Class/SpankBang/spankbang.cs +++ b/rss-generator/Class/SpankBang/spankbang.cs @@ -109,14 +109,8 @@ internal static class spankbang var imageUri = !string.IsNullOrEmpty(imageSrc) ? new Uri(imageSrc) : null; var previewVideoUri = !string.IsNullOrEmpty(previewVideoSrc) ? new Uri(previewVideoSrc) : null; - // 動画IDの抽出とWebImageViewerリンクの生成 - var videoIdMatch = Regex.Match(fullUrl, @"spankbang\.(?:com|party)/([a-z0-9]+)(?:/video|/|$)", RegexOptions.IgnoreCase); - if (!videoIdMatch.Success) - { - videoIdMatch = Regex.Match(rawHref, @"^/?([a-z0-9]+)/video", RegexOptions.IgnoreCase); - } - string videoId = videoIdMatch.Success ? videoIdMatch.Groups[1].Value : rawHref.TrimEnd('/').Split('/').Last(); - string viewerUrl = $"https://udukipc-web.armonica-vps.work/spankbang/{Uri.EscapeDataString(videoId)}"; + // WebImageViewer統一リンクの生成 (https://udukipc-web.armonica-vps.work/?url=[ページURL]) + string viewerUrl = $"https://udukipc-web.armonica-vps.work/?url={Uri.EscapeDataString(fullUrl)}"; // RSS 本文 HTML (Summary) の構築 var body = new StringBuilder();