Cleanup Files_Sharing CLASSPATH
* OC\Files\Cache\SharedScanner * OC\Files\Cache\Shared_Cache * OC\Files\Cache\Shared_Permissions * OC\Files\Cache\Shared_Updater * OC\Files\Cache\Shared_Watcher * OCA\Files\Share\Maintainer * OCA\Files\Share\Proxy
This commit is contained in:
parent
fd844f3eb3
commit
354329acf2
|
@ -33,13 +33,6 @@ $l = \OC::$server->getL10N('files_sharing');
|
||||||
\OC::$CLASSPATH['OC_Share_Backend_File'] = 'files_sharing/lib/share/file.php';
|
\OC::$CLASSPATH['OC_Share_Backend_File'] = 'files_sharing/lib/share/file.php';
|
||||||
\OC::$CLASSPATH['OC_Share_Backend_Folder'] = 'files_sharing/lib/share/folder.php';
|
\OC::$CLASSPATH['OC_Share_Backend_Folder'] = 'files_sharing/lib/share/folder.php';
|
||||||
\OC::$CLASSPATH['OC\Files\Storage\Shared'] = 'files_sharing/lib/sharedstorage.php';
|
\OC::$CLASSPATH['OC\Files\Storage\Shared'] = 'files_sharing/lib/sharedstorage.php';
|
||||||
\OC::$CLASSPATH['OC\Files\Cache\SharedScanner'] = 'files_sharing/lib/scanner.php';
|
|
||||||
\OC::$CLASSPATH['OC\Files\Cache\Shared_Cache'] = 'files_sharing/lib/cache.php';
|
|
||||||
\OC::$CLASSPATH['OC\Files\Cache\Shared_Permissions'] = 'files_sharing/lib/permissions.php';
|
|
||||||
\OC::$CLASSPATH['OC\Files\Cache\Shared_Updater'] = 'files_sharing/lib/updater.php';
|
|
||||||
\OC::$CLASSPATH['OC\Files\Cache\Shared_Watcher'] = 'files_sharing/lib/watcher.php';
|
|
||||||
\OC::$CLASSPATH['OCA\Files\Share\Maintainer'] = 'files_sharing/lib/maintainer.php';
|
|
||||||
\OC::$CLASSPATH['OCA\Files\Share\Proxy'] = 'files_sharing/lib/proxy.php';
|
|
||||||
|
|
||||||
$application = new Application();
|
$application = new Application();
|
||||||
$application->registerMountProviders();
|
$application->registerMountProviders();
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
namespace OC\Files\Cache;
|
namespace OCA\Files_Sharing;
|
||||||
|
|
||||||
use OC\Files\Cache\Wrapper\CacheJail;
|
use OC\Files\Cache\Wrapper\CacheJail;
|
||||||
use OCP\Files\Cache\ICacheEntry;
|
use OCP\Files\Cache\ICacheEntry;
|
||||||
|
@ -34,7 +34,7 @@ use OCP\Files\Storage\IStorage;
|
||||||
*
|
*
|
||||||
* don't use this class directly if you need to get metadata, use \OC\Files\Filesystem::getFileInfo instead
|
* don't use this class directly if you need to get metadata, use \OC\Files\Filesystem::getFileInfo instead
|
||||||
*/
|
*/
|
||||||
class Shared_Cache extends CacheJail {
|
class Cache extends CacheJail {
|
||||||
/**
|
/**
|
||||||
* @var \OC\Files\Storage\Shared
|
* @var \OC\Files\Storage\Shared
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -36,9 +36,9 @@ use OCP\User;
|
||||||
class Helper {
|
class Helper {
|
||||||
|
|
||||||
public static function registerHooks() {
|
public static function registerHooks() {
|
||||||
\OCP\Util::connectHook('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Shared_Updater', 'renameHook');
|
\OCP\Util::connectHook('OC_Filesystem', 'post_rename', '\OCA\Files_Sharing\Updater', 'renameHook');
|
||||||
\OCP\Util::connectHook('OC_Filesystem', 'post_delete', '\OCA\Files_Sharing\Hooks', 'unshareChildren');
|
\OCP\Util::connectHook('OC_Filesystem', 'post_delete', '\OCA\Files_Sharing\Hooks', 'unshareChildren');
|
||||||
\OCP\Util::connectHook('OC_Appconfig', 'post_set_value', '\OCA\Files\Share\Maintainer', 'configChangeHook');
|
\OCP\Util::connectHook('OC_Appconfig', 'post_set_value', '\OCA\Files_Sharing\Maintainer', 'configChangeHook');
|
||||||
|
|
||||||
\OCP\Util::connectHook('OC_User', 'post_deleteUser', '\OCA\Files_Sharing\Hooks', 'deleteUser');
|
\OCP\Util::connectHook('OC_User', 'post_deleteUser', '\OCA\Files_Sharing\Hooks', 'deleteUser');
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
namespace OCA\Files\Share;
|
namespace OCA\Files_Sharing;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Maintains stuff around the sharing functionality
|
* Maintains stuff around the sharing functionality
|
||||||
|
|
|
@ -21,15 +21,14 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
namespace OC\Files\Cache;
|
namespace OCA\Files_Sharing;
|
||||||
|
|
||||||
use OC\Files\ObjectStore\NoopScanner;
|
use OC\Files\ObjectStore\NoopScanner;
|
||||||
use OC\Files\Storage\Shared;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Scanner for SharedStorage
|
* Scanner for SharedStorage
|
||||||
*/
|
*/
|
||||||
class SharedScanner extends Scanner {
|
class Scanner extends \OC\Files\Cache\Scanner {
|
||||||
private $sourceScanner;
|
private $sourceScanner;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -318,14 +318,14 @@ class Shared extends \OC\Files\Storage\Wrapper\Jail implements ISharedStorage {
|
||||||
if (!$storage) {
|
if (!$storage) {
|
||||||
$storage = $this;
|
$storage = $this;
|
||||||
}
|
}
|
||||||
return new \OC\Files\Cache\Shared_Cache($storage, $this->sourceStorage, $this->sourceRootInfo);
|
return new \OCA\Files_Sharing\Cache($storage, $this->sourceStorage, $this->sourceRootInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getScanner($path = '', $storage = null) {
|
public function getScanner($path = '', $storage = null) {
|
||||||
if (!$storage) {
|
if (!$storage) {
|
||||||
$storage = $this;
|
$storage = $this;
|
||||||
}
|
}
|
||||||
return new \OC\Files\Cache\SharedScanner($storage);
|
return new \OCA\Files_Sharing\Scanner($storage);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getPropagator($storage = null) {
|
public function getPropagator($storage = null) {
|
||||||
|
|
|
@ -25,9 +25,9 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
namespace OC\Files\Cache;
|
namespace OCA\Files_Sharing;
|
||||||
|
|
||||||
class Shared_Updater {
|
class Updater {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param array $params
|
* @param array $params
|
||||||
|
|
Loading…
Reference in New Issue