From dfe662ad4222ea6eed2bce4b18aaa4e343fd4af1 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Tue, 11 Jul 2017 17:55:04 +0200 Subject: Fix propagating changes within jail wrapper Signed-off-by: Robin Appelman --- lib/private/Files/Cache/Wrapper/JailPropagator.php | 44 ++++++++++++++++++++++ lib/private/Files/Storage/Wrapper/Jail.php | 13 +++++++ 2 files changed, 57 insertions(+) create mode 100644 lib/private/Files/Cache/Wrapper/JailPropagator.php (limited to 'lib') diff --git a/lib/private/Files/Cache/Wrapper/JailPropagator.php b/lib/private/Files/Cache/Wrapper/JailPropagator.php new file mode 100644 index 00000000000..297dfce6332 --- /dev/null +++ b/lib/private/Files/Cache/Wrapper/JailPropagator.php @@ -0,0 +1,44 @@ + + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program 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 program. If not, see . + * + */ + +namespace OC\Files\Cache\Wrapper; + + +use OC\Files\Cache\Propagator; +use OC\Files\Storage\Wrapper\Jail; + +class JailPropagator extends Propagator { + /** + * @var Jail + */ + protected $storage; + + /** + * @param string $internalPath + * @param int $time + * @param int $sizeDifference + */ + public function propagateChange($internalPath, $time, $sizeDifference = 0) { + /** @var \OC\Files\Storage\Storage $storage */ + list($storage, $sourceInternalPath) = $this->storage->resolvePath($internalPath); + $storage->getPropagator()->propagateChange($sourceInternalPath, $time, $sizeDifference); + } +} diff --git a/lib/private/Files/Storage/Wrapper/Jail.php b/lib/private/Files/Storage/Wrapper/Jail.php index 91e8e5ed3c9..4fa2428c968 100644 --- a/lib/private/Files/Storage/Wrapper/Jail.php +++ b/lib/private/Files/Storage/Wrapper/Jail.php @@ -25,6 +25,7 @@ namespace OC\Files\Storage\Wrapper; use OC\Files\Cache\Wrapper\CacheJail; +use OC\Files\Cache\Wrapper\JailPropagator; use OCP\Lock\ILockingProvider; /** @@ -488,4 +489,16 @@ class Jail extends Wrapper { } return $this->getWrapperStorage()->moveFromStorage($sourceStorage, $sourceInternalPath, $this->getUnjailedPath($targetInternalPath)); } + + public function getPropagator($storage = null) { + if (isset($this->propagator)) { + return $this->propagator; + } + + if (!$storage) { + $storage = $this; + } + $this->propagator = new JailPropagator($storage, \OC::$server->getDatabaseConnection()); + return $this->propagator; + } } -- cgit v1.2.3