The Free Software Media System - Server Backend & API
Fix filename truncation when bracketed tags appear mid-filename
tyage1c2f08bc173f
diff --git a/Emby.Naming/Common/NamingOptions.cs b/Emby.Naming/Common/NamingOptions.csindex f61ca7e129..eb1c61c5fa 100644--- a/Emby.Naming/Common/NamingOptions.cs+++ b/Emby.Naming/Common/NamingOptions.cs@@ -152,8 +152,8 @@ namespace Emby.Naming.CommonCleanStrings =[- @"^\s*(?<cleaned>.+?)[ _\,\.\(\)\[\]\-](3d|sbs|tab|hsbs|htab|mvc|HDR|HDC|UHD|UltraHD|4k|ac3|dts|custom|dc|divx|divx5|dsr|dsrip|dutch|dvd|dvdrip|dvdscr|dvdscreener|screener|dvdivx|cam|fragment|fs|hdtv|hdrip|hdtvrip|internal|limited|multi|subs|ntsc|ogg|ogm|pal|pdtv|proper|repack|rerip|retail|cd[1-9]|r5|bd5|bd|se|svcd|swedish|german|read.nfo|nfofix|unrated|ws|telesync|ts|telecine|tc|brrip|bdrip|480p|480i|576p|576i|720p|720i|1080p|1080i|2160p|hrhd|hrhdtv|hddvd|bluray|blu-ray|x264|x265|h264|h265|xvid|xvidvd|xxx|www.www|AAC|DTS|\[.*\])([ _\,\.\(\)\[\]\-]|$)",- @"^(?<cleaned>.+?)(\[.*\])",+ @"^\s*(?<cleaned>.+?)[ _\,\.\(\)\[\]\-](3d|sbs|tab|hsbs|htab|mvc|HDR|HDC|UHD|UltraHD|4k|ac3|dts|custom|dc|divx|divx5|dsr|dsrip|dutch|dvd|dvdrip|dvdscr|dvdscreener|screener|dvdivx|cam|fragment|fs|hdtv|hdrip|hdtvrip|internal|limited|multi|subs|ntsc|ogg|ogm|pal|pdtv|proper|repack|rerip|retail|cd[1-9]|r5|bd5|bd|se|svcd|swedish|german|read.nfo|nfofix|unrated|ws|telesync|ts|telecine|tc|brrip|bdrip|480p|480i|576p|576i|720p|720i|1080p|1080i|2160p|hrhd|hrhdtv|hddvd|bluray|blu-ray|x264|x265|h264|h265|xvid|xvidvd|xxx|www.www|AAC|DTS)(?=[ _\,\.\(\)\[\]\-]|$)",+ @"^\s*(?<cleaned>.+?)((\s*\[[^\]]+\]\s*)+)(\.[^\s]+)?$",@"^\s*(?<cleaned>.+?)\WE[0-9]+(-|~)E?[0-9]+(\W|$)",@"^\s*\[[^\]]+\](?!\.\w+$)\s*(?<cleaned>.+)",@"^\s*(?<cleaned>.+?)\s+-\s+[0-9]+\s*$",diff --git a/Emby.Naming/Video/CleanStringParser.cs b/Emby.Naming/Video/CleanStringParser.csindex a336f8fbd1..f27f8bc0a4 100644--- a/Emby.Naming/Video/CleanStringParser.cs+++ b/Emby.Naming/Video/CleanStringParser.cs@@ -44,7 +44,7 @@ namespace Emby.Naming.Videovar match = expression.Match(name);if (match.Success && match.Groups.TryGetValue("cleaned", out var cleaned)){- newName = cleaned.Value;+ newName = cleaned.Value.Trim();return true;}diff --git a/tests/Jellyfin.Naming.Tests/Video/CleanStringTests.cs b/tests/Jellyfin.Naming.Tests/Video/CleanStringTests.csindex 6c9c98cbe8..df5819d747 100644--- a/tests/Jellyfin.Naming.Tests/Video/CleanStringTests.cs+++ b/tests/Jellyfin.Naming.Tests/Video/CleanStringTests.cs@@ -29,6 +29,7 @@ namespace Jellyfin.Naming.Tests.Video[InlineData("[OCN] 애타는 로맨스 720p-NEXT", "애타는 로맨스")][InlineData("[tvN] 혼술남녀.E01-E16.720p-NEXT", "혼술남녀")][InlineData("[tvN] 연애말고 결혼 E01~E16 END HDTV.H264.720p-WITH", "연애말고 결혼")]+ [InlineData("2026年01月10日23時00分00秒-[新]TRIGUN STARGAZE[字].mp4", "2026年01月10日23時00分00秒-[新]TRIGUN STARGAZE")]// FIXME: [InlineData("After The Sunset - [0004].mkv", "After The Sunset")]public void CleanStringTest_NeedsCleaning_Success(string input, string expectedName){@@ -44,6 +45,7 @@ namespace Jellyfin.Naming.Tests.Video[InlineData("American.Psycho.mkv")][InlineData("American Psycho.mkv")][InlineData("Run lola run (lola rennt) (2009).mp4")]+ [InlineData("2026年01月05日00時55分00秒-[新]違国日記【ANiMiDNiGHT!!!】#1.mp4")]public void CleanStringTest_DoesntNeedCleaning_False(string? input){Assert.False(VideoResolver.TryCleanString(input, _namingOptions, out var newName));