Merge pull request #74 from erikn69/fix_single_tr

[1.x] Fix df20593 bug
masbug · Jun 24, 2022 · c42a6ed · c42a6ed
2 parents a27708b + 8afb3ff
commit c42a6ed
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/src/GoogleDriveAdapter.php b/src/GoogleDriveAdapter.php
@@ -71,6 +71,7 @@ class GoogleDriveAdapter extends AbstractAdapter
         'useHasDir'         => false,
         'useDisplayPaths'   => true,
         'usePermanentDelete'   => false,
+        'useSinglePathTransaction' => false,
         'publishPermission' => [
             'type'     => 'anyone',
             'role'     => 'reader',
@@ -160,6 +161,14 @@ class GoogleDriveAdapter extends AbstractAdapter
      */
     private $usePermanentDelete = false;
 
+    /**
+     * When only needs to upload/download single file, is quick and
+     * avoid 'Timeout/Allowed memory exhausted' when too many files
+     *
+     * @var bool
+     */
+    private $useSinglePathTransaction = false;
+
     /**
      * Options array
      *
@@ -216,6 +225,7 @@ public function __construct($service, $root = null, $options = [])
         $this->spaces = $this->options['spaces'];
         $this->useHasDir = $this->options['useHasDir'];
         $this->usePermanentDelete = $this->options['usePermanentDelete'];
+        $this->useSinglePathTransaction = $this->options['useSinglePathTransaction'];
         $this->publishPermission = $this->options['publishPermission'];
         $this->useDisplayPaths = $this->options['useDisplayPaths'];
         $this->optParams = $this->cleanOptParameters($this->options['parameters']);
@@ -496,7 +506,7 @@ public function copy($path, $newpath)
             if (isset($this->cacheHasDirs[$srcId])) {
                 $this->cacheHasDirs[$id] = $this->cacheHasDirs[$srcId];
             }
-            if ($this->useDisplayPaths) {
+            if ($this->useSinglePathTransaction && $this->useDisplayPaths) {
                 $this->cachedPaths[trim($newpathDir.'/'.$fileName, '/')] = $id;
             }
 
@@ -1435,7 +1445,7 @@ protected function upload($path, $contents, Config $config, $updating = null)
             $this->cacheFileObjects[$obj->getId()] = $obj;
             $this->cacheObjects([$obj->getId() => $obj]);
             $result = $this->normaliseObject($obj, self::dirname($path));
-            if ($this->useDisplayPaths) {
+            if ($this->useSinglePathTransaction && $this->useDisplayPaths) {
                 $this->cachedPaths[$result['display_path']] = $obj->getId();
             }
 
@@ -1782,7 +1792,9 @@ protected function cachePaths($displayPath, $i, $indices, $parentItemId)
                 }
 
                 $query = $is_last ? [] : ['mimeType = "'.self::DIRMIME.'"'];
-                $query[] = "name = '{$token}'";
+                if ($this->useSinglePathTransaction) {
+                    $query[] = "name = '{$token}'";
+                }
                 $items[] = $this->getItems($id, false, 0, implode(' and ', $query));
                 if (DEBUG_ME) {
                     echo " ...done\n";