3 files changed, 22 insertions, 26 deletions

diff --git a/lib/private/Preview/Movie.php b/lib/private/Preview/Movie.php
index 46462dfa592..7de543198f4 100644
--- a/lib/private/Preview/Movie.php
+++ b/lib/private/Preview/Movie.php
@@ -54,10 +54,15 @@ class Movie extends ProviderV2 {
 
 		$result = null;
 		if ($this->useTempFile($file)) {
-			// try downloading 5 MB first as it's likely that the first frames are present there
-			// in some cases this doesn't work for example when the moov atom is at the
-			// end of the file, so if it fails we fall back to getting the full file
-			$sizeAttempts = [5242880, null];
+			// Try downloading 5 MB first, as it's likely that the first frames are present there.
+			// In some cases this doesn't work, for example when the moov atom is at the
+			// end of the file, so if it fails we fall back to getting the full file.
+			// Unless the file is not local (e.g. S3) as we do not want to download the whole (e.g. 37Gb) file
+			if ($file->getStorage()->isLocal()) {
+				$sizeAttempts = [5242880, null];
+			} else {
+				$sizeAttempts = [5242880];
+			}
 		} else {
 			// size is irrelevant, only attempt once
 			$sizeAttempts = [null];
diff --git a/lib/private/Preview/Watcher.php b/lib/private/Preview/Watcher.php
index abddd7b5acb..21f040d8342 100644
--- a/lib/private/Preview/Watcher.php
+++ b/lib/private/Preview/Watcher.php
@@ -8,6 +8,7 @@ declare(strict_types=1);
  */
 namespace OC\Preview;
 
+use OCP\Files\FileInfo;
 use OCP\Files\Folder;
 use OCP\Files\IAppData;
 use OCP\Files\Node;
@@ -37,7 +38,7 @@ class Watcher {
 		$this->deleteNode($node);
 	}
 
-	protected function deleteNode(Node $node) {
+	protected function deleteNode(FileInfo $node) {
 		// We only handle files
 		if ($node instanceof Folder) {
 			return;
diff --git a/lib/private/Preview/WatcherConnector.php b/lib/private/Preview/WatcherConnector.php
index ae2a136ca78..c34dd1dde4d 100644
--- a/lib/private/Preview/WatcherConnector.php
+++ b/lib/private/Preview/WatcherConnector.php
@@ -9,43 +9,33 @@ declare(strict_types=1);
 namespace OC\Preview;
 
 use OC\SystemConfig;
+use OCA\Files_Versions\Events\VersionRestoredEvent;
+use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Files\IRootFolder;
 use OCP\Files\Node;
 
 class WatcherConnector {
-	/** @var IRootFolder */
-	private $root;
-
-	/** @var SystemConfig */
-	private $config;
-
-	/**
-	 * WatcherConnector constructor.
-	 *
-	 * @param IRootFolder $root
-	 * @param SystemConfig $config
-	 */
-	public function __construct(IRootFolder $root,
-		SystemConfig $config) {
-		$this->root = $root;
-		$this->config = $config;
+	public function __construct(
+		private IRootFolder $root,
+		private SystemConfig $config,
+		private IEventDispatcher $dispatcher,
+	) {
 	}
 
-	/**
-	 * @return Watcher
-	 */
 	private function getWatcher(): Watcher {
 		return \OCP\Server::get(Watcher::class);
 	}
 
-	public function connectWatcher() {
+	public function connectWatcher(): void {
 		// Do not connect if we are not setup yet!
 		if ($this->config->getValue('instanceid', null) !== null) {
 			$this->root->listen('\OC\Files', 'postWrite', function (Node $node) {
 				$this->getWatcher()->postWrite($node);
 			});
 
-			\OC_Hook::connect('\OCP\Versions', 'rollback', $this->getWatcher(), 'versionRollback');
+			$this->dispatcher->addListener(VersionRestoredEvent::class, function (VersionRestoredEvent $event) {
+				$this->getWatcher()->versionRollback(['node' => $event->getVersion()->getSourceFile()]);
+			});
 		}
 	}
 }