diff --git a/WebImageViewer/Class/Unified/Services/DomainClassifier.cs b/WebImageViewer/Class/Unified/Services/DomainClassifier.cs
index c1ae424..b535561 100644
--- a/WebImageViewer/Class/Unified/Services/DomainClassifier.cs
+++ b/WebImageViewer/Class/Unified/Services/DomainClassifier.cs
@@ -27,7 +27,9 @@ public static class DomainClassifier
{ "ja.hentaipaw.com", ("hentaipaw", "エロモフ (HentaiPaw)") },
{ "momon-ga.com", ("momonga", "モモンガ") },
{ "aurahentai.com", ("aurahentai", "AuraHentai") },
- { "mangalear.com", ("mangalear", "Mangalear") }
+ { "mangalear.com", ("mangalear", "Mangalear") },
+ { "mangalear.blog", ("mangalear", "同人まんがりあ") },
+ { "www.mangalear.blog", ("mangalear", "同人まんがりあ") }
};
// 動画サイトのドメイン定義
@@ -43,6 +45,8 @@ public static class DomainClassifier
{ "movie.eroterest.net", ("eroterest", "動画エロタレスト") },
{ "do-ga.eroterest.net", ("doga", "エロタレドーガ") },
{ "123av.com", ("123av", "123av") },
+ { "123av.me", ("123av", "123av") },
+ { "jav-master", ("123av", "123av") },
{ "vjav.com", ("vjav", "VJAV") },
{ "video.laxd.com", ("laxd", "LAXD") },
{ "laxd.com", ("laxd", "LAXD") },
@@ -59,10 +63,28 @@ public static class DomainClassifier
{ "hdzog.com", ("hdzog", "HDZog") },
{ "upornia.com", ("upornia", "Upornia") },
{ "youjizz.com", ("youjizz", "YouJizz") },
- // まとめブログ系(内部の実動画へ解決)
+ { "www.youjizz.com", ("youjizz", "YouJizz") },
+ { "hotmovs.com", ("txxx", "HotMovs") },
+ { "javynow.com", ("javynow", "JavyNow") },
+ // まとめブログ・アンテナ系(記事内から実動画へ自動解決)
{ "galgaldoga.blogterest.net", ("blog", "GalGalドーガ") },
{ "blogterest.net", ("blog", "まとめブログ") },
- { "blog.2nt.com", ("blog", "2NTブログ") }
+ { "blog.2nt.com", ("blog", "2NTブログ") },
+ { "adult-c.com", ("blog", "アダルト動画まとめ") },
+ { "ero-gu.com", ("blog", "エログ") },
+ { "erometu.icu", ("blog", "エロ滅") },
+ { "free-douga-search.com", ("blog", "無料動画サーチ") },
+ { "gorilla-sene.com", ("blog", "ゴリラセネ") },
+ { "iroharuka.net", ("blog", "いろはるか") },
+ { "mann.tikann.com", ("blog", "痴漢動画まとめ") },
+ { "minero-antenna.com", ("blog", "ミネロアンテナ") },
+ { "minsuke-academy.com", ("blog", "みんすけアカデミー") },
+ { "otakara.silyugoi.cfbx.jp", ("blog", "お宝動画") },
+ { "otimpohametaro.com", ("blog", "おちんぽはめたろう") },
+ { "rengougensen.cyou", ("blog", "連合厳選動画") },
+ { "shokking-movies.tokyo", ("blog", "ショッキングムービー") },
+ { "fetishavinfo.com", ("blog", "フェチAVインフォ") },
+ { "www.fetishavinfo.com", ("blog", "フェチAVインフォ") }
};
///
@@ -85,9 +107,20 @@ public static class DomainClassifier
}
else
{
- // ドメイン名直接入力などの救済
- var slashIdx = trimmed.IndexOf('/');
- host = (slashIdx >= 0 ? trimmed[..slashIdx] : trimmed).ToLowerInvariant();
+ // ドメイン名直接入力・相対パスなどの救済
+ var clean = trimmed.TrimStart('/');
+ var slashIdx = clean.IndexOf('/');
+ host = (slashIdx >= 0 ? clean[..slashIdx] : clean).ToLowerInvariant();
+ }
+
+ // 0. サイトキー直接指定の救済(例: 123av/xxx, missav/xxx 等)
+ if (string.Equals(host, "123av", StringComparison.OrdinalIgnoreCase) || host.Contains("123av"))
+ {
+ return new DomainClassificationResult(MediaType.Video, "123av", "123av", host);
+ }
+ if (string.Equals(host, "missav", StringComparison.OrdinalIgnoreCase) || host.Contains("missav"))
+ {
+ return new DomainClassificationResult(MediaType.Video, "missav", "MissAV", host);
}
// 1. 完全一致チェック
@@ -118,15 +151,28 @@ public static class DomainClassifier
}
}
- // 3. まとめブログ系のドメインチェック
+ // 3. まとめブログ系・ブログサービスのドメインチェック
if (host.Contains("blogterest.net", StringComparison.OrdinalIgnoreCase) ||
host.Contains("blog.2nt.com", StringComparison.OrdinalIgnoreCase) ||
+ (host.Contains("fc2.com", StringComparison.OrdinalIgnoreCase) && host.Contains("blog", StringComparison.OrdinalIgnoreCase)) ||
host.Contains("galgal", StringComparison.OrdinalIgnoreCase))
{
return new DomainClassificationResult(MediaType.Video, "blog", "まとめブログ", host);
}
- // 4. URLパス・キーワードによるフォールバック推定
+ // 4. 直接メディアファイル(動画・画像直リンク)の判定
+ var pathOnly = uri != null ? uri.AbsolutePath.ToLowerInvariant() : trimmed.Split('?')[0].ToLowerInvariant();
+ if (pathOnly.EndsWith(".mp4") || pathOnly.EndsWith(".m3u8") || pathOnly.EndsWith(".webm") || host.Contains("sb-cd.com", StringComparison.OrdinalIgnoreCase))
+ {
+ return new DomainClassificationResult(MediaType.Video, "direct_video", "動画ファイル", host);
+ }
+
+ if (pathOnly.EndsWith(".webp") || pathOnly.EndsWith(".jpg") || pathOnly.EndsWith(".jpeg") || pathOnly.EndsWith(".png") || pathOnly.EndsWith(".gif") || host.Contains("gold-usergeneratedcontent.net", StringComparison.OrdinalIgnoreCase))
+ {
+ return new DomainClassificationResult(MediaType.Gallery, "direct_image", "画像ファイル", host);
+ }
+
+ // 5. URLパス・キーワードによるフォールバック推定
var lower = trimmed.ToLowerInvariant();
if (lower.Contains("/video") || lower.Contains("/watch") || lower.Contains("/embed") || lower.Contains("/movie") || lower.Contains("play"))
{
diff --git a/WebImageViewer/Class/Unified/Services/VideoEmbedExtractor.cs b/WebImageViewer/Class/Unified/Services/VideoEmbedExtractor.cs
index b47a004..f50d939 100644
--- a/WebImageViewer/Class/Unified/Services/VideoEmbedExtractor.cs
+++ b/WebImageViewer/Class/Unified/Services/VideoEmbedExtractor.cs
@@ -24,54 +24,91 @@ public class VideoEmbedExtractor
/// URLを解析し、埋め込まれた状態の動画情報を取得・構築します。
///
public async Task ResolveAsync(string url, CancellationToken ct = default)
+ {
+ return await ResolveAsync(url, null, null, ct);
+ }
+
+ ///
+ /// URLおよび任意の再生・ストリームURL(旧パラメータ等)を考慮して動画情報を取得・構築します。
+ ///
+ public async Task ResolveAsync(
+ string url,
+ string? customPlayUrl = null,
+ string? customStreamUrl = null,
+ CancellationToken ct = default)
{
if (string.IsNullOrWhiteSpace(url))
{
+ if (!string.IsNullOrWhiteSpace(customPlayUrl) || !string.IsNullOrWhiteSpace(customStreamUrl))
+ {
+ return new UnifiedVideoItem
+ {
+ Site = "video",
+ VideoId = "custom",
+ Title = "動画プレイヤー",
+ OriginalUrl = customPlayUrl ?? customStreamUrl ?? "",
+ EmbedUrl = customPlayUrl,
+ StreamUrl = customStreamUrl
+ };
+ }
return new UnifiedVideoItem { Title = "無効なURL", OriginalUrl = url };
}
var trimmedUrl = url.Trim();
var domainInfo = DomainClassifier.Classify(trimmedUrl);
+ UnifiedVideoItem? resolvedItem = null;
+
// 1. 各サイト固有の埋め込み解決処理
try
{
switch (domainInfo.SiteKey.ToLowerInvariant())
{
case "missav":
- return await ResolveMissAvAsync(trimmedUrl, ct);
+ resolvedItem = await ResolveMissAvAsync(trimmedUrl, ct);
+ break;
case "spankbang":
- return ResolveSpankBang(trimmedUrl);
+ resolvedItem = ResolveSpankBang(trimmedUrl);
+ break;
case "123av":
- return Resolve123Av(trimmedUrl);
+ resolvedItem = await Resolve123AvAsync(trimmedUrl, customPlayUrl, ct);
+ break;
case "fc2":
- return ResolveFc2(trimmedUrl);
+ resolvedItem = ResolveFc2(trimmedUrl);
+ break;
case "laxd":
- return ResolveLaxd(trimmedUrl);
+ resolvedItem = ResolveLaxd(trimmedUrl);
+ break;
case "vjav":
- return ResolveVjav(trimmedUrl);
+ resolvedItem = ResolveVjav(trimmedUrl);
+ break;
case "xvideos":
- return ResolveXvideos(trimmedUrl);
+ resolvedItem = ResolveXvideos(trimmedUrl);
+ break;
case "inporn":
- return ResolveInporn(trimmedUrl);
+ resolvedItem = ResolveInporn(trimmedUrl);
+ break;
case "bdsmx":
- return ResolveBdsmx(trimmedUrl);
+ resolvedItem = ResolveBdsmx(trimmedUrl);
+ break;
case "doga":
- return await ResolveEroterestDogaAsync(trimmedUrl, ct);
+ resolvedItem = await ResolveEroterestDogaAsync(trimmedUrl, ct);
+ break;
case "eroterest":
case "blog":
// まとめブログやエロタレスト記事から実動画の埋め込みを再帰探索
- return await ResolveFromArticlePageAsync(trimmedUrl, null, 1, ct);
+ resolvedItem = await ResolveFromArticlePageAsync(trimmedUrl, null, 1, ct);
+ break;
case "senzuri":
case "txxx":
@@ -79,7 +116,46 @@ public class VideoEmbedExtractor
case "hdzog":
case "upornia":
case "youjizz":
- return ResolveGenericTube(domainInfo.SiteKey, trimmedUrl);
+ case "hotmovs":
+ resolvedItem = ResolveGenericTube(domainInfo.SiteKey, trimmedUrl);
+ break;
+
+ case "javynow":
+ var matchJavy = Regex.Match(trimmedUrl, @"(?:video/|v/)(?[0-9]+)", RegexOptions.IgnoreCase);
+ var javyId = matchJavy.Success ? matchJavy.Groups["id"].Value : "video";
+ resolvedItem = new UnifiedVideoItem
+ {
+ Site = "javynow",
+ VideoId = javyId,
+ Title = $"JavyNow ({javyId})",
+ OriginalUrl = trimmedUrl,
+ EmbedUrl = $"https://javynow.com/embed/{javyId}"
+ };
+ break;
+
+ case "direct_video":
+ resolvedItem = new UnifiedVideoItem
+ {
+ Site = "direct",
+ VideoId = "video",
+ Title = "動画プレイヤー",
+ OriginalUrl = trimmedUrl,
+ StreamUrl = trimmedUrl
+ };
+ break;
+ }
+
+ if (resolvedItem != null)
+ {
+ if (!string.IsNullOrWhiteSpace(customPlayUrl) && string.IsNullOrWhiteSpace(resolvedItem.EmbedUrl))
+ {
+ resolvedItem.EmbedUrl = customPlayUrl;
+ }
+ if (!string.IsNullOrWhiteSpace(customStreamUrl) && string.IsNullOrWhiteSpace(resolvedItem.StreamUrl))
+ {
+ resolvedItem.StreamUrl = customStreamUrl;
+ }
+ return resolvedItem;
}
}
catch (Exception ex)
@@ -90,7 +166,16 @@ public class VideoEmbedExtractor
// 2. 未知の動画サイトまたは汎用ページからの動的埋め込み抽出
try
{
- return await ExtractGenericEmbedFromHtmlAsync(trimmedUrl, ct);
+ resolvedItem = await ExtractGenericEmbedFromHtmlAsync(trimmedUrl, ct);
+ if (!string.IsNullOrWhiteSpace(customPlayUrl) && string.IsNullOrWhiteSpace(resolvedItem.EmbedUrl))
+ {
+ resolvedItem.EmbedUrl = customPlayUrl;
+ }
+ if (!string.IsNullOrWhiteSpace(customStreamUrl) && string.IsNullOrWhiteSpace(resolvedItem.StreamUrl))
+ {
+ resolvedItem.StreamUrl = customStreamUrl;
+ }
+ return resolvedItem;
}
catch (Exception ex)
{
@@ -194,21 +279,164 @@ public class VideoEmbedExtractor
}
///
- /// 123av の公式埋め込みプレイヤーを解決します。
+ /// 123av の埋め込みプレイヤーを動的解決します。
+ /// ページHTML内の player(JSON.parse(...)) から最新の埋め込みプレイヤーURL(jav-master等)を抽出します。
///
- private static UnifiedVideoItem Resolve123Av(string url)
+ private async Task Resolve123AvAsync(string url, string? customPlayUrl = null, CancellationToken ct = default)
{
- var match = Regex.Match(url, @"video/([a-zA-Z0-9_-]+)", RegexOptions.IgnoreCase);
- var id = match.Success ? match.Groups[1].Value : "video";
+ // 0. 直接 jav-master 等の埋め込みプレイヤーURLが指定された場合の即時対応
+ if (url.Contains("jav-master", StringComparison.OrdinalIgnoreCase))
+ {
+ var matchId = Regex.Match(url, @"/e/([a-zA-Z0-9_-]+)");
+ var vId = matchId.Success ? matchId.Groups[1].Value : "video";
+ return new UnifiedVideoItem
+ {
+ Site = "123av",
+ VideoId = vId,
+ Title = $"123av 動画 ({vId})",
+ OriginalUrl = url,
+ EmbedUrl = url
+ };
+ }
- return new UnifiedVideoItem
+ // 1. IDの抽出
+ string id = "video";
+ var idMatch = Regex.Match(url, @"(?:123av\.[a-z]+/(?:[a-z]{2}/)?(?:v|video)/|^/?123av/)(?[^/?#]+)", RegexOptions.IgnoreCase);
+ if (idMatch.Success)
+ {
+ id = idMatch.Groups["id"].Value;
+ }
+ else
+ {
+ var vMatch = Regex.Match(url, @"(?:/v/|/video/)(?[^/?#]+)", RegexOptions.IgnoreCase);
+ if (vMatch.Success)
+ {
+ id = vMatch.Groups["id"].Value;
+ }
+ else
+ {
+ var clean = url.Split('?')[0].Split('#')[0].TrimEnd('/');
+ var lastSlash = clean.LastIndexOf('/');
+ if (lastSlash >= 0)
+ {
+ id = clean[(lastSlash + 1)..];
+ }
+ else if (!string.IsNullOrWhiteSpace(clean) && !clean.StartsWith("http", StringComparison.OrdinalIgnoreCase))
+ {
+ id = clean;
+ }
+ }
+ }
+
+ var canonicalUrl = $"https://123av.com/ja/v/{id}";
+
+ var item = new UnifiedVideoItem
{
Site = "123av",
VideoId = id,
Title = $"123av ({id})",
- OriginalUrl = url,
- EmbedUrl = $"https://javplayer.cc/v/{id}"
+ OriginalUrl = canonicalUrl
};
+
+ // URL自身に play= クエリが含まれる場合は customPlayUrl として救済
+ if (string.IsNullOrWhiteSpace(customPlayUrl) && url.Contains("play=", StringComparison.OrdinalIgnoreCase))
+ {
+ var matchPlay = Regex.Match(url, @"[?&]play=([^&]+)", RegexOptions.IgnoreCase);
+ if (matchPlay.Success)
+ {
+ customPlayUrl = Uri.UnescapeDataString(matchPlay.Groups[1].Value);
+ }
+ }
+
+ if (!string.IsNullOrWhiteSpace(customPlayUrl))
+ {
+ item.EmbedUrl = customPlayUrl;
+ }
+
+ // 2. 123av 公式ページHTMLを取得して実プレイヤーURLおよびタイトル・サムネイルを動的抽出
+ try
+ {
+ var html = await _httpHelper.GetHtmlAsync(canonicalUrl, ct: ct);
+ if (!string.IsNullOrWhiteSpace(html))
+ {
+ // タイトル抽出
+ var titleMatch = Regex.Match(html, @"]*class=""[^""]*watch__title[^""]*""[^>]*>(?.*?)
", RegexOptions.IgnoreCase | RegexOptions.Singleline);
+ if (titleMatch.Success)
+ {
+ item.Title = CleanText(Regex.Replace(titleMatch.Groups["title"].Value, @"<[^>]+>", ""));
+ }
+ else
+ {
+ var ogTitle = Regex.Match(html, @"[^']+)'\)");
+ if (playerJsonMatch.Success)
+ {
+ var rawJson = playerJsonMatch.Groups["json"].Value;
+ rawJson = System.Text.RegularExpressions.Regex.Unescape(rawJson);
+ try
+ {
+ using var doc = System.Text.Json.JsonDocument.Parse(rawJson);
+ if (doc.RootElement.ValueKind == System.Text.Json.JsonValueKind.Array)
+ {
+ foreach (var ep in doc.RootElement.EnumerateArray())
+ {
+ if (ep.TryGetProperty("url", out var urlProp))
+ {
+ var extractedUrl = urlProp.GetString();
+ if (!string.IsNullOrWhiteSpace(extractedUrl))
+ {
+ item.EmbedUrl = extractedUrl;
+ break;
+ }
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogWarning(ex, "123av の player JSON 解析エラー: {Json}", rawJson);
+ }
+ }
+
+ // JSONで見つからなかった場合、iframeタグのsrcをフォールバック探索
+ if (string.IsNullOrWhiteSpace(item.EmbedUrl))
+ {
+ var iframeMatch = Regex.Match(html, @"