Remove Shared_Scanner and add Shared_Watcher instead

This commit is contained in:
Michael Gapczynski 2013-01-01 12:43:38 -05:00
parent f4e4a06826
commit 3b67613afc
3 changed files with 5 additions and 74 deletions

View File

@ -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\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_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_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\Util::connectHook('OC_Filesystem', 'setup', '\OC\Files\Storage\Shared', 'setup');
OCP\Share::registerBackend('file', 'OC_Share_Backend_File'); OCP\Share::registerBackend('file', 'OC_Share_Backend_File');
OCP\Share::registerBackend('folder', 'OC_Share_Backend_Folder', 'file'); OCP\Share::registerBackend('folder', 'OC_Share_Backend_Folder', 'file');

View File

@ -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
}
}

View File

@ -405,14 +405,14 @@ class Shared extends \OC\Files\Storage\Common {
return new \OC\Files\Cache\Shared_Cache($this); return new \OC\Files\Cache\Shared_Cache($this);
} }
public function getScanner(){
return new \OC\Files\Cache\Shared_Scanner($this);
}
public function getPermissionsCache() { public function getPermissionsCache() {
return new \OC\Files\Cache\Shared_Permissions($this); return new \OC\Files\Cache\Shared_Permissions($this);
} }
public function getWatcher() {
return new \OC\Files\Cache\Shared_Watcher($this);
}
public function getOwner($path) { public function getOwner($path) {
if ($path == '') { if ($path == '') {
return false; return false;