Watch for file modification/deletion

* Only connect the watcher once the instance is properly setup else
AppData fails hard.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2016-10-14 15:09:51 +02:00
parent 743132650a
commit c8ff9fb00e
No known key found for this signature in database
GPG Key ID: 1E152838F164D13B
3 changed files with 180 additions and 0 deletions

View File

@ -0,0 +1,98 @@
<?php
/**
* @copyright Copyright (c) 2016, Roeland Jago Douma <roeland@famdouma.nl>
*
* @author Roeland Jago Douma <roeland@famdouma.nl>
*
* @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 <http://www.gnu.org/licenses/>.
*
*/
namespace OC\Preview;
use OCP\Files\File;
use OCP\Files\Node;
use OCP\Files\Folder;
use OCP\Files\IAppData;
use OCP\Files\NotFoundException;
/**
* Class Watcher
*
* @package OC\Preview
*
* Class that will watch filesystem activity and remove previews as needed.
*/
class Watcher {
/** @var IAppData */
private $appData;
/** @var int[] */
private $toDelete = [];
/**
* Watcher constructor.
*
* @param IAppData $appData
*/
public function __construct(IAppData $appData) {
$this->appData = $appData;
}
public function postWrite(Node $node) {
// We only handle files
if ($node instanceof Folder) {
return;
}
try {
$folder = $this->appData->getFolder($node->getId());
$folder->delete();
} catch (NotFoundException $e) {
//Nothing to do
}
}
public function preDelete(Node $node) {
// To avoid cycles
if ($this->toDelete !== []) {
return;
}
if ($node instanceof File) {
$this->toDelete[] = $node->getId();
return;
}
/** @var Folder $node */
$nodes = $node->search('');
foreach ($nodes as $node) {
if ($node instanceof File) {
$this->toDelete[] = $node->getId();
}
}
}
public function postDelete(Node $node) {
foreach ($this->toDelete as $fid) {
try {
$folder = $this->appData->getFolder($fid);
$folder->delete();
} catch (NotFoundException $e) {
// continue
}
}
}
}

View File

@ -0,0 +1,72 @@
<?php
/**
* @copyright Copyright (c) 2016, Roeland Jago Douma <roeland@famdouma.nl>
*
* @author Roeland Jago Douma <roeland@famdouma.nl>
*
* @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 <http://www.gnu.org/licenses/>.
*
*/
namespace OC\Preview;
use OC\SystemConfig;
use OCP\Files\Node;
use OCP\Files\IRootFolder;
class WatcherConnector {
/** @var IRootFolder */
private $root;
/** @var SystemConfig */
private $config;
/**
* WatcherConnector constructor.
*
* @param IRootFolder $root
* @param SystemConfig $config
*/
public function __construct(IRootFolder $root,
SystemConfig $config) {
$this->root = $root;
$this->config = $config;
}
/**
* @return Watcher
*/
private function getWatcher() {
return \OC::$server->query(Watcher::class);
}
public function connectWatcher() {
// Do not connect if we are not setup yet!
if ($this->config->getValue('instanceid', null) !== null) {
$this->root->listen('\OC\Files', 'postWrite', function (Node $node) {
$this->getWatcher()->postWrite($node);
});
$this->root->listen('\OC\Files', 'preDelete', function (Node $node) {
$this->getWatcher()->preDelete($node);
});
$this->root->listen('\OC\Files', 'postDelete', function (Node $node) {
$this->getWatcher()->postDelete($node);
});
}
}
}

View File

@ -120,6 +120,12 @@ class Server extends ServerContainer implements IServerContainer {
return new PreviewManager($c->getConfig());
});
$this->registerService(\OC\Preview\Watcher::class, function (Server $c) {
return new \OC\Preview\Watcher(
$c->getAppDataDir('preview')
);
});
$this->registerService('EncryptionManager', function (Server $c) {
$view = new View();
$util = new Encryption\Util(
@ -192,6 +198,10 @@ class Server extends ServerContainer implements IServerContainer {
);
$connector = new HookConnector($root, $view);
$connector->viewToNode();
$previewConnector = new \OC\Preview\WatcherConnector($root, $c->getSystemConfig());
$previewConnector->connectWatcher();
return $root;
});
$this->registerService('LazyRootFolder', function(Server $c) {