Skip to content

Use CURL for download of images #2323

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

Merged
christianlupus merged 2 commits into from
May 20, 2024
Merged

Use CURL for download of images #2323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4386784
Use CURL for download of images
christianlupus May 20, 2024
72b6e48
Update Changelog
christianlupus May 20, 2024
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
3 changes: 3 additions & 0 deletions .changelog/current/2323-use-curl-for-downloads.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Maintenance

- Use cURL for import of recipe images as well
24 changes: 22 additions & 2 deletions lib/Service/RecipeService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
use OCA\Cookbook\Exception\NoRecipeNameGivenException;
use OCA\Cookbook\Exception\RecipeExistsException;
use OCA\Cookbook\Exception\UserFolderNotWritableException;
use OCA\Cookbook\Helper\DownloadHelper;
use OCA\Cookbook\Helper\FileSystem\RecipeNameHelper;
use OCA\Cookbook\Helper\Filter\JSON\JSONFilter;
use OCA\Cookbook\Helper\ImageService\ImageSize;
Expand Down Expand Up @@ -65,6 +66,9 @@ class RecipeService {
/** @var JSONFilter */
private $jsonFilter;

/** @var DownloadHelper */
private $downloadHelper;

public function __construct(
?string $UserId,
IRootFolder $root,
Expand All @@ -77,7 +81,8 @@ public function __construct(
LoggerInterface $logger,
HtmlDownloadService $downloadService,
RecipeExtractionService $extractionService,
JSONFilter $jsonFilter
JSONFilter $jsonFilter,
DownloadHelper $downloadHelper,
) {
$this->user_id = $UserId;
$this->root = $root;
Expand All @@ -91,6 +96,7 @@ public function __construct(
$this->htmlDownloadService = $downloadService;
$this->recipeExtractionService = $extractionService;
$this->jsonFilter = $jsonFilter;
$this->downloadHelper = $downloadHelper;
}

/**
Expand Down Expand Up @@ -275,7 +281,12 @@ public function addRecipe($json, $importedHtml = null) {
if (strpos($json['image'], 'http') === 0) {
// The image is a URL
$json['image'] = str_replace(' ', '%20', $json['image']);
$full_image_data = file_get_contents($json['image']);
try {
$full_image_data = $this->downloadImage($json['image']);
} catch (Exception $ex) {
$this->logger->warning('Failed to download an image using curl. Falling back to PHP default behavior.');
$full_image_data = file_get_contents($json['image']);
}

} else {
// The image is a local path
Expand Down Expand Up @@ -309,6 +320,15 @@ public function addRecipe($json, $importedHtml = null) {
return $recipe_file;
}

private function downloadImage(string $url) {
$this->downloadHelper->downloadFile($url);
$status = $this->downloadHelper->getStatus();
if($status >= 400) {
throw new Exception($this->il10n->t('Cannot download image using curl'));
}
return $this->downloadHelper->getContent();
}

/**
* Download a recipe from a url and store it in the files
*
Expand Down