diff --git a/WebImageViewer/Class/Renderers/HtmlRenderer.cs b/WebImageViewer/Class/Renderers/HtmlRenderer.cs index 5ab51a5..d6b7916 100644 --- a/WebImageViewer/Class/Renderers/HtmlRenderer.cs +++ b/WebImageViewer/Class/Renderers/HtmlRenderer.cs @@ -1797,6 +1797,53 @@ public static class HtmlRenderer switch (normalizedSite) { + case "doga": + case "eroterest_doga": + siteDisplayName = "エロタレドーガ"; + badgeText = "EROTEREST DOGA"; + accentGradient = "linear-gradient(135deg, #e11d48 0%, #ec4899 50%, #f43f5e 100%)"; + accentPrimary = "#e11d48"; + glowColor = "rgba(225, 29, 72, 0.3)"; + defaultOrigUrl = $"https://do-ga.eroterest.net/video/detail/{safeId}/"; + break; + + case "laxd": + siteDisplayName = "LAXD"; + badgeText = "LAXD VIDEO"; + accentGradient = "linear-gradient(135deg, #f59e0b 0%, #d97706 100%)"; + accentPrimary = "#f59e0b"; + glowColor = "rgba(245, 158, 11, 0.3)"; + defaultOrigUrl = $"https://video.laxd.com/a/content/{safeId}"; + break; + + case "upornia": + siteDisplayName = "Upornia"; + badgeText = "UPORNIA VIDEO"; + accentGradient = "linear-gradient(135deg, #f10048 0%, #be123c 100%)"; + accentPrimary = "#f10048"; + glowColor = "rgba(241, 0, 72, 0.3)"; + defaultOrigUrl = $"https://upornia.com/videos/{safeId}/"; + break; + + case "xvideos": + siteDisplayName = "XVIDEOS"; + badgeText = "XVIDEOS"; + accentGradient = "linear-gradient(135deg, #dc2626 0%, #ef4444 100%)"; + accentPrimary = "#dc2626"; + glowColor = "rgba(220, 38, 38, 0.3)"; + defaultOrigUrl = $"https://www.xvideos.com/video.{safeId}/"; + break; + + case "eroterest": + case "movie.eroterest.net": + siteDisplayName = "動画エロタレスト"; + badgeText = "EROTEREST"; + accentGradient = "linear-gradient(135deg, #6366f1 0%, #ec4899 100%)"; + accentPrimary = "#6366f1"; + glowColor = "rgba(99, 102, 241, 0.3)"; + defaultOrigUrl = $"https://movie.eroterest.net/page/{safeId}/"; + break; + case "123av": siteDisplayName = "123av"; badgeText = "123AV VIDEO"; @@ -1818,7 +1865,6 @@ public static class HtmlRenderer break; case "spankbang": - default: siteDisplayName = "SpankBang"; badgeText = "SPANKBANG VIDEO"; accentGradient = "linear-gradient(135deg, #ec4899 0%, #8b5cf6 100%)"; @@ -1827,6 +1873,15 @@ public static class HtmlRenderer defaultOrigUrl = $"https://jp.spankbang.com/{safeId}/video/"; playerUrl ??= $"https://spankbang.com/{safeId}/embed/"; break; + + default: + siteDisplayName = !string.IsNullOrWhiteSpace(site) ? site.ToUpperInvariant() : "動画プレイヤー"; + badgeText = "WEB VIDEO"; + accentGradient = "linear-gradient(135deg, #06b6d4 0%, #3b82f6 100%)"; + accentPrimary = "#06b6d4"; + glowColor = "rgba(6, 182, 212, 0.3)"; + defaultOrigUrl = originalUrl ?? (safeId.StartsWith("http") ? safeId : ""); + break; } var safeTitle = !string.IsNullOrWhiteSpace(title) ? Encoder.Encode(title) : $"{siteDisplayName} 動画プレイヤー ({safeId})"; @@ -2190,11 +2245,12 @@ public static class HtmlRenderer } }); - // HLS.js ストリーミング初期化(m3u8がある場合) + // 動画ストリーミング初期化(HLS m3u8 または直接 MP4/WebM 動画) const hlsVideo = document.getElementById('hlsVideo'); const streamUrl = "{{safeStreamUrl}}"; if (streamUrl && hlsVideo) { - if (Hls.isSupported()) { + const isHls = streamUrl.includes('.m3u8') || streamUrl.includes('m3u8'); + if (isHls && Hls.isSupported()) { const hls = new Hls({ enableWorker: true, lowLatencyMode: true @@ -2220,7 +2276,13 @@ public static class HtmlRenderer } } }); - } else if (hlsVideo.canPlayType('application/vnd.apple.mpegurl')) { + } else if (isHls && hlsVideo.canPlayType('application/vnd.apple.mpegurl')) { + hlsVideo.src = streamUrl; + hlsVideo.addEventListener('loadedmetadata', function() { + hlsVideo.play().catch(() => {}); + }); + } else { + // 通常の MP4 / WebM 動画ファイル等の直接再生 hlsVideo.src = streamUrl; hlsVideo.addEventListener('loadedmetadata', function() { hlsVideo.play().catch(() => {}); diff --git a/WebImageViewer/Program.cs b/WebImageViewer/Program.cs index 5f2301f..d95f158 100644 --- a/WebImageViewer/Program.cs +++ b/WebImageViewer/Program.cs @@ -111,40 +111,65 @@ app.MapGet("/view", async (string? url, string? site, string? id, string? catego }); // 汎用動画プレイヤー画面 -app.MapGet("/video", (string? url, string? id, string? site, string? play, string? stream) => +app.MapGet("/video", (string? url, string? id, string? site, string? play, string? stream, string? title) => { var target = url ?? id; - if (string.IsNullOrWhiteSpace(target)) + if (string.IsNullOrWhiteSpace(target) && string.IsNullOrWhiteSpace(stream) && string.IsNullOrWhiteSpace(play)) { return Results.Redirect("/"); } // 123av 判定 - if (string.Equals(site, "123av", StringComparison.OrdinalIgnoreCase) || target.Contains("123av", StringComparison.OrdinalIgnoreCase)) + if (string.Equals(site, "123av", StringComparison.OrdinalIgnoreCase) || (target != null && target.Contains("123av", StringComparison.OrdinalIgnoreCase))) { - var vId = Extract123AvId(target) ?? target.Trim(); - var orig = target.StartsWith("http", StringComparison.OrdinalIgnoreCase) ? target : $"https://123av.com/ja/video/{vId}"; - return Results.Content(HtmlRenderer.RenderVideoPlayer("123av", vId, play, null, orig, $"123av 動画 ({vId})"), "text/html; charset=utf-8"); + var vId = (target != null ? Extract123AvId(target) : null) ?? id?.Trim() ?? "video"; + var orig = (target != null && target.StartsWith("http", StringComparison.OrdinalIgnoreCase)) ? target : $"https://123av.com/ja/video/{vId}"; + return Results.Content(HtmlRenderer.RenderVideoPlayer("123av", vId, play, null, orig, title ?? $"123av 動画 ({vId})"), "text/html; charset=utf-8"); } // missav 判定 - if (string.Equals(site, "missav", StringComparison.OrdinalIgnoreCase) || target.Contains("missav", StringComparison.OrdinalIgnoreCase)) + if (string.Equals(site, "missav", StringComparison.OrdinalIgnoreCase) || (target != null && target.Contains("missav", StringComparison.OrdinalIgnoreCase))) { - var vId = ExtractMissAvId(target) ?? target.Trim(); - var orig = target.StartsWith("http", StringComparison.OrdinalIgnoreCase) ? target : $"https://missav.ai/ja/{vId}"; - return Results.Content(HtmlRenderer.RenderVideoPlayer("missav", vId, play, stream, orig, $"missav 動画 ({vId})"), "text/html; charset=utf-8"); + var vId = (target != null ? ExtractMissAvId(target) : null) ?? id?.Trim() ?? "video"; + var orig = (target != null && target.StartsWith("http", StringComparison.OrdinalIgnoreCase)) ? target : $"https://missav.ai/ja/{vId}"; + return Results.Content(HtmlRenderer.RenderVideoPlayer("missav", vId, play, stream, orig, title ?? $"missav 動画 ({vId})"), "text/html; charset=utf-8"); } // SpankBang 判定 - var videoId = ExtractSpankBangId(target); - if (!string.IsNullOrWhiteSpace(videoId)) + if (string.Equals(site, "spankbang", StringComparison.OrdinalIgnoreCase) || (target != null && target.Contains("spankbang", StringComparison.OrdinalIgnoreCase))) { - return Results.Content(HtmlRenderer.RenderVideoPlayer(videoId, target), "text/html; charset=utf-8"); + var videoId = (target != null ? ExtractSpankBangId(target) : null) ?? id?.Trim() ?? "video"; + var orig = (target != null && target.StartsWith("http", StringComparison.OrdinalIgnoreCase)) ? target : $"https://jp.spankbang.com/{videoId}/video/"; + return Results.Content(HtmlRenderer.RenderVideoPlayer("spankbang", videoId, play ?? $"https://spankbang.com/{videoId}/embed/", stream, orig, title ?? $"SpankBang 動画 ({videoId})"), "text/html; charset=utf-8"); } - // どの動画サイト形式にも一致しない場合のエラー表示 + // エロタレドーガ 判定 + if (string.Equals(site, "doga", StringComparison.OrdinalIgnoreCase) || string.Equals(site, "eroterest_doga", StringComparison.OrdinalIgnoreCase) || (target != null && target.Contains("do-ga.eroterest.net", StringComparison.OrdinalIgnoreCase))) + { + var vId = id?.Trim() ?? (target != null ? System.Text.RegularExpressions.Regex.Match(target, @"detail/([0-9]+)").Groups[1].Value : "") ?? "doga"; + if (string.IsNullOrWhiteSpace(vId)) vId = "doga"; + var orig = (target != null && target.StartsWith("http", StringComparison.OrdinalIgnoreCase)) ? target : $"https://do-ga.eroterest.net/video/detail/{vId}/"; + return Results.Content(HtmlRenderer.RenderVideoPlayer("doga", vId, play, stream, orig, title ?? $"エロタレドーガ ({vId})"), "text/html; charset=utf-8"); + } + + // stream (HLS m3u8 / MP4 等) または play (iframe player) が渡されている場合、または site が指定されている場合 + if (!string.IsNullOrWhiteSpace(stream) || !string.IsNullOrWhiteSpace(play) || !string.IsNullOrWhiteSpace(site)) + { + var currentSite = !string.IsNullOrWhiteSpace(site) ? site : "video"; + var videoId = id?.Trim() ?? (!string.IsNullOrWhiteSpace(target) && !target.StartsWith("http") ? target : "video"); + var orig = (target != null && target.StartsWith("http", StringComparison.OrdinalIgnoreCase)) ? target : ""; + return Results.Content(HtmlRenderer.RenderVideoPlayer(currentSite, videoId, play, stream, orig, title ?? $"{currentSite} 動画プレイヤー"), "text/html; charset=utf-8"); + } + + // target が URL の場合は汎用プレイヤーとして開く + if (target != null && target.StartsWith("http", StringComparison.OrdinalIgnoreCase)) + { + return Results.Content(HtmlRenderer.RenderVideoPlayer("video", "video", play, stream, target, title ?? "動画プレイヤー"), "text/html; charset=utf-8"); + } + + // どの形式にも一致しない場合のエラー表示 return Results.Content( - HtmlRenderer.RenderErrorPage($"指定された動画URLまたはID({target})を認識できませんでした。123av, missav.ai, または jp.spankbang.com のURLまたは動画IDをご確認ください。", 400), + HtmlRenderer.RenderErrorPage($"指定された動画URLまたはID({target})を認識できませんでした。有効な動画URLまたはIDをご確認ください。", 400), "text/html; charset=utf-8", statusCode: 400); });