mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #23516 from owncloud/dropbox-stream-download 

Dropbox stream download with RetryWrapper
This commit is contained in:
Thomas Müller 2016-03-31 20:07:36 +02:00
parent ba8c81e6d1 02c2568442
commit dea3985e86
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/files_external/lib/dropbox.php
View File

@ -29,7 +29,9 @@
namespace OC\Files\Storage;
use GuzzleHttp\Exception\RequestException;
use Icewind\Streams\IteratorDirectory;
use Icewind\Streams\RetryWrapper;
require_once __DIR__ . '/../3rdparty/Dropbox/autoload.php';
@ -257,10 +259,9 @@ class Dropbox extends \OC\Files\Storage\Common {
$client = \OC::$server->getHTTPClientService()->newClient();
try {
$tmpFile = \OC::$server->getTempManager()->getTemporaryFile();
$client->get($downloadUrl, [
$response = $client->get($downloadUrl, [
'headers' => $headers,
'save_to' => $tmpFile,
'stream' => true,
]);
} catch (RequestException $e) {
if (!is_null($e->getResponse())) {
@ -274,7 +275,8 @@ class Dropbox extends \OC\Files\Storage\Common {
}
}
return fopen($tmpFile, 'r');
$handle = $response->getBody();
return RetryWrapper::wrap($handle);
} catch (\Exception $exception) {
\OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
return false;