Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix new iTxt && zTxt segment creation for PNG image XMP && IPTC segments #29475

Merged
merged 8 commits into from
Aug 15, 2020
Merged

Fix new iTxt && zTxt segment creation for PNG image XMP && IPTC segments #29475

merged 8 commits into from
Aug 15, 2020

Conversation

Nazar65
Copy link
Member

@Nazar65 Nazar65 commented Aug 11, 2020 •
edited
Loading

Description (*)

New zTXt && iTXt chunks should be placed before IEND chunk

Related Pull Requests

Fixed Issues (if relevant)

  1. Fixes Some images are shown as broken after added description to it in the Media Gallery  adobe-stock-integration#1743: Some images are shown as broken after added description to it in the Media Gallery

Manual testing scenarios (*)

  1. Go to Content - Media Gallery
  2. Upload png image
  3. Edit uploaded image
  4. Add some description -> Save
  5. Reload the page
  6. Open View Details for this image

Image should display correctly

Questions or comments

Contribution checklist (*)

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All new or changed code is covered with unit/integration tests (if applicable)
  • All automated tests passed successfully (all builds are green)

@m2-assistant
Copy link

m2-assistant bot commented Aug 11, 2020

Hi @Nazar65. Thank you for your contribution
Here is some useful tips how you can test your changes using Magento test environment.
Add the comment under your pull request to deploy test or vanilla Magento instance:

  • @magento give me test instance - deploy test instance based on PR changes
  • @magento give me 2.4-develop instance - deploy vanilla Magento instance

❗ Automated tests can be triggered manually with an appropriate comment:

  • @magento run all tests - run or re-run all required tests against the PR changes
  • @magento run <test-build(s)> - run or re-run specific test build(s)
    For example: @magento run Unit Tests

<test-build(s)> is a comma-separated list of build names. Allowed build names are:

  1. Database Compare
  2. Functional Tests CE
  3. Functional Tests EE,
  4. Functional Tests B2B
  5. Integration Tests
  6. Magento Health Index
  7. Sample Data Tests CE
  8. Sample Data Tests EE
  9. Sample Data Tests B2B
  10. Static Tests
  11. Unit Tests
  12. WebAPI Tests

You can find more information about the builds here

ℹ️ Please run only needed test builds instead of all when developing. Please run all test builds before sending your PR for review.

For more details, please, review the Magento Contributor Guide documentation.

⚠️ According to the Magento Contribution requirements, all Pull Requests must go through the Community Contributions Triage process. Community Contributions Triage is a public meeting.

🕙 You can find the schedule on the Magento Community Calendar page.

📞 The triage of Pull Requests happens in the queue order. If you want to speed up the delivery of your contribution, please join the Community Contributions Triage session to discuss the appropriate ticket.

🎥 You can find the recording of the previous Community Contributions Triage on the Magento Youtube Channel

✏️ Feel free to post questions/proposals/feedback related to the Community Contributions Triage process to the corresponding Slack Channel

@ghost ghost added this to Pending Review in Pull Requests Dashboard Aug 11, 2020
@Nazar65
Copy link
Member Author

Nazar65 commented Aug 11, 2020

@magento run all tests

@Nazar65 Nazar65 changed the title Fix new iTxt segment creation for PNG image XMP segment Fix new iTxt && zTxt segment creation for PNG image XMP segment Aug 11, 2020
@Nazar65 Nazar65 changed the title Fix new iTxt && zTxt segment creation for PNG image XMP segment Fix new iTxt && zTxt segment creation for PNG image XMP && IPTC segments Aug 11, 2020
@Nazar65
Copy link
Member Author

Nazar65 commented Aug 11, 2020

@magento run all tests

@Nazar65
Copy link
Member Author

Nazar65 commented Aug 11, 2020

@magento run all tests

@sivaschenko sivaschenko added Priority: P1 Once P0 defects have been fixed, a defect having this priority is the next candidate for fixing. Severity: S1 Affects critical data or functionality and forces users to employ a workaround. Auto-Tests: Covered All changes in Pull Request is covered by auto-tests labels Aug 12, 2020
sivaschenko
sivaschenko requested changes Aug 12, 2020
View reviewed changes
Copy link
Member

@sivaschenko sivaschenko left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the pull request @Nazar65 ! By any chance, do you have a png image that can be used to verify the fix that can be added to the integration tests dataset?

app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/WriteXmp.php Outdated
*
* @param SegmentInterface[] $segments
* @param SegmentInterface $xmpSegment
* @return SegmentInterface[]
*/
private function insertPngXmpSegment(array $segments, SegmentInterface $xmpSegment): array
{
return array_merge(array_slice($segments, 0, 2), [$xmpSegment], array_slice($segments, 2));
return array_merge(
array_slice($segments, 0, count($segments) - 1),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think extracting the variable $iendSegmentIndex = count($segments) - 1 would not only avoid double count call but also positively affect the code readability

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

@ghost ghost moved this from Pending Review to Changes Requested in Pull Requests Dashboard Aug 12, 2020
@ghost ghost assigned sivaschenko Aug 12, 2020
@Nazar65
Copy link
Member Author

Nazar65 commented Aug 13, 2020

@magento run all tests

@Nazar65
Copy link
Member Author

Nazar65 commented Aug 13, 2020

@magento run all tests

@ghost ghost moved this from Changes Requested to Ready for Testing in Pull Requests Dashboard Aug 13, 2020
@engcom-Lima engcom-Lima moved this from Ready for Testing to Testing in Progress in Pull Requests Dashboard Aug 13, 2020
@engcom-Lima engcom-Lima self-assigned this Aug 13, 2020
@engcom-Lima
Copy link
Contributor

✔️ QA Passed
Checked on images with different extensions. All images are displayed correctly
Screenshot_92

Manual testing scenario

@engcom-Lima engcom-Lima moved this from Testing in Progress to Extended Testing (optional) in Pull Requests Dashboard Aug 13, 2020
@engcom-Lima engcom-Lima added the QA: Added to Regression Scope Scenario was analysed and added to Regression Testing Scope label Aug 13, 2020
@sivaschenko sivaschenko moved this from Extended Testing (optional) to Merge in Progress in Pull Requests Dashboard Aug 14, 2020
magento-engcom-team pushed a commit that referenced this pull request Aug 15, 2020
@slavvka
ENGCOM-8005: Fix new iTxt && zTxt segment creation for PNG image XMP …
76babd3 
…&& IPTC segments #29475
@magento-engcom-team magento-engcom-team merged commit c982412 into magento:2.4-develop Aug 15, 2020
@m2-assistant
Copy link

m2-assistant bot commented Aug 15, 2020

Hi @Nazar65, thank you for your contribution!
Please, complete Contribution Survey, it will take less than a minute.
Your feedback will help us to improve contribution process.

@ghost ghost moved this from Merge in Progress to Recently Merged in Pull Requests Dashboard Aug 15, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sivaschenko sivaschenko sivaschenko approved these changes

Assignees

@sivaschenko sivaschenko

@engcom-Lima engcom-Lima

Labels
Auto-Tests: Covered All changes in Pull Request is covered by auto-tests Component: MediaGalleryMetadata Priority: P1 Once P0 defects have been fixed, a defect having this priority is the next candidate for fixing. Progress: accept Project: ASI QA: Added to Regression Scope Scenario was analysed and added to Regression Testing Scope Release Line: 2.4 Severity: S1 Affects critical data or functionality and forces users to employ a workaround.
Projects
Pull Requests Dashboard
  
Recently Merged
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Some images are shown as broken after added description to it in the Media Gallery
5 participants
@Nazar65 @engcom-Lima @sivaschenko @magento-engcom-team @engcom-Golf