From 6c9f2644cf8bac151b9af743802eb72a51278e8b Mon Sep 17 00:00:00 2001
From: Robin Appelman <robin@icewind.nl>
Date: Mon, 10 Dec 2018 17:20:45 +0100
Subject: [PATCH] Add objectExists to objectstore interface

Signed-off-by: Robin Appelman <robin@icewind.nl>
---
 lib/private/Files/ObjectStore/Azure.php           | 13 +++++++++++++
 lib/private/Files/ObjectStore/S3ObjectTrait.php   |  4 ++++
 .../Files/ObjectStore/StorageObjectStore.php      |  3 +++
 lib/private/Files/ObjectStore/Swift.php           |  3 +++
 lib/public/Files/ObjectStore/IObjectStore.php     |  9 +++++++++
 tests/lib/Files/ObjectStore/ObjectStoreTest.php   | 15 +++++++++++++++
 6 files changed, 47 insertions(+)

diff --git a/lib/private/Files/ObjectStore/Azure.php b/lib/private/Files/ObjectStore/Azure.php
index 899c826ec1..e162c510b9 100644
--- a/lib/private/Files/ObjectStore/Azure.php
+++ b/lib/private/Files/ObjectStore/Azure.php
@@ -115,4 +115,17 @@ class Azure implements IObjectStore {
 	public function deleteObject($urn) {
 		$this->getBlobClient()->deleteBlob($this->containerName, $urn);
 	}
+
+	public function objectExists($urn) {
+		try {
+			$this->getBlobClient()->getBlobMetadata($this->containerName, $urn);
+			return true;
+		} catch (ServiceException $e) {
+			if ($e->getCode() === 404) {
+				return false;
+			} else {
+				throw $e;
+			}
+		}
+	}
 }
diff --git a/lib/private/Files/ObjectStore/S3ObjectTrait.php b/lib/private/Files/ObjectStore/S3ObjectTrait.php
index 280a8efa81..a1110d87c8 100644
--- a/lib/private/Files/ObjectStore/S3ObjectTrait.php
+++ b/lib/private/Files/ObjectStore/S3ObjectTrait.php
@@ -90,4 +90,8 @@ trait S3ObjectTrait {
 			'Key' => $urn
 		]);
 	}
+
+	public function objectExists($urn) {
+		return $this->getConnection()->doesObjectExist($this->bucket, $urn);
+	}
 }
diff --git a/lib/private/Files/ObjectStore/StorageObjectStore.php b/lib/private/Files/ObjectStore/StorageObjectStore.php
index 0d35ba2ed7..f9fc1b5a4a 100644
--- a/lib/private/Files/ObjectStore/StorageObjectStore.php
+++ b/lib/private/Files/ObjectStore/StorageObjectStore.php
@@ -89,4 +89,7 @@ class StorageObjectStore implements IObjectStore {
 		$this->storage->unlink($urn);
 	}
 
+	public function objectExists($urn) {
+		return $this->storage->file_exists($urn);
+	}
 }
diff --git a/lib/private/Files/ObjectStore/Swift.php b/lib/private/Files/ObjectStore/Swift.php
index e379e54d01..3d6bf9d69d 100644
--- a/lib/private/Files/ObjectStore/Swift.php
+++ b/lib/private/Files/ObjectStore/Swift.php
@@ -128,4 +128,7 @@ class Swift implements IObjectStore {
 		$this->getContainer()->delete();
 	}
 
+	public function objectExists($urn) {
+		return $this->getContainer()->objectExists($urn);
+	}
 }
diff --git a/lib/public/Files/ObjectStore/IObjectStore.php b/lib/public/Files/ObjectStore/IObjectStore.php
index 628fd5852d..83c4b1065d 100644
--- a/lib/public/Files/ObjectStore/IObjectStore.php
+++ b/lib/public/Files/ObjectStore/IObjectStore.php
@@ -63,4 +63,13 @@ interface IObjectStore {
 	 * @since 7.0.0
 	 */
 	public function deleteObject($urn);
+
+	/**
+	 * Check if an object exists in the object store
+	 *
+	 * @param string $urn
+	 * @return bool
+	 * @since 16.0.0
+	 */
+	public function objectExists($urn);
 }
diff --git a/tests/lib/Files/ObjectStore/ObjectStoreTest.php b/tests/lib/Files/ObjectStore/ObjectStoreTest.php
index 2116306053..1383c0149a 100644
--- a/tests/lib/Files/ObjectStore/ObjectStoreTest.php
+++ b/tests/lib/Files/ObjectStore/ObjectStoreTest.php
@@ -94,4 +94,19 @@ abstract class ObjectStoreTest extends TestCase {
 			$this->assertEquals(1, 1);
 		}
 	}
+
+	public function testExists() {
+		$stream = $this->stringToStream('foobar');
+
+		$instance = $this->getInstance();
+		$this->assertFalse($instance->objectExists('2'));
+
+		$instance->writeObject('2', $stream);
+
+		$this->assertTrue($instance->objectExists('2'));
+
+		$instance->deleteObject('2');
+
+		$this->assertFalse($instance->objectExists('2'));
+	}
 }