minor fixes
This commit is contained in:
parent
526ea3fcba
commit
f488624e5f
|
@ -30,14 +30,14 @@ class MountProvider implements IMountProvider {
|
||||||
* @param \OCP\IConfig $config
|
* @param \OCP\IConfig $config
|
||||||
* @param \OCA\Files_Sharing\Propagation\PropagationManager $propagationManager
|
* @param \OCA\Files_Sharing\Propagation\PropagationManager $propagationManager
|
||||||
*/
|
*/
|
||||||
function __construct(IConfig $config, PropagationManager $propagationManager) {
|
public function __construct(IConfig $config, PropagationManager $propagationManager) {
|
||||||
$this->config = $config;
|
$this->config = $config;
|
||||||
$this->propagationManager = $propagationManager;
|
$this->propagationManager = $propagationManager;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get all mountpoints applicable for the user
|
* Get all mountpoints applicable for the user and check for shares where we need to update the etags
|
||||||
*
|
*
|
||||||
* @param \OCP\IUser $user
|
* @param \OCP\IUser $user
|
||||||
* @param \OCP\Files\Storage\IStorageFactory $storageFactory
|
* @param \OCP\Files\Storage\IStorageFactory $storageFactory
|
||||||
|
|
|
@ -23,7 +23,10 @@ class ChangeWatcher {
|
||||||
*/
|
*/
|
||||||
private $baseView;
|
private $baseView;
|
||||||
|
|
||||||
function __construct(View $baseView) {
|
/**
|
||||||
|
* @param \OC\Files\View $baseView the view for the logged in user
|
||||||
|
*/
|
||||||
|
public function __construct(View $baseView) {
|
||||||
$this->baseView = $baseView;
|
$this->baseView = $baseView;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -62,7 +65,7 @@ class ChangeWatcher {
|
||||||
$view = new View('/' . $share['uid_owner'] . '/files');
|
$view = new View('/' . $share['uid_owner'] . '/files');
|
||||||
|
|
||||||
$shareRootPath = $view->getPath($share['item_source']);
|
$shareRootPath = $view->getPath($share['item_source']);
|
||||||
if ($shareRootPath) {
|
if (!is_null($shareRootPath)) {
|
||||||
$path = $shareRootPath . '/' . $internalPath;
|
$path = $shareRootPath . '/' . $internalPath;
|
||||||
$propagator->addChange($path);
|
$propagator->addChange($path);
|
||||||
$propagator->propagateChanges();
|
$propagator->propagateChanges();
|
||||||
|
|
|
@ -42,9 +42,7 @@ class PropagationManager {
|
||||||
*/
|
*/
|
||||||
private $sharePropagators = [];
|
private $sharePropagators = [];
|
||||||
|
|
||||||
private $globalSetupDone = false;
|
public function __construct(IUserSession $userSession, IConfig $config) {
|
||||||
|
|
||||||
function __construct(IUserSession $userSession, IConfig $config) {
|
|
||||||
$this->userSession = $userSession;
|
$this->userSession = $userSession;
|
||||||
$this->config = $config;
|
$this->config = $config;
|
||||||
}
|
}
|
||||||
|
@ -82,7 +80,7 @@ class PropagationManager {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Attach the propagator to the change propagator of a user to listen to changes made to files shared by the user
|
* Attach the recipient propagator for $user to the change propagator of a share owner to mark shares as dirty when the owner makes a change to a share
|
||||||
*
|
*
|
||||||
* @param string $shareOwner
|
* @param string $shareOwner
|
||||||
* @param string $user
|
* @param string $user
|
||||||
|
|
|
@ -184,8 +184,7 @@ class SharedMount extends MountPoint implements MoveableMount {
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getShare() {
|
public function getShare() {
|
||||||
$this->getStorage(); //ensure it exists
|
return $this->getStorage()->getShare();
|
||||||
return $this->storage->getShare();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue