Cache: allow storage backends to overwrite Watcher

3 files changed, 14 insertions, 2 deletions

diff --git a/lib/files/storage/common.php b/lib/files/storage/common.php
index 3cf960d05df..ab167f28646 100644
--- a/lib/files/storage/common.php
+++ b/lib/files/storage/common.php
@@ -250,6 +250,13 @@ abstract class Common implements \OC\Files\Storage\Storage {
 	}
 
 	/**
+	 * @return \OC\Files\Cache\Watcher
+	 */
+	public function getWatcher(){
+		return new \OC\Files\Cache\Watcher($this);
+	}
+
+	/**
 	 * get the owner of a path
 	 * @param string $path The path to get the owner
 	 * @return string uid or false
diff --git a/lib/files/storage/storage.php b/lib/files/storage/storage.php
index 73dcb8fe36b..b603381dc90 100644
--- a/lib/files/storage/storage.php
+++ b/lib/files/storage/storage.php
@@ -70,6 +70,11 @@ interface Storage{
 	public function getPermissionsCache();
 
 	/**
+	 * @return \OC\Files\Cache\Watcher
+	 */
+	public function getWatcher();
+
+	/**
 	 * get the ETag for a file or folder
 	 *
 	 * @param string $path
diff --git a/lib/files/view.php b/lib/files/view.php
index 592c484a21c..d3f93d39f5a 100644
--- a/lib/files/view.php
+++ b/lib/files/view.php
@@ -685,7 +685,7 @@ class View {
 				$scanner = $storage->getScanner();
 				$scanner->scan($internalPath, Cache\Scanner::SCAN_SHALLOW);
 			} else {
-				$watcher = new \OC\Files\Cache\Watcher($storage);
+				$watcher = $storage->getWatcher();
 				$watcher->checkUpdate($internalPath);
 			}
 
@@ -733,7 +733,7 @@ class View {
 				$scanner = $storage->getScanner();
 				$scanner->scan($internalPath, Cache\Scanner::SCAN_SHALLOW);
 			} else {
-				$watcher = new \OC\Files\Cache\Watcher($storage);
+				$watcher = $storage->getWatcher();
 				$watcher->checkUpdate($internalPath);
 			}