Rendering duplicate images when the original images have the same name but different extension

I merged #5 and some cleaned up code from 📌 Review webp filename logic Closed: duplicate into a MR.
I don't know if this could be shipped in this major release or if it would be considered as a BC breaker. Maintainers will choose.

The merge request works perfectly for me.

NOTE: Applying the #5 .patch fall into a performance issue. The .webp file is generated on each request due the stored file only has the .webp extension and not both .original.webp

Thanks, the merge request changes in https://git.drupalcode.org/project/webp/-/merge_requests/30 solved it for us as well for multiple images with the same name, but different extensions, naming the images like image1.png.webp and image1.jpg.webp keeping them unique.

xavier.masson → made their first commit to this issue’s fork.

xavier.masson → changed the visibility of the branch 3281606-rendering-duplicate-images-and-dont-create-derivative to hidden.

xavier.masson → changed the visibility of the branch 3281606-rendering-duplicate-images-and-dont-create-derivative to active.

this fixed it for me

Using the MR33 I got a warning when the image is first uploaded:
Undefined variable $webp_wanted in Drupal\webp\Controller\ImageStyleDownloadController->deliver() (line 192 of modules/contrib/webp/src/Controller/ImageStyleDownloadController.php

I think it would be better to break out the "if" statement just a little. Since I'm faster with patch files at the moment, I've provided one with an interdiff.

Moving this back to NR for the latest patch. Does anyone have feedback on the performance concern raised in #10?

The performance concern raised in #10 was about the patch in #5, which only changed the urls inside the srcset without also adapting the logic in ImageStyleDownloadController, so I don't see how that would still be an issue with the current patch.

We replicated the problem in one of our sites. A QA analyst verified the patch of Merge request 33 fixes the problem. I reviewed the code and looks good, concerns in #17 are addressed by #19 and #20.

The patch also needs to include a change to the webp_flush_webp_derivatives function in webp.module, which was introduced by https://www.drupal.org/project/webp/issues/3153137 🐛 Using Image Widget Crop in responsive images does not refresh webp image Fixed .

Currently, the derivative webp uri is generated like this: $derivative_webp_uri = preg_replace('/\.(png|jpg|jpeg)$/i', '.webp', $derivative_uri);

This corresponds to the code $destination = $this->getWebpDestination($uri, '@directory@filename.webp');

Because this patch changes the above to $destination = $this->getWebpDestination($uri, '@directory@filename.@extension.webp');, it also needs to change there.

Changing it to this makes it consistent again:

$derivative_webp_uri = \Drupal::service('webp.webp')->getWebpDestination($derivative_uri, '@directory@filename.@extension.webp');

I've updated the image style derivative flush.