B2B-1610: Upgrade to Flysystem 2.0

- fixed caching and metadata retrieval

Author: Roman Hanin

app/code/Magento/AwsS3/Driver/AwsS3.php

@@ -445,28 +445,22 @@ public function isDirectory($path): bool
 
         $path = $this->normalizeRelativePath($path, true);
 
-        try {
-            return $this->isTypeDirectory($path);
-        } catch (UnableToRetrieveMetadata $e) {
-            try {
-                return iterator_count($this->adapter->listContents($path, false)) > 0;
-            } catch (\Throwable $e) {
-                // catch closed iterator
-                return false;
-            }
-        }
+        return $this->isTypeDirectory($path);
     }
 
     /**
      * Check is given path a directory in metadata.
      *
      * @param string $path
      * @return bool
-     * @throws UnableToRetrieveMetadata
      */
     private function isTypeDirectory($path)
     {
-        $meta = $this->metadataProvider->getMetadata($path);
+        try {
+            $meta = $this->metadataProvider->getMetadata($path);
+        } catch (UnableToRetrieveMetadata $e) {
+            return false;
+        }
         if (isset($meta['type']) && $meta['type'] === self::TYPE_DIR) {
             return true;
         }

app/code/Magento/RemoteStorage/Driver/Adapter/Cache/Generic.php

@@ -188,9 +188,18 @@ public function getMetadata(string $path): ?array
     {
         if (isset($this->cacheData[$path]['type'])) {
             return $this->cacheData[$path];
+        } else {
+            $meta = $this->cacheAdapter->load($this->prefix . $path);
+            if (!$meta) {
+                return null;
+            }
+            $meta = $this->serializer->unserialize($meta);
+            if (!$meta[$path]) {
+                return null;
+            }
+            $this->cacheData[$path] = $meta[$path];
+            return $this->cacheData[$path];
         }
-
-        return null;
     }
 
     /**

app/code/Magento/RemoteStorage/Driver/Adapter/MetadataProvider.php

@@ -41,6 +41,22 @@ public function __construct(
         $this->cache = $cache;
     }
 
+    /**
+     * Check is the given path an existing directory.
+     *
+     * @param string $path
+     * @return bool
+     */
+    private function isDirectory($path): bool
+    {
+        try {
+            return iterator_count($this->adapter->listContents($path, false)) > 0;
+        } catch (\Throwable $e) {
+            // catch closed iterator
+            return false;
+        }
+    }
+
     /**
      * @inheritdoc
      */
@@ -54,6 +70,27 @@ public function getMetadata(string $path): array
         }
         try {
             $meta = $this->adapter->lastModified($path);
+        } catch (UnableToRetrieveMetadata $e) {
+            if ($this->isDirectory($path)) {
+                $data = [
+                    'path' => $path,
+                    'type' => 'dir',
+                    'size' => null,
+                    'timestamp' => null,
+                    'visibility' => null,
+                    'mimetype' => null,
+                    'dirname' => dirname($path),
+                    'basename' => basename($path),
+                ];
+                $this->cache->updateMetadata($path, $data, true);
+                return $data;
+            } else {
+                throw new UnableToRetrieveMetadata(
+                    "Unable to retrieve metadata for file at location: {$path}. {$e->getMessage()}",
+                    0,
+                    $e
+                );
+            }
         } catch (\InvalidArgumentException | FilesystemException $e) {
             throw new UnableToRetrieveMetadata(
                 "Unable to retrieve metadata for file at location: {$path}. {$e->getMessage()}",