wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #23517 from owncloud/gdrive-stream-download

Browse source 
GDrive stream download with RetryWrapper
This commit is contained in:
Frank Karlitschek 2016-03-31 21:17:10 +02:00
commit 6d40e69e29
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/files_external/lib/google.php
View file

@ -35,6 +35,7 @@ namespace OC\Files\Storage;
use GuzzleHttp\Exception\RequestException;
use Icewind\Streams\IteratorDirectory;
use Icewind\Streams\RetryWrapper;
set_include_path(get_include_path().PATH_SEPARATOR.
\OC_App::getAppPath('files_external').'/3rdparty/google-api-php-client/src');
@ -441,10 +442,9 @@ class Google extends \OC\Files\Storage\Common {
// the library's service doesn't support streaming, so we use Guzzle instead
$client = \OC::$server->getHTTPClientService()->newClient();
try {
$tmpFile = \OC::$server->getTempManager()->getTemporaryFile($ext);
$client->get($downloadUrl, [
$response = $client->get($downloadUrl, [
'headers' => $httpRequest->getRequestHeaders(),
'save_to' => $tmpFile,
'stream' => true,
'verify' => __DIR__ . '/../3rdparty/google-api-php-client/src/Google/IO/cacerts.pem',
]);
} catch (RequestException $e) {
@ -459,7 +459,8 @@ class Google extends \OC\Files\Storage\Common {
}
}
return fopen($tmpFile, 'r');
$handle = $response->getBody();
return RetryWrapper::wrap($handle);
}
}
return false;