diff --git a/MusicDownloader/Class/CmnUtil.cs b/MusicDownloader/Class/CmnUtil.cs index 4d74e4b..c02eedc 100644 --- a/MusicDownloader/Class/CmnUtil.cs +++ b/MusicDownloader/Class/CmnUtil.cs @@ -160,7 +160,32 @@ namespace MusicDownloader.Class if (!string.IsNullOrEmpty(part1) && !string.IsNullOrEmpty(part2)) { - // A. チャンネル名と照合 + // A. part1 に feat. / ft. が含まれるパターン: "曲名 feat. ボーカル / P名" + // 例: "NEO feat. 初音ミク / じん" -> Title: "NEO", Artist: "じん feat. 初音ミク" + var part1FeatMatch = Regex.Match(part1, @"^(.*?)\s*[\(\[\{【「『]?(?:feat\.?|ft\.?)\s*([^\]\)\}】」』]+)[\)\]\}】」』]?$", RegexOptions.IgnoreCase); + if (part1FeatMatch.Success) + { + var mainTitle = part1FeatMatch.Groups[1].Value.Trim(); + var featureArtist = part1FeatMatch.Groups[2].Value.Trim(); + + if (!string.IsNullOrWhiteSpace(mainTitle)) + { + var mainArtist = part2; + var combinedArtist = !string.IsNullOrWhiteSpace(featureArtist) + ? $"{mainArtist} feat. {featureArtist}" + : mainArtist; + return (combinedArtist, mainTitle); + } + } + + // B. part2 に feat. / ft. が含まれるパターン: "曲名 / アーティスト feat. ボーカル" + // 例: "セカイ / DECO*27 feat. 初音ミク" -> Title: "セカイ", Artist: "DECO*27 feat. 初音ミク" + if (Regex.IsMatch(part2, @"(?i)\b(?:feat\.?|ft\.?)\b")) + { + return (part2, part1); + } + + // C. チャンネル名と照合 if (!string.IsNullOrWhiteSpace(cleanUploader)) { if (part2.Equals(cleanUploader, StringComparison.OrdinalIgnoreCase) || @@ -176,7 +201,7 @@ namespace MusicDownloader.Class } } - // B. ボーカル名・アーティスト名特有のキーワード判定(初音ミク等) + // D. ボーカル名・アーティスト名特有のキーワード判定(初音ミク等) var isPart1Vocal = VocalOrArtistPattern.IsMatch(part1); var isPart2Vocal = VocalOrArtistPattern.IsMatch(part2); @@ -191,7 +216,7 @@ namespace MusicDownloader.Class return (part1, part2); } - // C. 区切り文字に応じた判定 + // E. 区切り文字に応じた判定 // スラッシュ区切り(/、/、⧸)の場合は「曲名 / アーティスト」のパターンが多い if (sep == "/" || sep == "/" || sep == "\u29F8") { diff --git a/MusicDownloader/Class/Metadata/MusicMetadataClient.cs b/MusicDownloader/Class/Metadata/MusicMetadataClient.cs index 2ae778a..2934cf6 100644 --- a/MusicDownloader/Class/Metadata/MusicMetadataClient.cs +++ b/MusicDownloader/Class/Metadata/MusicMetadataClient.cs @@ -142,6 +142,18 @@ namespace MusicDownloader.Class.Metadata { list.Add($"{parsedArtist} {parsedTitle}"); list.Add($"{parsedTitle} {parsedArtist}"); + + // "じん feat. 初音ミク" -> "じん NEO" + var featIdx = parsedArtist.IndexOf("feat.", StringComparison.OrdinalIgnoreCase); + if (featIdx > 0) + { + var coreArtist = parsedArtist.Substring(0, featIdx).Trim(); + if (!string.IsNullOrWhiteSpace(coreArtist)) + { + list.Add($"{coreArtist} {parsedTitle}"); + list.Add($"{parsedTitle} {coreArtist}"); + } + } } // B. チャンネル名 + パースされた曲名 diff --git a/MusicDownloader/obj/Debug/net10.0/MusicDownloader.AssemblyInfo.cs b/MusicDownloader/obj/Debug/net10.0/MusicDownloader.AssemblyInfo.cs index 1ce64f2..1fdffac 100644 --- a/MusicDownloader/obj/Debug/net10.0/MusicDownloader.AssemblyInfo.cs +++ b/MusicDownloader/obj/Debug/net10.0/MusicDownloader.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("MusicDownloader")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+7f0f08bb2d8ad03dc3b832825b2ae2df086242a0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+910750fbf7b0288388099d04fdfc33c9273f1171")] [assembly: System.Reflection.AssemblyProductAttribute("MusicDownloader")] [assembly: System.Reflection.AssemblyTitleAttribute("MusicDownloader")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/MusicDownloader/obj/Release/net10.0/MusicDownloader.AssemblyInfo.cs b/MusicDownloader/obj/Release/net10.0/MusicDownloader.AssemblyInfo.cs index 699d4f5..2185429 100644 --- a/MusicDownloader/obj/Release/net10.0/MusicDownloader.AssemblyInfo.cs +++ b/MusicDownloader/obj/Release/net10.0/MusicDownloader.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("MusicDownloader")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+7f0f08bb2d8ad03dc3b832825b2ae2df086242a0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+910750fbf7b0288388099d04fdfc33c9273f1171")] [assembly: System.Reflection.AssemblyProductAttribute("MusicDownloader")] [assembly: System.Reflection.AssemblyTitleAttribute("MusicDownloader")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]