Allow absolute path mismatch when getting virtual folder info #11520
+8
−2
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
We have historically required the path stored in the database to exactly match the actual path on the filesystem to retrieve virtual folder information, dating back to the Emby era. However, this approach can cause issues when symbolic links are involved, as the link path may differ from the actual pointed path. To address this, allow matching based solely on the folder name when absolute path checking fails, mitigating such problems. Signed-off-by: gnattu <gnattuoc@me.com>
Shadowghost
approved these changes
May 11, 2024
TimGels
reviewed
May 14, 2024
| @@ -1184,6 +1184,12 @@ private VirtualFolderInfo GetVirtualFolderInfo(string dir, List<BaseItem> allCol | |||
| }; | |||
|
|
|||
| var libraryFolder = allCollectionFolders.FirstOrDefault(i => string.Equals(i.Path, dir, StringComparison.OrdinalIgnoreCase)); | |||
| if (libraryFolder is null && allowAbsolutePathMismatch) | |||
| { | |||
| _logger.LogWarning("Absolute path does not match any virtual folder, guessing from folder name"); | |||
There was a problem hiding this comment.
Does it show somewhere in the log which path this is warning about?
|
This pull request has merge conflicts. Please resolve the conflicts so the PR can be successfully reviewed and merged. |
jellyfin-bot
added
merge conflict
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We have historically required the path stored in the database to exactly match the actual path on the filesystem to retrieve virtual folder information, dating back to the Emby era. However, this approach can cause issues when symbolic links are involved, as the link path may differ from the actual pointed path. To address this, allow matching based solely on the folder name when absolute path checking fails, mitigating such problems.
I have no idea why this works previously for 10.8 as @joshuaboniface said. The mismatching path should never worked as the code is from emby.
Changes
GetVirtualFoldersIssues
Fixes jellyfin/jellyfin-web#4945 Although I don't understand why it worked for 10.8