fix: don't use cached root info from shared cache if the watcher has …

…detected an update

Signed-off-by: Robin Appelman <robin@icewind.nl>

apps/files_sharing/lib/Cache.php

@@ -191,4 +191,8 @@ public function getCacheEntryFromSearchResult(ICacheEntry $rawEntry): ?ICacheEnt
 			return null;
 		}
 	}
+
+	public function markRootChanged(): void {
+		$this->rootUnchanged = false;
+	}
 }

apps/files_sharing/lib/SharedStorage.php

@@ -441,7 +441,12 @@ public function getWatcher(string $path = '', ?IStorage $storage = null): IWatch
 			// for shares from the home storage we can rely on the home storage to keep itself up to date
 			// for other storages we need use the proper watcher
 			if (!(str_starts_with($storageId, 'home::') || str_starts_with($storageId, 'object::user'))) {
+				$cache = $this->getCache();
 				$this->watcher = parent::getWatcher($path, $storage);
+				if ($cache instanceof Cache) {
+					$this->watcher->onUpdate($cache->markRootChanged(...));
+				}
+
 				return $this->watcher;
 			}
 		}

lib/private/Files/Cache/Watcher.php

@@ -33,6 +33,9 @@ class Watcher implements IWatcher {
 	 */
 	protected $scanner;
 
+	/** @var callable[] */
+	protected $onUpdate = [];
+
 	/**
 	 * @param \OC\Files\Storage\Storage $storage
 	 */
@@ -100,6 +103,9 @@ public function update($path, $cachedData) {
 		if ($this->cache instanceof Cache) {
 			$this->cache->correctFolderSize($path);
 		}
+		foreach ($this->onUpdate as $callback) {
+			$callback($path);
+		}
 	}
 
 	/**
@@ -130,4 +136,11 @@ public function cleanFolder($path) {
 			}
 		}
 	}
+
+	/**
+	 * register a callback to be called whenever the watcher triggers and update
+	 */
+	public function onUpdate(callable $callback): void {
+		$this->onUpdate[] = $callback;
+	}
 }

lib/private/Files/Cache/Wrapper/JailWatcher.php

@@ -55,4 +55,7 @@ public function cleanFolder($path) {
 		$this->watcher->cleanFolder($this->getSourcePath($path));
 	}
 
+	public function onUpdate(callable $callback): void {
+		$this->watcher->onUpdate($callback);
+	}
 }

lib/public/Files/Cache/IWatcher.php

@@ -76,4 +76,10 @@ public function needsUpdate($path, $cachedData);
 	 * @since 9.0.0
 	 */
 	public function cleanFolder($path);
+
+	/**
+	 * register a callback to be called whenever the watcher triggers and update
+	 * @since 31.0.0
+	 */
+	public function onUpdate(callable $callback): void;
 }