The Free Software Media System - Server Backend & API
Add curly brace and parentheses support for parsing attribute values from paths
Nilesh Patelacb9da6f9382
diff --git a/Emby.Server.Implementations/Library/PathExtensions.cs b/Emby.Server.Implementations/Library/PathExtensions.csindex 21e7079d88..fc63251ad0 100644--- a/Emby.Server.Implementations/Library/PathExtensions.cs+++ b/Emby.Server.Implementations/Library/PathExtensions.cs@@ -37,15 +37,25 @@ namespace Emby.Server.Implementations.Librarywhile (attributeIndex > -1 && attributeIndex < maxIndex){var attributeEnd = attributeIndex + attribute.Length;- if (attributeIndex > 0- && str[attributeIndex - 1] == '['- && (str[attributeEnd] == '=' || str[attributeEnd] == '-'))+ if (attributeIndex > 0){- var closingIndex = str[attributeEnd..].IndexOf(']');- // Must be at least 1 character before the closing bracket.- if (closingIndex > 1)+ var attributeOpener = str[attributeIndex - 1];+ var attributeCloser = attributeOpener switch{- return str[(attributeEnd + 1)..(attributeEnd + closingIndex)].Trim().ToString();+ '[' => ']',+ '(' => ')',+ '{' => '}',+ _ => '\0'+ };+ if (attributeCloser != '\0' && (str[attributeEnd] == '=' || str[attributeEnd] == '-'))+ {+ var closingIndex = str[attributeEnd..].IndexOf(attributeCloser);++ // Must be at least 1 character before the closing bracket.+ if (closingIndex > 1)+ {+ return str[(attributeEnd + 1)..(attributeEnd + closingIndex)].Trim().ToString();+ }}}diff --git a/tests/Jellyfin.Server.Implementations.Tests/Library/PathExtensionsTests.cs b/tests/Jellyfin.Server.Implementations.Tests/Library/PathExtensionsTests.csindex 940e3c2b12..74cd303bab 100644--- a/tests/Jellyfin.Server.Implementations.Tests/Library/PathExtensionsTests.cs+++ b/tests/Jellyfin.Server.Implementations.Tests/Library/PathExtensionsTests.cs@@ -11,21 +11,29 @@ namespace Jellyfin.Server.Implementations.Tests.Library[InlineData("Superman: Red Son [imdbid=tt10985510]", "imdbid", "tt10985510")][InlineData("Superman: Red Son [imdbid-tt10985510]", "imdbid", "tt10985510")][InlineData("Superman: Red Son - tt10985510", "imdbid", "tt10985510")]+ [InlineData("Superman: Red Son {imdbid=tt10985510}", "imdbid", "tt10985510")]+ [InlineData("Superman: Red Son (imdbid-tt10985510)", "imdbid", "tt10985510")][InlineData("Superman: Red Son", "imdbid", null)]- [InlineData("Superman: Red Son", "something", null)][InlineData("Superman: Red Son [imdbid1=tt11111111][imdbid=tt10985510]", "imdbid", "tt10985510")]- [InlineData("Superman: Red Son [imdbid1-tt11111111][imdbid=tt10985510]", "imdbid", "tt10985510")]+ [InlineData("Superman: Red Son {imdbid1=tt11111111}(imdbid=tt10985510)", "imdbid", "tt10985510")]+ [InlineData("Superman: Red Son (imdbid1-tt11111111)[imdbid=tt10985510]", "imdbid", "tt10985510")][InlineData("Superman: Red Son [tmdbid=618355][imdbid=tt10985510]", "imdbid", "tt10985510")]- [InlineData("Superman: Red Son [tmdbid-618355][imdbid-tt10985510]", "imdbid", "tt10985510")]- [InlineData("Superman: Red Son [tmdbid-618355][imdbid-tt10985510]", "tmdbid", "618355")]+ [InlineData("Superman: Red Son [tmdbid-618355]{imdbid-tt10985510}", "imdbid", "tt10985510")]+ [InlineData("Superman: Red Son (tmdbid-618355)[imdbid-tt10985510]", "tmdbid", "618355")][InlineData("Superman: Red Son [providera-id=1]", "providera-id", "1")][InlineData("Superman: Red Son [providerb-id=2]", "providerb-id", "2")][InlineData("Superman: Red Son [providera id=4]", "providera id", "4")][InlineData("Superman: Red Son [providerb id=5]", "providerb id", "5")][InlineData("Superman: Red Son [tmdbid=3]", "tmdbid", "3")][InlineData("Superman: Red Son [tvdbid-6]", "tvdbid", "6")]+ [InlineData("Superman: Red Son {tmdbid=3)", "tmdbid", "3")]+ [InlineData("Superman: Red Son (tvdbid-6}", "tvdbid", "6")][InlineData("[tmdbid=618355]", "tmdbid", "618355")]+ [InlineData("{tmdbid=618355}", "tmdbid", "618355")]+ [InlineData("(tmdbid=618355)", "tmdbid", "618355")][InlineData("[tmdbid-618355]", "tmdbid", "618355")]+ [InlineData("{tmdbid-618355)", "tmdbid", null)]+ [InlineData("[tmdbid-618355}", "tmdbid", null)][InlineData("tmdbid=111111][tmdbid=618355]", "tmdbid", "618355")][InlineData("[tmdbid=618355]tmdbid=111111]", "tmdbid", "618355")][InlineData("tmdbid=618355]", "tmdbid", null)]@@ -36,6 +44,9 @@ namespace Jellyfin.Server.Implementations.Tests.Library[InlineData("[tmdbid=][imdbid=tt10985510]", "tmdbid", null)][InlineData("[tmdbid-][imdbid-tt10985510]", "tmdbid", null)][InlineData("Superman: Red Son [tmdbid-618355][tmdbid=1234567]", "tmdbid", "618355")]+ [InlineData("{tmdbid=}{imdbid=tt10985510}", "tmdbid", null)]+ [InlineData("(tmdbid-)(imdbid-tt10985510)", "tmdbid", null)]+ [InlineData("Superman: Red Son {tmdbid-618355}{tmdbid=1234567}", "tmdbid", "618355")]public void GetAttributeValue_ValidArgs_Correct(string input, string attribute, string? expectedResult){Assert.Equal(expectedResult, PathExtensions.GetAttributeValue(input, attribute));