Dropbox stream download with RetryWrapper

owncloud · Mar 23, 2016 · 02c2568 · 02c2568
1 parent ea07a42
commit 02c2568
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php
@@ -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 @@ public function fopen($path, $mode) {
 
 					$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 @@ public function fopen($path, $mode) {
 						}
 					}
 
-					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;