Merge pull request #5 from sd-milani/master

Support shared drives and orderBy, fix deprecation warning
vatri · May 22, 2020 · 4e84427 · 4e84427
2 parents fe3718c + a8a116a
commit 4e84427
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/src/Resources/config/vatri_google_drive.yaml b/src/Resources/config/vatri_google_drive.yaml
@@ -22,6 +22,8 @@ services:
 
   Vatri\GoogleDriveBundle\Controller\VatriGoogleDriveAuthController:
     public: true
+    autowire: true
+    autoconfigure: true
     arguments:
       $parameterBag: '@parameter_bag'
       $session: '@session'

diff --git a/src/Service/DriveApiService.php b/src/Service/DriveApiService.php
@@ -158,7 +158,8 @@ public function createFolder($path, $parentId = null): DriveServiceResponse
                 $fileMetadata = new \Google_Service_Drive_DriveFile($fileParams);
 
                 $res = $drive->files->create($fileMetadata, [
-                    'fields' => 'id'
+                    'fields' => 'id',
+                    'supportsAllDrives' => true
                 ]);
 
                 $response->setResourceId($res->id);
@@ -184,7 +185,8 @@ public function folderExists(?string $folderId, bool $inTrash = true): bool
         $res = null;
         try {
             $res = $drive->files->get($folderId, [
-                'fields' => 'id,trashed'
+                'fields' => 'id,trashed',
+                'supportsAllDrives' => true
             ]);
 
             if ($res->trashed) {
@@ -212,7 +214,7 @@ public function deleteFile(string $fileId): bool
         $drive = $this->buildDrive();
 
         try {
-            $res = $drive->files->delete($fileId);
+            $res = $drive->files->delete($fileId, ['supportsAllDrives' => true]);
         } catch (\Exception $e) {
             return false;
         }
@@ -237,7 +239,7 @@ public function renameResource(string $fileId, string $newName)
 
         try{
 
-            $drive->files->update($fileId, $fileMetadata);
+            $drive->files->update($fileId, $fileMetadata, ['supportsAllDrives' => true]);
             return true;
 
         } catch (\Exception $e){
@@ -252,7 +254,7 @@ public function renameResource(string $fileId, string $newName)
      *
      * @return \Google_Service_Drive_FileList|null
      */
-    public function listFiles(?string $parentId = '', ?bool $includeTrashed = true, ?bool $onlyStarred = false): ?\Google_Service_Drive_FileList
+    public function listFiles(?string $parentId = '', ?bool $includeTrashed = true, ?bool $onlyStarred = false, $orderBy = 'folder,name'): ?\Google_Service_Drive_FileList
     {
         $drive = $this->getDrive();
 
@@ -272,6 +274,9 @@ public function listFiles(?string $parentId = '', ?bool $includeTrashed = true,
         $res = $drive->files->listFiles([
             'q' => $q,
             'fields' => "files/*",
+            'supportsAllDrives' => true,
+            'includeItemsFromAllDrives' => true,
+            'orderBy' => $orderBy
         ]);
 
         return $res;
@@ -296,7 +301,7 @@ public function copyFile(string $fileId, ?string $parentId = null): DriveService
         }
 
         try {
-            $res = $drive->files->copy($fileId, $driveFile);
+            $res = $drive->files->copy($fileId, $driveFile, ['supportsAllDrives' => true]);
             $response->setResourceId($res->getId());
         } catch (\Exception $e) {
             $response->setError($e->getMessage());
@@ -316,7 +321,8 @@ public function find(string $name, string $parentId = ''): ?Google_Service_Drive
             $q .= " and parents in '$parentId' ";
         }
         $res = $this->generateDrive()->files->listFiles([
-            'q' => $q
+            'q' => $q,
+            'supportsAllDrives' => true
         ]);
 
         return $res;
@@ -345,7 +351,8 @@ public function uploadFile(UploadedFile $file, $parentId = null): DriveServiceRe
                     'data' => file_get_contents($file->getPathname()),
                     'mimeType' => $file->getClientMimeType(),
                     'uploadType' => 'multipart',
-                    // 'parents'   => $parentId == null ? [] : [$parentId]
+                    // 'parents'   => $parentId == null ? [] : [$parentId],
+                    'supportsAllDrives' => true
                 )
             );
 
@@ -370,7 +377,7 @@ public function setStarred(string $fileId, bool $starred): DriveServiceResponse
         $file = new Google_Service_Drive_DriveFile();
         $file->setStarred($starred);
         try {
-            $res = $drive = $this->getDrive()->files->update($fileId, $file);
+            $res = $drive = $this->getDrive()->files->update($fileId, $file, ['supportsAllDrives' => true]);
             $response->setResourceId($res->getId());
         } catch (\Exception $e) {
             $response->setError($e->getMessage());