Skip to content

Unify download implementation of MultiCurl::addDownload with Curl::download #604

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
merged 1 commit into from
Oct 14, 2019
Merged

Unify download implementation of MultiCurl::addDownload with Curl::download #604

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion src/Curl/Curl.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class Curl
public $errorCallback = null;
public $completeCallback = null;
public $fileHandle = null;
private $downloadFileName = null;
public $downloadFileName = null;

public $attempts = 0;
public $retries = 0;
Expand Down
28 changes: 23 additions & 5 deletions src/Curl/MultiCurl.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,15 +85,33 @@ public function addDownload($url, $mixed_filename)

// Use tmpfile() or php://temp to avoid "Too many open files" error.
if (is_callable($mixed_filename)) {
$callback = $mixed_filename;
$curl->downloadCompleteCallback = $callback;
$curl->downloadCompleteCallback = $mixed_filename;
$curl->downloadFileName = null;
$curl->fileHandle = tmpfile();
} else {
$filename = $mixed_filename;
$curl->downloadCompleteCallback = function ($instance, $fh) use ($filename) {
file_put_contents($filename, stream_get_contents($fh));
};

// Use a temporary file when downloading. Not using a temporary file can cause an error when an existing
// file has already fully completed downloading and a new download is started with the same destination save
// path. The download request will include header "Range: bytes=$filesize-" which is syntactically valid,
// but unsatisfiable.
$download_filename = $filename . '.pccdownload';

$mode = 'wb';
// Attempt to resume download only when a temporary download file exists and is not empty.
if (is_file($download_filename) && $filesize = filesize($download_filename)) {
$mode = 'ab';
$first_byte_position = $filesize;
$range = $first_byte_position . '-';
$curl->setOpt(CURLOPT_RANGE, $range);
}
$curl->downloadFileName = $download_filename;
$curl->fileHandle = fopen('php://temp', 'wb');

// Move the downloaded temporary file to the destination save path.
$curl->downloadCompleteCallback = function ($instance, $fh) use ($download_filename) {
file_put_contents($download_filename, stream_get_contents($fh));
};
}

$curl->setOpt(CURLOPT_FILE, $curl->fileHandle);
Expand Down