nextcloud / server

lib/private/Files/ObjectStore/ObjectStoreScanner.php

Spacing +2 added lines, -2 removed lines

@@ -48,7 +48,7 @@ 
 		// find any path marked as unscanned and run the scanner until no more paths are unscanned (or we get stuck)
 		// we sort by path DESC to ensure that contents of a folder are handled before the parent folder
 		while (($path = $this->getIncomplete()) !== false && $path !== $lastPath) {
-			$this->runBackgroundScanJob(function () use ($path) {
+			$this->runBackgroundScanJob(function() use ($path) {
 				$item = $this->cache->get($path);
 				if ($item && $item->getMimeType() !== FileInfo::MIMETYPE_FOLDER) {
 					$fh = $this->storage->fopen($path, 'r');
@@ -93,6 +93,6 @@ 
 		}
 
 		// Make sure Oracle does not continue with null for empty strings
-		return (string)$path;
+		return (string) $path;
 	}
 }

lib/private/Files/Cache/Scanner.php

Spacing +9 added lines, -9 removed lines

@@ -336,7 +336,7 @@ 
 		}
 		if ($lock) {
 			if ($this->storage->instanceOfStorage('\OCP\Files\Storage\ILockingStorage')) {
-				$this->storage->acquireLock('scanner::' . $path, ILockingProvider::LOCK_EXCLUSIVE, $this->lockingProvider);
+				$this->storage->acquireLock('scanner::'.$path, ILockingProvider::LOCK_EXCLUSIVE, $this->lockingProvider);
 				$this->storage->acquireLock($path, ILockingProvider::LOCK_SHARED, $this->lockingProvider);
 			}
 		}
@@ -355,7 +355,7 @@ 
 			if ($lock) {
 				if ($this->storage->instanceOfStorage('\OCP\Files\Storage\ILockingStorage')) {
 					$this->storage->releaseLock($path, ILockingProvider::LOCK_SHARED, $this->lockingProvider);
-					$this->storage->releaseLock('scanner::' . $path, ILockingProvider::LOCK_EXCLUSIVE, $this->lockingProvider);
+					$this->storage->releaseLock('scanner::'.$path, ILockingProvider::LOCK_EXCLUSIVE, $this->lockingProvider);
 				}
 			}
 		}
@@ -448,14 +448,14 @@ 
 			$file = trim(\OC\Files\Filesystem::normalizePath($originalFile), '/');
 			if (trim($originalFile, '/') !== $file) {
 				// encoding mismatch, might require compatibility wrapper
-				\OC::$server->get(LoggerInterface::class)->debug('Scanner: Skipping non-normalized file name "'. $originalFile . '" in path "' . $path . '".', ['app' => 'core']);
-				$this->emit('\OC\Files\Cache\Scanner', 'normalizedNameMismatch', [$path ? $path . '/' . $originalFile : $originalFile]);
+				\OC::$server->get(LoggerInterface::class)->debug('Scanner: Skipping non-normalized file name "'.$originalFile.'" in path "'.$path.'".', ['app' => 'core']);
+				$this->emit('\OC\Files\Cache\Scanner', 'normalizedNameMismatch', [$path ? $path.'/'.$originalFile : $originalFile]);
 				// skip this entry
 				continue;
 			}
 
 			$newChildNames[] = $file;
-			$child = $path ? $path . '/' . $file : $file;
+			$child = $path ? $path.'/'.$file : $file;
 			try {
 				$existingData = isset($existingChildren[$file]) ? $existingChildren[$file] : false;
 				$data = $this->scanFile($child, $reuse, $folderId, $existingData, $lock, $fileMeta);
@@ -479,7 +479,7 @@ 
 					$this->connection->rollback();
 					$this->connection->beginTransaction();
 				}
-				\OC::$server->get(LoggerInterface::class)->debug('Exception while scanning file "' . $child . '"', [
+				\OC::$server->get(LoggerInterface::class)->debug('Exception while scanning file "'.$child.'"', [
 					'app' => 'core',
 					'exception' => $ex,
 				]);
@@ -493,7 +493,7 @@ 
 		}
 		$removedChildren = \array_diff(array_keys($existingChildren), $newChildNames);
 		foreach ($removedChildren as $childName) {
-			$child = $path ? $path . '/' . $childName : $childName;
+			$child = $path ? $path.'/'.$childName : $childName;
 			$this->removeFromCache($child);
 		}
 		if ($this->useTransactions) {
@@ -543,14 +543,14 @@ 
 		} else {
 			if (!$this->cache->inCache('')) {
 				// if the storage isn't in the cache yet, just scan the root completely
-				$this->runBackgroundScanJob(function () {
+				$this->runBackgroundScanJob(function() {
 					$this->scan('', self::SCAN_RECURSIVE, self::REUSE_ETAG);
 				}, '');
 			} else {
 				$lastPath = null;
 				// find any path marked as unscanned and run the scanner until no more paths are unscanned (or we get stuck)
 				while (($path = $this->cache->getIncomplete()) !== false && $path !== $lastPath) {
-					$this->runBackgroundScanJob(function () use ($path) {
+					$this->runBackgroundScanJob(function() use ($path) {
 						$this->scan($path, self::SCAN_RECURSIVE_INCOMPLETE, self::REUSE_ETAG | self::REUSE_SIZE);
 					}, $path);
 					// FIXME: this won't proceed with the next item, needs revamping of getIncomplete()