Skip to content

fix(import): replace external image URL with local path after download #3140

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

Open
bigsearcher wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −0
Open

fix(import): replace external image URL with local path after download #3140

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions lib/Service/RecipeService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,17 @@
// If image data was fetched, write it to disk
if ($full_image_data) {
$this->imageService->setImageData($recipe_folder, $full_image_data);

// Replace external URL in JSON with the user-relative path to the local copy.
// Avoids leaking the source URL on edit and prevents re-downloading on the next
// save (the image_changed check on line above compares this field). The frontend
// renders `imageUrl` (an API route), not this field, so any stable non-URL value
// is safe.
if (isset($json['image']) && strpos($json['image'], 'http') === 0) {
$userFilesRoot = '/' . $this->user_id . '/files';
$json['image'] = substr($recipe_folder->getPath(), strlen($userFilesRoot)) . '/full.jpg';
$recipe_file->putContent(json_encode($json));
}
}

// Write .nomedia file to avoid gallery indexing
Expand Down Expand Up @@ -607,7 +618,7 @@

$recipe_folder = $recipe_folders[0];

// TODO: Check that file is really an image

Check warning on line 621 in lib/Service/RecipeService.php

View workflow job for this annotation

GitHub Actions / Check for added todo messages 

Found TODO: Check that file is really an image
switch ($size) {
case 'full':
return $this->imageService->getImageAsFile($recipe_folder);
Expand Down
Loading