Skip to content

Delete the previews when a version is restored #9475

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 1 commit into from
May 16, 2018
Merged

Delete the previews when a version is restored #9475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions apps/files_versions/lib/Storage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,9 @@ public static function rollback($file, $revision) {
return false;
}

// Fetch the userfolder to trigger view hooks
$userFolder = \OC::$server->getUserFolder($uid);

$users_view = new View('/'.$uid);
$files_view = new View('/'. User::getUser().'/files');

Expand Down Expand Up @@ -375,9 +378,14 @@ public static function rollback($file, $revision) {
if (self::copyFileContents($users_view, $fileToRestore, 'files' . $filename)) {
$files_view->touch($file, $revision);
Storage::scheduleExpire($uid, $file);

$node = $userFolder->get($file);

// TODO: move away from those legacy hooks!
\OC_Hook::emit('\OCP\Versions', 'rollback', array(
'path' => $filename,
'revision' => $revision,
'node' => $node,
));
return true;
} else if ($versionCreated) {
Expand Down
10 changes: 10 additions & 0 deletions lib/private/Preview/Watcher.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ public function __construct(IAppData $appData) {
}

public function postWrite(Node $node) {
$this->deleteNode($node);
}

protected function deleteNode(Node $node) {
// We only handle files
if ($node instanceof Folder) {
return;
Expand All @@ -61,4 +65,10 @@ public function postWrite(Node $node) {
//Nothing to do
}
}

public function versionRollback(array $data) {
if (isset($data['node'])) {
$this->deleteNode($data['node']);
}
}
}
2 changes: 2 additions & 0 deletions lib/private/Preview/WatcherConnector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ public function connectWatcher() {
$this->root->listen('\OC\Files', 'postWrite', function (Node $node) {
$this->getWatcher()->postWrite($node);
});

\OC_Hook::connect('\OCP\Versions', 'rollback', $this->getWatcher(), 'versionRollback');
}
}
}