jellyfin/Emby.Server.Implementations/Library/Resolvers/ExtraResolver.cs, branch v12.0-rc1Unnamed repository; edit this file 'description' to name the repository.
https://git.b0n.dev/jellyfin/atom?h=v12.0-rc12025-03-28T00:18:19ZFix for Issue #12142: Fix ExtraRuleResolver filtering out top level folders (#12170)2025-03-28T00:18:19ZMichael McElroy44167199+mcmcelro@users.noreply.github.com2025-03-28T00:18:19Zurn: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 Names2023-03-09T23:44:12ZSenorSmartyPantssenorsmartypants@gmail.com2023-02-26T19:32:46Zurn: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 extratypesInject IDirectoryService where needed instead of passing it through ItemResolveArgs2023-03-07T04:00:55ZJoe Rogers1337joe@gmail.com2023-03-07T04:00:55Zurn:sha1:1c3a97bf6adadf4e3b22177e1e965691637d0426Replace == null with is null2022-12-05T14:00:20ZBond_009bond.009@outlook.com2022-12-05T14:00:20Zurn:sha1:c7d50d640e614a3c13699e3041fbfcb258861c5aFix #7100 by catching the exception on opening invalid UDF images2022-02-20T13:30:55ZStanislav Ionascustanislav.ionascu@gmail.com2022-01-04T21:52:52Zurn:sha1:554d1b2ca8868e7aeb1fa9acac75cb8ce423796a
When an invalid UDF image is opened by the UdfReader, it may throw
and exception. This change is to catch and log the exception.
Fix SA1642 warning2022-01-15T12:33:54ZDmitry Lyzoashephard0@gmail.com2022-01-15T12:32:04Zurn:sha1:ea1f3fe6bdfae0384afd56eb1bfdc9b8d1c7c340Use dedicated resolvers for extras2021-12-27T23:37:40Zcviumclausvium@gmail.com2021-12-27T23:37:40Zurn:sha1:2749509f001505d35863db4b53bb4bc6c3af6fa4