Repository navigation
Pair same-stem edited JPEG+DNG twins - #23
Merged
Merged
Conversation
Remove the edited-stem blanket exclusion from JPEG↔DNG pairing helpers. Same-stem matching already prevents shot-edited.jpg from attaching to shot.DNG; it now allows shot-edited.jpg + shot-edited.DNG to index as one Photo with raw_relpath set. Closes #22 Co-authored-by: Maurice Wipf <mauricewipf@users.noreply.github.com>
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
2 participants
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.
Closes #22
Small follow-up to #4 / PR #21: edited sidecar stems were excluded from JPEG↔DNG pairing entirely, which also blocked valid same-stem edited twins.
Problem
After #4,
shot-edited.jpgcorrectly does not pair withshot.DNG. Butshot-edited.jpg+shot-edited.DNGalso failed to pair, leaving the edited DNG as its own grid cell.Fix
Remove the
is_edited_sidecar_stemguard fromis_jpeg_dng_stillandjpeg_dng_still_for_raw. Same-stem matching already prevents cross-stem pairing with the original DNG.Behavior
shot-edited.jpg+shot.DNGshot-edited.jpg+shot-edited.DNGraw_relpathsetshot-edited.DNGshot.jpg+shot.DNGTests
media: edited twins pair; edited JPEG does not attach original DNG; lone edited DNG is not a companionindex: integration tests for all three edited-sidecar scenarios abovecargo test --lockedpasses (169 unit + integration tests).