chore: Improve manifest comparison #1234
Merged
Conversation
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
…ison - Enhanced assertion array comparison to report reordering, additions, and removals separately - Added action array comparison for c2pa.actions assertions with same logic - Simplified identifier matching to use only 'label' field for assertions and 'action' field for actions - Both assertion and action comparisons now report: * 'Assertion/Action order changed' when items are reordered * 'Assertion/Action added/removed' when items are added or removed * Individual content changes within matched items - Improved path matching to properly detect actions arrays within assertions - Maintains detailed content comparison for matched items even when reordered
- Fixed duplicate val2.is_null() condition in compare_json_values - Ensured proper detection of content changes within matched assertions/actions - Hash values and other ignorable fields are properly ignored during comparison - Content changes in non-ignorable fields are correctly detected and reported
Update baseline v1
Update known good v2 baseline
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #1234 +/- ##
==========================================
+ Coverage 79.26% 79.28% +0.01%
==========================================
Files 148 148
Lines 41534 41487 -47
==========================================
- Hits 32923 32892 -31
+ Misses 8611 8595 -16 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
fix managing of data_boxes and resources. remove is_v2 guesses, just generate v2. Move toward forcing softwareAgent to always generate a struct. Modifies manifest.find_assertion_with_instance() to use starts_with on labels.
ok-nick
reviewed
Jul 15, 2025
…entauth/c2pa-rs into improve-manifest-comparison
Also update assets for actions.v2
manifest.find_assertion() will now also match .vxx extensions. updates known_good tests revered nonempty-collections to 0.3.1 due to 2024 dependencies.
ok-nick
approved these changes
Jul 16, 2025
ok-nick
pushed a commit
that referenced
this pull request
Aug 11, 2025
* Improve manifest comparison: better assertion and action array comparison - Enhanced assertion array comparison to report reordering, additions, and removals separately - Added action array comparison for c2pa.actions assertions with same logic - Simplified identifier matching to use only 'label' field for assertions and 'action' field for actions - Both assertion and action comparisons now report: * 'Assertion/Action order changed' when items are reordered * 'Assertion/Action added/removed' when items are added or removed * Individual content changes within matched items - Improved path matching to properly detect actions arrays within assertions - Maintains detailed content comparison for matched items even when reordered * Fix null comparison logic in manifest comparison - Fixed duplicate val2.is_null() condition in compare_json_values - Ensured proper detection of content changes within matched assertions/actions - Hash values and other ignorable fields are properly ignored during comparison - Content changes in non-ignorable fields are correctly detected and reported * fix: Enhance manifest comparison, Update baseline v1 * chore: save v1 json results separately * chore: change make_test_images default to v2 claims Update known good v2 baseline * chore: catch changes in remainder of jumbf urls * chore: clean up clippy errors * feat: Always generate V2 Actions. V1 actions have long been deprecated. fix managing of data_boxes and resources. remove is_v2 guesses, just generate v2. Move toward forcing softwareAgent to always generate a struct. Modifies manifest.find_assertion_with_instance() to use starts_with on labels. * feat: add labels:set_version() to help with managing label versions. * chore: review feedback Also update assets for actions.v2 * chore: repair doc tests manifest.find_assertion() will now also match .vxx extensions. updates known_good tests revered nonempty-collections to 0.3.1 due to 2024 dependencies.
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.
The make_test_images manifest comparison ignores things like version changes so that
it can report no unexpected changes
Make_test_images has been updated to generate v2 images by default now.
The v1 and v2 known good json folders have been updated after validating the updates.