summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2016-01-18 14:16:19 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2016-01-18 14:16:19 +0100
commita32f8aa87a959bf0050cbd7f710a690427f5a1f2 (patch)
treef1cf0acbba3325fb4f02a3f29ca2877f7c921831
parent57d9e2b2b78354384c45b62573fb7ddf597fdbd3 (diff)
parentd608c37c90c308d0518d854de908ec4be5f462dc (diff)
downloadnextcloud-server-a32f8aa87a959bf0050cbd7f710a690427f5a1f2.tar.gz
nextcloud-server-a32f8aa87a959bf0050cbd7f710a690427f5a1f2.zip
Merge pull request #21732 from owncloud/gdrive-stream-download
Use Guzzle stream to download files from GDrive
-rw-r--r--apps/files_external/lib/google.php22
1 files changed, 16 insertions, 6 deletions
diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php
index 72ebd4e821d..8a9ffaf7d37 100644
--- a/apps/files_external/lib/google.php
+++ b/apps/files_external/lib/google.php
@@ -426,13 +426,23 @@ class Google extends \OC\Files\Storage\Common {
}
if (isset($downloadUrl)) {
$request = new \Google_Http_Request($downloadUrl, 'GET', null, null);
- $httpRequest = $this->client->getAuth()->authenticatedRequest($request);
- if ($httpRequest->getResponseHttpCode() == 200) {
- $tmpFile = \OCP\Files::tmpFile($ext);
- $data = $httpRequest->getResponseBody();
- file_put_contents($tmpFile, $data);
- return fopen($tmpFile, $mode);
+ $httpRequest = $this->client->getAuth()->sign($request);
+ // the library's service doesn't support streaming, so we use Guzzle instead
+ $client = \OC::$server->getHTTPClientService()->newClient();
+ try {
+ $response = $client->get($downloadUrl, [
+ 'headers' => $httpRequest->getRequestHeaders(),
+ 'stream' => true
+ ]);
+ } catch (RequestException $e) {
+ if ($e->getResponse()->getStatusCode() === 404) {
+ return false;
+ } else {
+ throw $e;
+ }
}
+
+ return $response->getBody();
}
}
return false;