handle noopscanner in shared scanner

diff --git a/apps/files_sharing/lib/scanner.php b/apps/files_sharing/lib/scanner.php
index bd6a28a49348980971ca9d65cac5032fa0d34b2d..e9cc40ae42c0833fbc4480b812d4b1cb7d363421 100644 (file)
--- a/apps/files_sharing/lib/scanner.php
+++ b/apps/files_sharing/lib/scanner.php
@@ -22,10 +22,14 @@
 
 namespace OC\Files\Cache;
 
+use OC\Files\ObjectStore\NoopScanner;
+use OC\Files\Storage\Shared;
+
 /**
  * Scanner for SharedStorage
  */
 class SharedScanner extends Scanner {
+       private $sourceScanner;
 
        /**
         * Returns metadata from the shared storage, but
@@ -35,12 +39,35 @@ class SharedScanner extends Scanner {
         *
         * @return array an array of metadata of the file
         */
-       protected function getData($path){
+       public function getData($path) {
                $data = parent::getData($path);
                $sourcePath = $this->storage->getSourcePath($path);
                list($sourceStorage, $internalPath) = \OC\Files\Filesystem::resolvePath($sourcePath);
                $data['permissions'] = $sourceStorage->getPermissions($internalPath);
                return $data;
        }
+
+       private function getSourceScanner() {
+               if ($this->sourceScanner) {
+                       return $this->sourceScanner;
+               }
+               if ($this->storage->instanceOfStorage('\OC\Files\Storage\Shared')) {
+                       /** @var \OC\Files\Storage\Storage $storage */
+                       list($storage) = $this->storage->resolvePath('');
+                       $this->sourceScanner = $storage->getScanner();
+                       return $this->sourceScanner;
+               } else {
+                       return null;
+               }
+       }
+
+       public function scanFile($file, $reuseExisting = 0, $parentId = -1, $cacheData = null, $lock = true) {
+               $sourceScanner = $this->getSourceScanner();
+               if ($sourceScanner instanceof NoopScanner) {
+                       return [];
+               } else {
+                       return parent::scanFile($file, $reuseExisting, $parentId, $cacheData, $lock);
+               }
+       }
 }
 

diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index 697856e1de508af0853056e18a8a71a0b91e38a3..542d0e9e48c644d980d0d4b93fff159507d6feda 100644 (file)
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -609,7 +609,7 @@ class Shared extends \OC\Files\Storage\Common implements ISharedStorage {
         * @param string $path
         * @return array
         */
-       private function resolvePath($path) {
+       public function resolvePath($path) {
                $source = $this->getSourcePath($path);
                return \OC\Files\Filesystem::resolvePath($source);
        }