feat: Forward sizeDifference on update

And remove unneeded oldSize hack

Signed-off-by: Louis Chemineau <louis@chmn.me>

Author: artonge

lib/private/Files/Cache/Scanner.php

@@ -210,7 +210,7 @@ public function scanFile($file, $reuseExisting = 0, $parentId = -1, $cacheData =
 					 * @var \OC\Files\Cache\CacheEntry $cacheData
 					 */
 					$newData = $this->array_diff_assoc_multi($data, $cacheData->getData());
-					
+
 					// make it known to the caller that etag has been changed and needs propagation
 					if (isset($newData['etag'])) {
 						$data['etag_changed'] = true;
@@ -228,7 +228,6 @@ public function scanFile($file, $reuseExisting = 0, $parentId = -1, $cacheData =
 				}
 
 				if ($cacheData !== false) {
-					$data['oldSize'] = $cacheData['size'] ?? 0;
 					$data['encrypted'] = $cacheData['encrypted'] ?? false;
 				}
 
@@ -351,23 +350,23 @@ public function scan($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1, $loc
 	 *
 	 */
 	protected function array_diff_assoc_multi(array $array1, array $array2) {
-		
+
 		$result = [];
 
 		foreach ($array1 as $key => $value) {
-		
+
 			// if $array2 doesn't have the same key, that's a result
 			if (!array_key_exists($key, $array2)) {
 				$result[$key] = $value;
 				continue;
 			}
-		
+
 			// if $array2's value for the same key is different, that's a result
 			if ($array2[$key] !== $value && !is_array($value)) {
 				$result[$key] = $value;
 				continue;
 			}
-		
+
 			if (is_array($value)) {
 				$nestedDiff = $this->array_diff_assoc_multi($value, $array2[$key]);
 				if (!empty($nestedDiff)) {

lib/private/Files/Cache/Updater.php

@@ -111,10 +111,6 @@ public function update($path, $time = null, ?int $sizeDifference = null) {
 
 		$data = $this->scanner->scan($path, Scanner::SCAN_SHALLOW, -1, false);
 
-		if (isset($data['oldSize']) && isset($data['size'])) {
-			$sizeDifference = $data['size'] - $data['oldSize'];
-		}
-
 		// encryption is a pita and touches the cache itself
 		if (isset($data['encrypted']) && (bool)$data['encrypted']) {
 			$sizeDifference = null;

lib/private/Files/View.php

@@ -1222,9 +1222,22 @@ private function basicOperation(string $operation, string $path, array $hooks =
 					$this->removeUpdate($storage, $internalPath);
 				}
 				if ($result !== false && in_array('write', $hooks, true) && $operation !== 'fopen' && $operation !== 'touch') {
-					$isCreateOperation = $operation === 'mkdir' || ($operation === 'file_put_contents' && in_array('create', $hooks, true));
-					$sizeDifference = $operation === 'mkdir' ? 0 : $result;
-					$this->writeUpdate($storage, $internalPath, null, $isCreateOperation ? $sizeDifference : null);
+					if ($operation === 'mkdir') {
+						$sizeDifference = 0;
+					} else if ($operation === 'file_put_contents') {
+						if (in_array('create', $hooks, true)) {
+							$sizeDifference = $result;
+						} else if (in_array('update', $hooks, true)) {
+							$cacheData = $storage->getCache()->get($path);
+							$sizeDifference = $cacheData === false ? null : $result - $cacheData->getSize();
+						} else {
+							$sizeDifference = null;
+						}
+					} else {
+						$sizeDifference = null;
+					}
+
+					$this->writeUpdate($storage, $internalPath, null, $sizeDifference);
 				}
 				if ($result !== false && in_array('touch', $hooks)) {
 					$this->writeUpdate($storage, $internalPath, $extraParam, 0);