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

Merge pull request #5852 from nextcloud/preview_trash_cleanup 

Preview trash cleanup
This commit is contained in:
Morris Jobke 2017-07-27 17:24:47 +02:00 committed by GitHub
parent c7757b07f8 549845aa73
commit dc58206ded
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
apps/files_trashbin/lib/Trashbin.php
View File

@ -42,6 +42,8 @@ use OC\Files\Filesystem;
use OC\Files\View; use OC\Files\View;
use OCA\Files_Trashbin\AppInfo\Application; use OCA\Files_Trashbin\AppInfo\Application;
use OCA\Files_Trashbin\Command\Expire; use OCA\Files_Trashbin\Command\Expire;
use OCP\Files\File;
use OCP\Files\Folder;
use OCP\Files\NotFoundException; use OCP\Files\NotFoundException;
use OCP\User; use OCP\User;
@ -485,9 +487,16 @@ class Trashbin {
*/ */
public static function deleteAll() { public static function deleteAll() {
$user = User::getUser(); $user = User::getUser();
$userRoot = \OC::$server->getUserFolder($user)->getParent();
$view = new View('/' . $user); $view = new View('/' . $user);
$fileInfos = $view->getDirectoryContent('files_trashbin/files'); $fileInfos = $view->getDirectoryContent('files_trashbin/files');
try {
$trash = $userRoot->get('files_trashbin');
} catch (NotFoundException $e) {
return false;
}
// Array to store the relative path in (after the file is deleted, the view won't be able to relativise the path anymore) // Array to store the relative path in (after the file is deleted, the view won't be able to relativise the path anymore)
$filePaths = array(); $filePaths = array();
foreach($fileInfos as $fileInfo){ foreach($fileInfos as $fileInfo){
@ -504,7 +513,7 @@ class Trashbin {
} }
// actual file deletion // actual file deletion
$view->deleteAll('files_trashbin'); $trash->delete();
$query = \OC_DB::prepare('DELETE FROM `*PREFIX*files_trash` WHERE `user`=?'); $query = \OC_DB::prepare('DELETE FROM `*PREFIX*files_trash` WHERE `user`=?');
$query->execute(array($user)); $query->execute(array($user));
@ -516,8 +525,8 @@ class Trashbin {
self::emitTrashbinPostDelete($path); self::emitTrashbinPostDelete($path);
} }
$view->mkdir('files_trashbin'); $trash = $userRoot->newFolder('files_trashbin');
$view->mkdir('files_trashbin/files'); $trash->newFolder('files');
return true; return true;
} }
@ -548,6 +557,7 @@ class Trashbin {
* @return int size of deleted files * @return int size of deleted files
*/ */
public static function delete($filename, $user, $timestamp = null) { public static function delete($filename, $user, $timestamp = null) {
$userRoot = \OC::$server->getUserFolder($user)->getParent();
$view = new View('/' . $user); $view = new View('/' . $user);
$size = 0; $size = 0;
@ -561,13 +571,20 @@ class Trashbin {
$size += self::deleteVersions($view, $file, $filename, $timestamp, $user); $size += self::deleteVersions($view, $file, $filename, $timestamp, $user);
if ($view->is_dir('/files_trashbin/files/' . $file)) { try {
$node = $userRoot->get('/files_trashbin/files/' . $file);
} catch (NotFoundException $e) {
return $size;
}
if ($node instanceof Folder) {
$size += self::calculateSize(new View('/' . $user . '/files_trashbin/files/' . $file)); $size += self::calculateSize(new View('/' . $user . '/files_trashbin/files/' . $file));
} else { } else if ($node instanceof File) {
$size += $view->filesize('/files_trashbin/files/' . $file); $size += $view->filesize('/files_trashbin/files/' . $file);
} }
self::emitTrashbinPreDelete('/files_trashbin/files/' . $file); self::emitTrashbinPreDelete('/files_trashbin/files/' . $file);
$view->unlink('/files_trashbin/files/' . $file); $node->delete();
self::emitTrashbinPostDelete('/files_trashbin/files/' . $file); self::emitTrashbinPostDelete('/files_trashbin/files/' . $file);
return $size; return $size;