mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix etag propagation for single file shares

This commit is contained in:
Robin Appelman 2015-06-23 14:52:31 +02:00
parent f847d9409e
commit c87ab65081
3 changed files with 42 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apps/files_sharing/lib/propagation/changewatcher.php
View File

@ -25,10 +25,17 @@ class ChangeWatcher {
private $baseView; private $baseView;
/** /**
* @param \OC\Files\View $baseView the view for the logged in user * @var RecipientPropagator
*/ */
public function __construct(View $baseView) { private $recipientPropagator;
/**
* @param \OC\Files\View $baseView the view for the logged in user
* @param RecipientPropagator $recipientPropagator
*/
public function __construct(View $baseView, RecipientPropagator $recipientPropagator) {
$this->baseView = $baseView; $this->baseView = $baseView;
$this->recipientPropagator = $recipientPropagator;
} }
@ -39,6 +46,10 @@ class ChangeWatcher {
if ($mount instanceof SharedMount) { if ($mount instanceof SharedMount) {
$this->propagateForOwner($mount->getShare(), $mount->getInternalPath($fullPath), $mount->getOwnerPropagator()); $this->propagateForOwner($mount->getShare(), $mount->getInternalPath($fullPath), $mount->getOwnerPropagator());
} }
$info = $this->baseView->getFileInfo($path);
if ($info) {
$this->recipientPropagator->propagateById($info->getId());
}
} }
public function renameHook($params) { public function renameHook($params) {

5
apps/files_sharing/lib/propagation/propagationmanager.php
View File

@ -75,7 +75,7 @@ class PropagationManager {
if (isset($this->sharePropagators[$user])) { if (isset($this->sharePropagators[$user])) {
return $this->sharePropagators[$user]; return $this->sharePropagators[$user];
} }
$this->sharePropagators[$user] = new RecipientPropagator($user, $this->getChangePropagator($user), $this->config); $this->sharePropagators[$user] = new RecipientPropagator($user, $this->getChangePropagator($user), $this->config, $this);
return $this->sharePropagators[$user]; return $this->sharePropagators[$user];
} }
@ -101,7 +101,8 @@ class PropagationManager {
if (!$user) { if (!$user) {
return; return;
} }
$watcher = new ChangeWatcher(Filesystem::getView()); $recipientPropagator = $this->getSharePropagator($user->getUID());
$watcher = new ChangeWatcher(Filesystem::getView(), $recipientPropagator);
// for marking shares owned by the active user as dirty when a file inside them changes // for marking shares owned by the active user as dirty when a file inside them changes
$this->listenToOwnerChanges($user->getUID(), $user->getUID()); $this->listenToOwnerChanges($user->getUID(), $user->getUID());

39
apps/files_sharing/lib/propagation/recipientpropagator.php
View File

@ -31,17 +31,24 @@ class RecipientPropagator {
*/ */
protected $config; protected $config;
/**
* @var PropagationManager
*/
private $manager;
/** /**
* @param string $userId current user, must match the propagator's * @param string $userId current user, must match the propagator's
* user * user
* @param \OC\Files\Cache\ChangePropagator $changePropagator change propagator * @param \OC\Files\Cache\ChangePropagator $changePropagator change propagator
* initialized with a view for $user * initialized with a view for $user
* @param \OCP\IConfig $config * @param \OCP\IConfig $config
* @param PropagationManager $manager
*/ */
public function __construct($userId, $changePropagator, $config) { public function __construct($userId, $changePropagator, $config, PropagationManager $manager) {
$this->userId = $userId; $this->userId = $userId;
$this->changePropagator = $changePropagator; $this->changePropagator = $changePropagator;
$this->config = $config; $this->config = $config;
$this->manager = $manager;
} }
/** /**
@ -101,18 +108,24 @@ class RecipientPropagator {
*/ */
public function attachToPropagator(ChangePropagator $propagator, $owner) { public function attachToPropagator(ChangePropagator $propagator, $owner) {
$propagator->listen('\OC\Files', 'propagate', function ($path, $entry) use ($owner) { $propagator->listen('\OC\Files', 'propagate', function ($path, $entry) use ($owner) {
$shares = Share::getAllSharesForFileId($entry['fileid']); $this->propagateById($entry['fileid']);
foreach ($shares as $share) {
// propagate down the share tree
$this->markDirty($share, microtime(true));
// propagate up the share tree
$user = $share['uid_owner'];
$view = new View('/' . $user . '/files');
$path = $view->getPath($share['file_source']);
$watcher = new ChangeWatcher($view);
$watcher->writeHook(['path' => $path]);
}
}); });
} }
public function propagateById($id) {
$shares = Share::getAllSharesForFileId($id);
foreach ($shares as $share) {
// propagate down the share tree
$this->markDirty($share, microtime(true));
// propagate up the share tree
$user = $share['uid_owner'];
if($user !== $this->userId) {
$view = new View('/' . $user . '/files');
$path = $view->getPath($share['file_source']);
$watcher = new ChangeWatcher($view, $this->manager->getSharePropagator($user));
$watcher->writeHook(['path' => $path]);
}
}
}
} }