Repair detached filecache entries through occ files:scan

apps/files/lib/Command/Scan.php

@@ -39,6 +39,10 @@
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Helper\Table;
+use OC\Repair\RepairMismatchFileCachePath;
+use OC\Migration\ConsoleOutput;
+use OCP\Lock\ILockingProvider;
+use OCP\Lock\LockedException;
 
 class Scan extends Base {
 
@@ -90,6 +94,12 @@ protected function configure() {
 				null,
 				InputOption::VALUE_NONE,
 				'will rescan all files of all known users'
+			)
+			->addOption(
+				'repair',
+				null,
+				InputOption::VALUE_NONE,
+				'will repair detached filecache entries (slow)'
 			)->addOption(
 				'unscanned',
 				null,
@@ -107,9 +117,34 @@ public function checkScanWarning($fullPath, OutputInterface $output) {
 		}
 	}
 
-	protected function scanFiles($user, $path, $verbose, OutputInterface $output, $backgroundScan = false) {
+	protected function scanFiles($user, $path, $verbose, OutputInterface $output, $backgroundScan = false, $shouldRepair = false) {
 		$connection = $this->reconnectToDatabase($output);
 		$scanner = new \OC\Files\Utils\Scanner($user, $connection, \OC::$server->getLogger());
+		if ($shouldRepair) {
+			$scanner->listen('\OC\Files\Utils\Scanner', 'beforeScanStorage', function ($storage) use ($output, $connection) {
+				$lockingProvider = \OC::$server->getLockingProvider();
+				try {
+					// FIXME: this will lock the storage even if there is nothing to repair
+					$storage->acquireLock('', ILockingProvider::LOCK_EXCLUSIVE, $lockingProvider);
+				} catch (OCP\Lock\LockedException $e) {
+					$output->writeln("\t<error>Storage \"" . $storage->getCache()->getNumericStorageId() . '" cannot be repaired as it is currently in use, please try again later</error>');
+					return;
+				}
+				try {
+					// TODO: use DI
+					$repairStep = new RepairMismatchFileCachePath(
+						$connection,
+						\OC::$server->getMimeTypeLoader()
+					);
+					$repairStep->setStorageNumericId($storage->getCache()->getNumericStorageId());
+					$repairStep->setCountOnly(false);
+					$repairStep->run(new ConsoleOutput($output));
+				} finally {
+					$storage->releaseLock('', ILockingProvider::LOCK_EXCLUSIVE, $lockingProvider);
+				}
+			});
+		}
+
 		# check on each file/folder if there was a user interrupt (ctrl-c) and throw an exception
 		# printout and count
 		if ($verbose) {
@@ -156,7 +191,7 @@ protected function scanFiles($user, $path, $verbose, OutputInterface $output, $b
 			if ($backgroundScan) {
 				$scanner->backgroundScan($path);
 			}else {
-				$scanner->scan($path);
+				$scanner->scan($path, $shouldRepair);
 			}
 		} catch (ForbiddenException $e) {
 			$output->writeln("<error>Home storage for user $user not writable</error>");
@@ -166,7 +201,7 @@ protected function scanFiles($user, $path, $verbose, OutputInterface $output, $b
 			$output->writeln('Interrupted by user');
 			return;
 		} catch (\Exception $e) {
-			$output->writeln('<error>Exception during scan: ' . $e->getMessage() . "\n" . $e->getTraceAsString() . '</error>');
+			$output->writeln('<error>Exception during scan: ' . get_class($e) . ': ' . $e->getMessage() . "\n" . $e->getTraceAsString() . '</error>');
 		}
 	}
 
@@ -225,7 +260,7 @@ protected function execute(InputInterface $input, OutputInterface $output) {
 				if ($verbose) {$output->writeln(""); }
 				$output->writeln("Starting scan for user $user_count out of $users_total ($user)");
 				# full: printout data if $verbose was set
-				$this->scanFiles($user, $path, $verbose, $output, $input->getOption('unscanned'));
+				$this->scanFiles($user, $path, $verbose, $output, $input->getOption('unscanned'), $input->getOption('repair'));
 			} else {
 				$output->writeln("<error>Unknown user $user_count $user</error>");
 			}

lib/private/Files/Utils/Scanner.php

@@ -196,7 +196,8 @@ public function scan($dir = '') {
 			}
 
 			// if the home storage isn't writable then the scanner is run as the wrong user
-			if ($storage->instanceOfStorage('\OC\Files\Storage\Home') and
+			$isHome = $storage->instanceOfStorage('\OC\Files\Storage\Home');
+			if ($isHome and
 				(!$storage->isCreatable('') or !$storage->isCreatable('files'))
 			) {
 				if ($storage->file_exists('') or $storage->getCache()->inCache('')) {
@@ -211,6 +212,9 @@ public function scan($dir = '') {
 			if ($storage->instanceOfStorage('OCA\Files_Sharing\ISharedStorage')) {
 				continue;
 			}
+
+			$this->emit('\OC\Files\Utils\Scanner', 'beforeScanStorage', [$storage]);
+
 			$relativePath = $mount->getInternalPath($dir);
 			$scanner = $storage->getScanner();
 			$scanner->setUseTransactions(false);
@@ -247,6 +251,7 @@ public function scan($dir = '') {
 			if ($this->useTransaction) {
 				$this->db->commit();
 			}
+			$this->emit('\OC\Files\Utils\Scanner', 'afterScanStorage', [$storage]);
 		}
 	}