From 7c45cb3aa56b09699ea857cec4b769375c1ecf5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Miguel=20Alm=C3=A1nzar?= Date: Sat, 2 Nov 2013 21:47:14 -0400 Subject: [PATCH] strip all bracket tags. fixes #598 --- .../Library/ResolverHelper.cs | 2 +- .../Server.Implementations/Library/ResolverHelperTests.cs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/MediaBrowser.Server.Implementations/Library/ResolverHelper.cs b/MediaBrowser.Server.Implementations/Library/ResolverHelper.cs index f9b051cd57..620bcaee4a 100644 --- a/MediaBrowser.Server.Implementations/Library/ResolverHelper.cs +++ b/MediaBrowser.Server.Implementations/Library/ResolverHelper.cs @@ -71,7 +71,7 @@ namespace MediaBrowser.Server.Implementations.Library /// /// The MB name regex /// - private static readonly Regex MBNameRegex = new Regex(@"(\[boxset\]|\[tmdbid=\d+\]|\[tvdbid=\d+\])", RegexOptions.Compiled); + private static readonly Regex MBNameRegex = new Regex(@"(\[.*?\])", RegexOptions.Compiled); /// /// Strip out attribute items and return just the name we will use for items diff --git a/MediaBrowser.Tests/Server.Implementations/Library/ResolverHelperTests.cs b/MediaBrowser.Tests/Server.Implementations/Library/ResolverHelperTests.cs index 84966d76f9..56b6214246 100644 --- a/MediaBrowser.Tests/Server.Implementations/Library/ResolverHelperTests.cs +++ b/MediaBrowser.Tests/Server.Implementations/Library/ResolverHelperTests.cs @@ -8,10 +8,10 @@ namespace MediaBrowser.Tests.Server.Implementations.Library { [TestMethod] public void TestStripBrackets() { - Assert.AreEqual("My Movie [blah blah]", ResolverHelper.StripBrackets("My Movie [boxset] [blah blah]")); - Assert.AreEqual("[tag1] file 01", ResolverHelper.StripBrackets("[tag1] file 01 [tvdbid=12345]")); - Assert.AreEqual("[tag1] file 01", ResolverHelper.StripBrackets("[tag1] file 01 [tmdbid=12345]")); - Assert.AreEqual("[tag1] file 01", ResolverHelper.StripBrackets("[tag1] file [boxset] [tvdbid=12345] 01 [tmdbid=12345]")); + Assert.AreEqual("My Movie", ResolverHelper.StripBrackets("My Movie [boxset] [blah blah]")); + Assert.AreEqual("file 01", ResolverHelper.StripBrackets("[tag1] file 01 [tvdbid=12345]")); + Assert.AreEqual("file 01", ResolverHelper.StripBrackets("[tag1] file 01 [tmdbid=12345]")); + Assert.AreEqual("file 01", ResolverHelper.StripBrackets("[tag1] file [boxset] [tvdbid=12345] 01 [tmdbid=12345]")); } } } \ No newline at end of file