Merge pull request #19869 from owncloud/cache-adjustcurrentmtimeonrename

On rename, also refresh storage_mtime of the target file

2 files changed, 23 insertions, 1 deletions

diff --git a/lib/private/files/cache/cache.php b/lib/private/files/cache/cache.php
index f3e22701f40..231dbe37695 100644
--- a/lib/private/files/cache/cache.php
+++ b/lib/private/files/cache/cache.php
@@ -313,6 +313,14 @@ class Cache {
 		$fields = array(
 			'path', 'parent', 'name', 'mimetype', 'size', 'mtime', 'storage_mtime', 'encrypted',
 			'etag', 'permissions');
+
+		$doNotCopyStorageMTime = false;
+		if (array_key_exists('mtime', $data) && $data['mtime'] === null) {
+			// this horrific magic tells it to not copy storage_mtime to mtime
+			unset($data['mtime']);
+			$doNotCopyStorageMTime = true;
+		}
+
 		$params = array();
 		$queryParts = array();
 		foreach ($data as $name => $value) {
@@ -325,7 +333,7 @@ class Cache {
 					$queryParts[] = '`mimepart`';
 					$value = $this->mimetypeLoader->getId($value);
 				} elseif ($name === 'storage_mtime') {
-					if (!isset($data['mtime'])) {
+					if (!$doNotCopyStorageMTime && !isset($data['mtime'])) {
 						$params[] = $value;
 						$queryParts[] = '`mtime`';
 					}
diff --git a/lib/private/files/cache/updater.php b/lib/private/files/cache/updater.php
index 4cc5f511565..85dcc8589de 100644
--- a/lib/private/files/cache/updater.php
+++ b/lib/private/files/cache/updater.php
@@ -194,12 +194,26 @@ class Updater {
 			$targetCache->correctFolderSize($targetInternalPath);
 			$this->correctParentStorageMtime($sourceStorage, $sourceInternalPath);
 			$this->correctParentStorageMtime($targetStorage, $targetInternalPath);
+			$this->updateStorageMTimeOnly($targetStorage, $targetInternalPath);
 			$this->propagator->addChange($source);
 			$this->propagator->addChange($target);
 			$this->propagator->propagateChanges();
 		}
 	}
 
+	private function updateStorageMTimeOnly($storage, $internalPath) {
+		$cache = $storage->getCache();
+		$fileId = $cache->getId($internalPath);
+		if ($fileId !== -1) {
+			$cache->update(
+				$fileId, [
+					'mtime' => null, // this magic tells it to not overwrite mtime
+					'storage_mtime' => $storage->filemtime($internalPath)
+				]
+			);
+		}
+	}
+
 	/**
 	 * update the storage_mtime of the direct parent in the cache to the mtime from the storage
 	 *