jellyfin/Emby.Naming/Video/VideoResolver.cs, branch v12.0-rc2 Unnamed repository; edit this file 'description' to name the repository. https://git.b0n.dev/jellyfin/atom?h=v12.0-rc2 2025-03-28T00:18:19Z Fix for Issue #12142: Fix ExtraRuleResolver filtering out top level folders (#12170) 2025-03-28T00:18:19Z Michael McElroy 44167199+mcmcelro@users.noreply.github.com 2025-03-28T00:18:19Z urn:sha1:f02190c394ad300c00dec4cc4f3b9d42ac6aaca2 * Fix ExtraRuleResolver to stop filtering out libraries where the name of the base folder matches an 'videos extras' rule with an ExtraRuleType of DirectoryName Currently the ExtraRuleResolver code doesn't know anything about the root folder of the current library. As a result, when we're attempting to add items in a library where the root folder has a name with a match in Emby.Naming.Common.NamingOptions.VideoExtraRules, the entire library is being ignored as a Video Extras folder. Need to pass in the root folder of the current library to compare to the path of the current item being evaluated, and if we match the current item's folder to the root folder, then we ignore the ExtraRules with a type of DirectoryName and we continue to scan deeper in the library. Filters still apply to subfolders within the library itself. * Update CONTRIBUTORS.md * Update Emby.Naming/Video/ExtraRuleResolver.cs * Update ExtraTests.cs Add tests for this fix. Also add missing tests in TestKodiExtras, TestExpandedExtras, and TestSample, and expanded TestDirectories into TestDirectoriesAudioExtras and TestDirectoriesVideoExtras. There were no checks for the theme-music folder name previously. * Update ExtraTests.cs Removed unnecessary "using System" * In MediaBrowser.Model, upgrade System.Text.Json from 8.0.3 (vulnerable - high risk) to 8.0.4 * Update ExtraTests.cs Remove empty lines in usings * Revert "In MediaBrowser.Model, upgrade System.Text.Json from 8.0.3 (vulnerable - high risk) to 8.0.4" Clean Extra Names 2023-03-09T23:44:12Z SenorSmartyPants senorsmartypants@gmail.com 2023-02-26T19:32:46Z urn:sha1:b96420b7865538439c6a96305d70fa4f16dfd591 - Adds regular expression to CleanStrings to remove suffix style extra naming from the name presented in JF. - Override Resolve for Extras to enable parsename - remove exclusion on parsename of extratypes Replace == null with is null 2022-12-05T14:00:20Z Bond_009 bond.009@outlook.com 2022-12-05T14:00:20Z urn:sha1:c7d50d640e614a3c13699e3041fbfcb258861c5a Use dedicated resolvers for extras 2021-12-27T23:37:40Z cvium clausvium@gmail.com 2021-12-27T23:37:40Z urn:sha1:2749509f001505d35863db4b53bb4bc6c3af6fa4 Refactor extras parsing 2021-12-07T14:24:57Z cvium clausvium@gmail.com 2021-12-07T14:18:17Z urn:sha1:fde84a1e00b0c781ce10acc73a9103db51aab67b Change ReadOnlySpan to string following PR 6383 (#6734) 2021-10-26T12:47:34Z Claus Vium cvium@users.noreply.github.com 2021-10-26T12:47:34Z urn:sha1:39d5bdac96b17eb92bd304736cc2728832e1cad0 Move non-jellyfin extensions to separate project 2021-06-19T16:04:46Z Bond_009 bond.009@outlook.com 2021-06-19T16:02:33Z urn:sha1:6f8ccab788e85e025eaa44b67a1487bf419afb53 Remove some unnecessary allocations 2021-05-23T22:30:41Z cvium clausvium@gmail.com 2021-05-23T22:30:41Z urn:sha1:42a2cc1747c7859c63334a7a45792e0af1410e1a Review changes 2021-05-19T06:51:46Z cvium clausvium@gmail.com 2021-05-19T06:51:46Z urn:sha1:1027792b16996e3fe7e4835805204e8c91beda01 Reduce some allocations 2021-05-16T12:49:11Z cvium clausvium@gmail.com 2021-05-16T12:49:11Z urn:sha1:1b49435a0eb18595c84236fb8cf7671263f3c3cf