1 files changed, 46 insertions, 32 deletions

diff --git a/apps/dav/lib/Upload/UploadFolder.php b/apps/dav/lib/Upload/UploadFolder.php
index bb7c494cee3..8890d472f87 100644
--- a/apps/dav/lib/Upload/UploadFolder.php
+++ b/apps/dav/lib/Upload/UploadFolder.php
@@ -1,48 +1,41 @@
 <?php
+
 /**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Lukas Reschke <lukas@statuscode.ch>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * 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, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
  */
 namespace OCA\DAV\Upload;
 
+use OC\Files\ObjectStore\ObjectStoreStorage;
 use OCA\DAV\Connector\Sabre\Directory;
+use OCP\Files\ObjectStore\IObjectStoreMultiPartUpload;
+use OCP\Files\Storage\IStorage;
+use OCP\ICacheFactory;
+use OCP\Server;
 use Sabre\DAV\Exception\Forbidden;
 use Sabre\DAV\ICollection;
 
 class UploadFolder implements ICollection {
-
-	/** @var Directory */
-	private $node;
-	/** @var CleanupService */
-	private $cleanupService;
-
-	public function __construct(Directory $node, CleanupService $cleanupService) {
-		$this->node = $node;
-		$this->cleanupService = $cleanupService;
+	public function __construct(
+		private Directory $node,
+		private CleanupService $cleanupService,
+		private IStorage $storage,
+		private string $uid,
+	) {
 	}
 
 	public function createFile($name, $data = null) {
 		// TODO: verify name - should be a simple number
-		$this->node->createFile($name, $data);
+		try {
+			$this->node->createFile($name, $data);
+		} catch (\Exception $e) {
+			if ($this->node->childExists($name)) {
+				$child = $this->node->getChild($name);
+				$child->delete();
+			}
+			throw $e;
+		}
 	}
 
 	public function createDirectory($name) {
@@ -66,6 +59,23 @@ class UploadFolder implements ICollection {
 			$children[] = new UploadFile($child);
 		}
 
+		if ($this->storage->instanceOfStorage(ObjectStoreStorage::class)) {
+			/** @var ObjectStoreStorage $storage */
+			$objectStore = $this->storage->getObjectStore();
+			if ($objectStore instanceof IObjectStoreMultiPartUpload) {
+				$cache = Server::get(ICacheFactory::class)->createDistributed(ChunkingV2Plugin::CACHE_KEY);
+				$uploadSession = $cache->get($this->getName());
+				if ($uploadSession) {
+					$uploadId = $uploadSession[ChunkingV2Plugin::UPLOAD_ID];
+					$id = $uploadSession[ChunkingV2Plugin::UPLOAD_TARGET_ID];
+					$parts = $objectStore->getMultipartUploads($this->storage->getURN($id), $uploadId);
+					foreach ($parts as $part) {
+						$children[] = new PartFile($this->node, $part);
+					}
+				}
+			}
+		}
+
 		return $children;
 	}
 
@@ -80,7 +90,7 @@ class UploadFolder implements ICollection {
 		$this->node->delete();
 
 		// Background cleanup job is not needed anymore
-		$this->cleanupService->removeJob($this->getName());
+		$this->cleanupService->removeJob($this->uid, $this->getName());
 	}
 
 	public function getName() {
@@ -94,4 +104,8 @@ class UploadFolder implements ICollection {
 	public function getLastModified() {
 		return $this->node->getLastModified();
 	}
+
+	public function getStorage() {
+		return $this->storage;
+	}
 }