Remove Shared_Scanner and add Shared_Watcher instead

diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php
index 189fd20cae38931252bc91f780a786dd82938c4a..d3e05cc62d8c8fb2f0e3190f1de3a13640dc6338 100644 (file)
--- a/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@ -5,7 +5,7 @@ OC::$CLASSPATH['OC_Share_Backend_Folder'] = 'apps/files_sharing/lib/share/folder
 OC::$CLASSPATH['OC\Files\Storage\Shared'] = "apps/files_sharing/lib/sharedstorage.php";
 OC::$CLASSPATH['OC\Files\Cache\Shared_Cache'] = 'apps/files_sharing/lib/cache.php';
 OC::$CLASSPATH['OC\Files\Cache\Shared_Permissions'] = 'apps/files_sharing/lib/permissions.php';
-OC::$CLASSPATH['OC\Files\Cache\Shared_Scanner'] = 'apps/files_sharing/lib/scanner.php';
+OC::$CLASSPATH['OC\Files\Cache\Shared_Watcher'] = 'apps/files_sharing/lib/watcher.php';
 OCP\Util::connectHook('OC_Filesystem', 'setup', '\OC\Files\Storage\Shared', 'setup');
 OCP\Share::registerBackend('file', 'OC_Share_Backend_File');
 OCP\Share::registerBackend('folder', 'OC_Share_Backend_Folder', 'file');

diff --git a/apps/files_sharing/lib/scanner.php b/apps/files_sharing/lib/scanner.php
deleted file mode 100644 (file)
index d13d2f9..0000000
--- a/apps/files_sharing/lib/scanner.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
-* ownCloud
-*
-* @author Michael Gapczynski
-* @copyright 2012 Michael Gapczynski mtgap@owncloud.com
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-namespace OC\Files\Cache;
-
-class Shared_Scanner extends Scanner {
-
-       public function __construct(\OC\Files\Storage\Storage $storage) {
-       
-       }
-
-       /**
-        * get all the metadata of a file or folder
-        * *
-        *
-        * @param string $path
-        * @return array with metadata of the file
-        */
-       public function getData($path) {
-               // Not a valid action for Shared Scanner
-       }
-
-       /**
-        * scan a single file and store it in the cache
-        *
-        * @param string $file
-        * @return array with metadata of the scanned file
-        */
-       public function scanFile($file) {
-               // Not a valid action for Shared Scanner
-       }
-
-       /**
-        * scan all the files in a folder and store them in the cache
-        *
-        * @param string $path
-        * @param SCAN_RECURSIVE/SCAN_SHALLOW $recursive
-        * @return int the size of the scanned folder or -1 if the size is unknown at this stage
-        */
-       public function scan($path, $recursive = self::SCAN_RECURSIVE) {
-               // Not a valid action for Shared Scanner
-       }
-
-       /**
-        * walk over any folders that are not fully scanned yet and scan them
-        */
-       public function backgroundScan() {
-               // Not a valid action for Shared Scanner
-       }
-
-}
\ No newline at end of file

diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index 3a1d7ef101aa473c9d6ccdf1619d113472915948..8504a2d89446fb8345c23116ebb1a931acca23aa 100644 (file)
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -405,14 +405,14 @@ class Shared extends \OC\Files\Storage\Common {
                return new \OC\Files\Cache\Shared_Cache($this);
        }
 
-       public function getScanner(){
-               return new \OC\Files\Cache\Shared_Scanner($this);
-       }
-
        public function getPermissionsCache() {
                return new \OC\Files\Cache\Shared_Permissions($this);
        }
 
+       public function getWatcher() {
+               return new \OC\Files\Cache\Shared_Watcher($this);
+       }
+
        public function getOwner($path) {
                if ($path == '') {
                        return false;