Merge pull request #21956 from owncloud/cross-cache-move

Add fallback moveFromCache implementation

2 files changed, 5 insertions, 1 deletions

diff --git a/lib/public/files/cache/icache.php b/lib/public/files/cache/icache.php
index 3fbf310148d..e80c6fa2cb0 100644
--- a/lib/public/files/cache/icache.php
+++ b/lib/public/files/cache/icache.php
@@ -51,7 +51,7 @@ interface ICache {
 	 * get the stored metadata of a file or folder
 	 *
 	 * @param string | int $file either the path of a file or folder or the file id for a file or folder
-	 * @return ICacheEntry[]|false the cache entry or false if the file is not found in the cache
+	 * @return ICacheEntry|false the cache entry or false if the file is not found in the cache
 	 * @since 9.0.0
 	 */
 	public function get($file);
@@ -148,6 +148,8 @@ interface ICache {
 	/**
 	 * Move a file or folder in the cache
 	 *
+	 * Note that this should make sure the entries are removed from the source cache
+	 *
 	 * @param \OCP\Files\Cache\ICache $sourceCache
 	 * @param string $sourcePath
 	 * @param string $targetPath
diff --git a/lib/public/files/cache/icacheentry.php b/lib/public/files/cache/icacheentry.php
index 8d14bd2c555..63a232c9618 100644
--- a/lib/public/files/cache/icacheentry.php
+++ b/lib/public/files/cache/icacheentry.php
@@ -27,6 +27,8 @@ namespace OCP\Files\Cache;
  * @since 9.0.0
  */
 interface ICacheEntry {
+	const DIRECTORY_MIMETYPE = 'httpd/unix-directory';
+
 	/**
 	 * Get the numeric id of a file
 	 *