diff options
| author | Robin Appelman <robin@icewind.nl> | 2024-09-25 17:52:42 +0200 |
|---|---|---|
| committer | Robin Appelman <robin@icewind.nl> | 2024-09-27 14:45:42 +0200 |
| commit | 888d06dff99457218a095ccc4afd98630e321ac9 (patch) | |
| tree | a6a1ea77901ef345f07cc9f04abe53302a71a890 /lib/private/Files/ObjectStore | |
| parent | da21acfb3ff5c6c7b8e1298cdefb5f17b10a6aab (diff) | |
| download | nextcloud-server-888d06dff99457218a095ccc4afd98630e321ac9.tar.gz nextcloud-server-888d06dff99457218a095ccc4afd98630e321ac9.zip | |
fix: preserve fileid when moving from objectstore to non-objectstore
Signed-off-by: Robin Appelman <robin@icewind.nl>
Diffstat (limited to 'lib/private/Files/ObjectStore')
| -rw-r--r-- | lib/private/Files/ObjectStore/ObjectStoreStorage.php | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/lib/private/Files/ObjectStore/ObjectStoreStorage.php b/lib/private/Files/ObjectStore/ObjectStoreStorage.php index 88309993137..ab4852f9c85 100644 --- a/lib/private/Files/ObjectStore/ObjectStoreStorage.php +++ b/lib/private/Files/ObjectStore/ObjectStoreStorage.php @@ -38,6 +38,7 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common implements IChunkedFil private bool $handleCopiesAsOwned; protected bool $validateWrites = true; + private bool $preserveCacheItemsOnDelete = false; /** * @param array $params @@ -171,7 +172,9 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common implements IChunkedFil } } - $this->getCache()->remove($entry->getPath()); + if (!$this->preserveCacheItemsOnDelete) { + $this->getCache()->remove($entry->getPath()); + } return true; } @@ -206,7 +209,9 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common implements IChunkedFil } //removing from cache is ok as it does not exist in the objectstore anyway } - $this->getCache()->remove($entry->getPath()); + if (!$this->preserveCacheItemsOnDelete) { + $this->getCache()->remove($entry->getPath()); + } return true; } @@ -755,4 +760,8 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common implements IChunkedFil $urn = $this->getURN($cacheEntry->getId()); $this->objectStore->abortMultipartUpload($urn, $writeToken); } + + public function setPreserveCacheOnDelete(bool $preserve) { + $this->preserveCacheItemsOnDelete = $preserve; + } } |