Fix ODF loading through symlinked OrganDefinitions on macOS - #31
Merged
bonninr merged 2 commits intoSep 23, 2026
Merged
Conversation
Native macOS file selection resolves paths through a symlinked OrganDefinitions directory before returning the selected ODF. Restore the logical ODF path through known Hauptwerk library roots before deriving the organ root. This preserves the relationship between OrganDefinitions and OrganInstallationPackages and also ensures that the logical path is stored as the last opened organ. Add regression coverage for a resolved ODF path underneath a symlinked OrganDefinitions directory.
Owner
|
Thank you for this, and for the detailed reports behind it. I will review it alongside the other work on the project. |
Contributor
Author
|
I tried to find a fix because v0.5.4 still did not work. Same issue as before: OrganInstallationPackage could be moved and symlinked, OrganDefinitions not. |
The root is now derived after the logical path is restored, so the comment explaining deriveOrganRoot moves down to that line, and the restoration gets a comment of its own. Wrapping follows the rest of the file. No change in behaviour.
This file contains hidden or 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
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.
Fixes #12.
On macOS, selecting an ODF through the native file chooser can return the resolved physical path when OrganDefinitions is a symlink. This loses the logical relationship to the sibling OrganInstallationPackages directory.
This change restores the logical ODF path through known Hauptwerk library roots before deriving the organ root. The reconstructed path is then used for loading, settings, cache identity, and lastorgan.
The issue was reproduced with:
Regression coverage was added to functional.loader.symlinked-organ for the resolved-path case.
Test status: