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

Try catching errors when moving files to the trash 

Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl 2020-02-06 10:26:20 +01:00
parent f11e4c9ec4
commit 5b68318474
No known key found for this signature in database
GPG Key ID: 4C614C6ED2CDE6DF
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -258,6 +258,7 @@ class Trashbin {
$moveSuccessful = true;
if ($trashStorage->file_exists($trashInternalPath)) {
$trashStorage->unlink($trashInternalPath);
$trashStorage->getUpdater()->remove($trashInternalPath);
}
$trashStorage->moveFromStorage($sourceStorage, $sourceInternalPath, $trashInternalPath);
} catch (\OCA\Files_Trashbin\Exceptions\CopyRecursiveException $e) {
@ -277,7 +278,14 @@ class Trashbin {
return false;
}
$trashStorage->getUpdater()->renameFromStorage($sourceStorage, $sourceInternalPath, $trashInternalPath);
try {
$trashStorage->getUpdater()->renameFromStorage($sourceStorage, $sourceInternalPath, $trashInternalPath);
} catch (\Exception) {
// updating the cache failed
\OC::$server->getLogger()->error('Failed to move the file in the cache, restoring from trashbin');
$sourceStorage->moveFromStorage($trashStorage, $trashInternalPath, $sourceInternalPath);
$moveSuccessful = false;
}
if ($moveSuccessful) {
$query = \OC_DB::prepare("INSERT INTO `*PREFIX*files_trash` (`id`,`timestamp`,`location`,`user`) VALUES (?,?,?,?)");

1
lib/private/Files/Cache/Updater.php
View File

@ -195,6 +195,7 @@ class Updater implements IUpdater {
if ($sourceStorage === $this->storage) {
$this->cache->move($source, $target);
} else {
// exception might occur here
$this->cache->moveFromCache($sourceCache, $source, $target);
}
}