Inspection of "Merge pull request #51766 from nextcloud/info-file..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( f5f5a0...25ef41 )

unknown

created 2025-04-23 21:42 UTC

Status

Indentation +136 added lines, -136 removed lines patch added patch discarded remove patch

@@ -27,151 +27,151 @@
 block discarded – undo
 use Symfony\Component\Console\Output\OutputInterface;
 
 class File extends Command {
-	private IL10N $l10n;
-	private View $rootView;
+    private IL10N $l10n;
+    private View $rootView;
 
-	public function __construct(
-		IFactory $l10nFactory,
-		private FileUtils $fileUtils,
-		private \OC\Encryption\Util $encryptionUtil,
-	) {
-		$this->l10n = $l10nFactory->get('core');
-		parent::__construct();
-		$this->rootView = new View();
-	}
+    public function __construct(
+        IFactory $l10nFactory,
+        private FileUtils $fileUtils,
+        private \OC\Encryption\Util $encryptionUtil,
+    ) {
+        $this->l10n = $l10nFactory->get('core');
+        parent::__construct();
+        $this->rootView = new View();
+    }
 
-	protected function configure(): void {
-		$this
-			->setName('info:file')
-			->setDescription('get information for a file')
-			->addArgument('file', InputArgument::REQUIRED, 'File id or path')
-			->addOption('children', 'c', InputOption::VALUE_NONE, 'List children of folders')
-			->addOption('storage-tree', null, InputOption::VALUE_NONE, 'Show storage and cache wrapping tree');
-	}
+    protected function configure(): void {
+        $this
+            ->setName('info:file')
+            ->setDescription('get information for a file')
+            ->addArgument('file', InputArgument::REQUIRED, 'File id or path')
+            ->addOption('children', 'c', InputOption::VALUE_NONE, 'List children of folders')
+            ->addOption('storage-tree', null, InputOption::VALUE_NONE, 'Show storage and cache wrapping tree');
+    }
 
-	public function execute(InputInterface $input, OutputInterface $output): int {
-		$fileInput = $input->getArgument('file');
-		$showChildren = $input->getOption('children');
-		$node = $this->fileUtils->getNode($fileInput);
-		if (!$node) {
-			$output->writeln("<error>file $fileInput not found</error>");
-			return 1;
-		}
+    public function execute(InputInterface $input, OutputInterface $output): int {
+        $fileInput = $input->getArgument('file');
+        $showChildren = $input->getOption('children');
+        $node = $this->fileUtils->getNode($fileInput);
+        if (!$node) {
+            $output->writeln("<error>file $fileInput not found</error>");
+            return 1;
+        }
 
-		$output->writeln($node->getName());
-		$output->writeln('  fileid: ' . $node->getId());
-		$output->writeln('  mimetype: ' . $node->getMimetype());
-		$output->writeln('  modified: ' . (string)$this->l10n->l('datetime', $node->getMTime()));
+        $output->writeln($node->getName());
+        $output->writeln('  fileid: ' . $node->getId());
+        $output->writeln('  mimetype: ' . $node->getMimetype());
+        $output->writeln('  modified: ' . (string)$this->l10n->l('datetime', $node->getMTime()));
 
-		if ($node instanceof OCPFile && $node->isEncrypted()) {
-			$output->writeln('  ' . 'server-side encrypted: yes');
-			$keyPath = $this->encryptionUtil->getFileKeyDir('', $node->getPath());
-			if ($this->rootView->file_exists($keyPath)) {
-				$output->writeln('    encryption key at: ' . $keyPath);
-			} else {
-				$output->writeln('    <error>encryption key not found</error> should be located at: ' . $keyPath);
-			}
-		}
+        if ($node instanceof OCPFile && $node->isEncrypted()) {
+            $output->writeln('  ' . 'server-side encrypted: yes');
+            $keyPath = $this->encryptionUtil->getFileKeyDir('', $node->getPath());
+            if ($this->rootView->file_exists($keyPath)) {
+                $output->writeln('    encryption key at: ' . $keyPath);
+            } else {
+                $output->writeln('    <error>encryption key not found</error> should be located at: ' . $keyPath);
+            }
+        }
 
-		if ($node instanceof Folder && $node->isEncrypted() || $node instanceof OCPFile && $node->getParent()->isEncrypted()) {
-			$output->writeln('  ' . 'end-to-end encrypted: yes');
-		}
+        if ($node instanceof Folder && $node->isEncrypted() || $node instanceof OCPFile && $node->getParent()->isEncrypted()) {
+            $output->writeln('  ' . 'end-to-end encrypted: yes');
+        }
 
-		$output->writeln('  size: ' . Util::humanFileSize($node->getSize()));
-		$output->writeln('  etag: ' . $node->getEtag());
-		$output->writeln('  permissions: ' . $this->fileUtils->formatPermissions($node->getType(), $node->getPermissions()));
-		if ($node instanceof Folder) {
-			$children = $node->getDirectoryListing();
-			$childSize = array_sum(array_map(function (Node $node) {
-				return $node->getSize();
-			}, $children));
-			if ($childSize != $node->getSize()) {
-				$output->writeln('    <error>warning: folder has a size of ' . Util::humanFileSize($node->getSize()) . " but it's children sum up to " . Util::humanFileSize($childSize) . '</error>.');
-				$output->writeln('    Run <info>occ files:scan --path ' . $node->getPath() . '</info> to attempt to resolve this.');
-			}
-			if ($showChildren) {
-				$output->writeln('  children: ' . count($children) . ':');
-				foreach ($children as $child) {
-					$output->writeln('  - ' . $child->getName());
-				}
-			} else {
-				$output->writeln('  children: ' . count($children) . ' (use <info>--children</info> option to list)');
-			}
-		}
-		$this->outputStorageDetails($node->getMountPoint(), $node, $input, $output);
+        $output->writeln('  size: ' . Util::humanFileSize($node->getSize()));
+        $output->writeln('  etag: ' . $node->getEtag());
+        $output->writeln('  permissions: ' . $this->fileUtils->formatPermissions($node->getType(), $node->getPermissions()));
+        if ($node instanceof Folder) {
+            $children = $node->getDirectoryListing();
+            $childSize = array_sum(array_map(function (Node $node) {
+                return $node->getSize();
+            }, $children));
+            if ($childSize != $node->getSize()) {
+                $output->writeln('    <error>warning: folder has a size of ' . Util::humanFileSize($node->getSize()) . " but it's children sum up to " . Util::humanFileSize($childSize) . '</error>.');
+                $output->writeln('    Run <info>occ files:scan --path ' . $node->getPath() . '</info> to attempt to resolve this.');
+            }
+            if ($showChildren) {
+                $output->writeln('  children: ' . count($children) . ':');
+                foreach ($children as $child) {
+                    $output->writeln('  - ' . $child->getName());
+                }
+            } else {
+                $output->writeln('  children: ' . count($children) . ' (use <info>--children</info> option to list)');
+            }
+        }
+        $this->outputStorageDetails($node->getMountPoint(), $node, $input, $output);
 
-		$filesPerUser = $this->fileUtils->getFilesByUser($node);
-		$output->writeln('');
-		$output->writeln('The following users have access to the file');
-		$output->writeln('');
-		foreach ($filesPerUser as $user => $files) {
-			$output->writeln("$user:");
-			foreach ($files as $userFile) {
-				$output->writeln('  ' . $userFile->getPath() . ': ' . $this->fileUtils->formatPermissions($userFile->getType(), $userFile->getPermissions()));
-				$mount = $userFile->getMountPoint();
-				$output->writeln('    ' . $this->fileUtils->formatMountType($mount));
-			}
-		}
+        $filesPerUser = $this->fileUtils->getFilesByUser($node);
+        $output->writeln('');
+        $output->writeln('The following users have access to the file');
+        $output->writeln('');
+        foreach ($filesPerUser as $user => $files) {
+            $output->writeln("$user:");
+            foreach ($files as $userFile) {
+                $output->writeln('  ' . $userFile->getPath() . ': ' . $this->fileUtils->formatPermissions($userFile->getType(), $userFile->getPermissions()));
+                $mount = $userFile->getMountPoint();
+                $output->writeln('    ' . $this->fileUtils->formatMountType($mount));
+            }
+        }
 
-		return 0;
-	}
+        return 0;
+    }
 
-	/**
-	 * @psalm-suppress UndefinedClass
-	 * @psalm-suppress UndefinedInterfaceMethod
-	 */
-	private function outputStorageDetails(IMountPoint $mountPoint, Node $node, InputInterface $input, OutputInterface $output): void {
-		$storage = $mountPoint->getStorage();
-		if (!$storage) {
-			return;
-		}
-		if (!$storage->instanceOfStorage(IHomeStorage::class)) {
-			$output->writeln('  mounted at: ' . $mountPoint->getMountPoint());
-		}
-		if ($storage->instanceOfStorage(ObjectStoreStorage::class)) {
-			/** @var ObjectStoreStorage $storage */
-			$objectStoreId = $storage->getObjectStore()->getStorageId();
-			$parts = explode(':', $objectStoreId);
-			/** @var string $bucket */
-			$bucket = array_pop($parts);
-			$output->writeln('  bucket: ' . $bucket);
-			if ($node instanceof \OC\Files\Node\File) {
-				$output->writeln('  object id: ' . $storage->getURN($node->getId()));
-				try {
-					$fh = $node->fopen('r');
-					if (!$fh) {
-						throw new NotFoundException();
-					}
-					$stat = fstat($fh);
-					fclose($fh);
-					if ($stat['size'] !== $node->getSize()) {
-						$output->writeln('  <error>warning: object had a size of ' . $stat['size'] . ' but cache entry has a size of ' . $node->getSize() . '</error>. This should have been automatically repaired');
-					}
-				} catch (\Exception $e) {
-					$output->writeln('  <error>warning: object not found in bucket</error>');
-				}
-			}
-		} else {
-			if (!$storage->file_exists($node->getInternalPath())) {
-				$output->writeln('  <error>warning: file not found in storage</error>');
-			}
-		}
-		if ($mountPoint instanceof ExternalMountPoint) {
-			$storageConfig = $mountPoint->getStorageConfig();
-			$output->writeln('  external storage id: ' . $storageConfig->getId());
-			$output->writeln('  external type: ' . $storageConfig->getBackend()->getText());
-		} elseif ($mountPoint instanceof GroupMountPoint) {
-			$output->writeln('  groupfolder id: ' . $mountPoint->getFolderId());
-		}
-		if ($input->getOption('storage-tree')) {
-			$storageTmp = $storage;
-			$storageClass = get_class($storageTmp) . ' (cache:' . get_class($storageTmp->getCache()) . ')';
-			while ($storageTmp instanceof \OC\Files\Storage\Wrapper\Wrapper) {
-				$storageTmp = $storageTmp->getWrapperStorage();
-				$storageClass .= "\n\t" . '> ' . get_class($storageTmp) . ' (cache:' . get_class($storageTmp->getCache()) . ')';
-			}
-			$output->writeln('  storage wrapping: ' . $storageClass);
-		}
+    /**
+     * @psalm-suppress UndefinedClass
+     * @psalm-suppress UndefinedInterfaceMethod
+     */
+    private function outputStorageDetails(IMountPoint $mountPoint, Node $node, InputInterface $input, OutputInterface $output): void {
+        $storage = $mountPoint->getStorage();
+        if (!$storage) {
+            return;
+        }
+        if (!$storage->instanceOfStorage(IHomeStorage::class)) {
+            $output->writeln('  mounted at: ' . $mountPoint->getMountPoint());
+        }
+        if ($storage->instanceOfStorage(ObjectStoreStorage::class)) {
+            /** @var ObjectStoreStorage $storage */
+            $objectStoreId = $storage->getObjectStore()->getStorageId();
+            $parts = explode(':', $objectStoreId);
+            /** @var string $bucket */
+            $bucket = array_pop($parts);
+            $output->writeln('  bucket: ' . $bucket);
+            if ($node instanceof \OC\Files\Node\File) {
+                $output->writeln('  object id: ' . $storage->getURN($node->getId()));
+                try {
+                    $fh = $node->fopen('r');
+                    if (!$fh) {
+                        throw new NotFoundException();
+                    }
+                    $stat = fstat($fh);
+                    fclose($fh);
+                    if ($stat['size'] !== $node->getSize()) {
+                        $output->writeln('  <error>warning: object had a size of ' . $stat['size'] . ' but cache entry has a size of ' . $node->getSize() . '</error>. This should have been automatically repaired');
+                    }
+                } catch (\Exception $e) {
+                    $output->writeln('  <error>warning: object not found in bucket</error>');
+                }
+            }
+        } else {
+            if (!$storage->file_exists($node->getInternalPath())) {
+                $output->writeln('  <error>warning: file not found in storage</error>');
+            }
+        }
+        if ($mountPoint instanceof ExternalMountPoint) {
+            $storageConfig = $mountPoint->getStorageConfig();
+            $output->writeln('  external storage id: ' . $storageConfig->getId());
+            $output->writeln('  external type: ' . $storageConfig->getBackend()->getText());
+        } elseif ($mountPoint instanceof GroupMountPoint) {
+            $output->writeln('  groupfolder id: ' . $mountPoint->getFolderId());
+        }
+        if ($input->getOption('storage-tree')) {
+            $storageTmp = $storage;
+            $storageClass = get_class($storageTmp) . ' (cache:' . get_class($storageTmp->getCache()) . ')';
+            while ($storageTmp instanceof \OC\Files\Storage\Wrapper\Wrapper) {
+                $storageTmp = $storageTmp->getWrapperStorage();
+                $storageClass .= "\n\t" . '> ' . get_class($storageTmp) . ' (cache:' . get_class($storageTmp->getCache()) . ')';
+            }
+            $output->writeln('  storage wrapping: ' . $storageClass);
+        }
 
-	}
+    }
 }

Please login to merge, or discard this patch.

Spacing +28 added lines, -28 removed lines patch added patch discarded remove patch

@@ -59,43 +59,43 @@  discard block
 block discarded – undo
 		}
 
 		$output->writeln($node->getName());
-		$output->writeln('  fileid: ' . $node->getId());
-		$output->writeln('  mimetype: ' . $node->getMimetype());
-		$output->writeln('  modified: ' . (string)$this->l10n->l('datetime', $node->getMTime()));
+		$output->writeln('  fileid: '.$node->getId());
+		$output->writeln('  mimetype: '.$node->getMimetype());
+		$output->writeln('  modified: '.(string) $this->l10n->l('datetime', $node->getMTime()));
 
 		if ($node instanceof OCPFile && $node->isEncrypted()) {
-			$output->writeln('  ' . 'server-side encrypted: yes');
+			$output->writeln('  '.'server-side encrypted: yes');
 			$keyPath = $this->encryptionUtil->getFileKeyDir('', $node->getPath());
 			if ($this->rootView->file_exists($keyPath)) {
-				$output->writeln('    encryption key at: ' . $keyPath);
+				$output->writeln('    encryption key at: '.$keyPath);
 			} else {
-				$output->writeln('    <error>encryption key not found</error> should be located at: ' . $keyPath);
+				$output->writeln('    <error>encryption key not found</error> should be located at: '.$keyPath);
 			}
 		}
 
 		if ($node instanceof Folder && $node->isEncrypted() || $node instanceof OCPFile && $node->getParent()->isEncrypted()) {
-			$output->writeln('  ' . 'end-to-end encrypted: yes');
+			$output->writeln('  '.'end-to-end encrypted: yes');
 		}
 
-		$output->writeln('  size: ' . Util::humanFileSize($node->getSize()));
-		$output->writeln('  etag: ' . $node->getEtag());
-		$output->writeln('  permissions: ' . $this->fileUtils->formatPermissions($node->getType(), $node->getPermissions()));
+		$output->writeln('  size: '.Util::humanFileSize($node->getSize()));
+		$output->writeln('  etag: '.$node->getEtag());
+		$output->writeln('  permissions: '.$this->fileUtils->formatPermissions($node->getType(), $node->getPermissions()));
 		if ($node instanceof Folder) {
 			$children = $node->getDirectoryListing();
-			$childSize = array_sum(array_map(function (Node $node) {
+			$childSize = array_sum(array_map(function(Node $node) {
 				return $node->getSize();
 			}, $children));
 			if ($childSize != $node->getSize()) {
-				$output->writeln('    <error>warning: folder has a size of ' . Util::humanFileSize($node->getSize()) . " but it's children sum up to " . Util::humanFileSize($childSize) . '</error>.');
-				$output->writeln('    Run <info>occ files:scan --path ' . $node->getPath() . '</info> to attempt to resolve this.');
+				$output->writeln('    <error>warning: folder has a size of '.Util::humanFileSize($node->getSize())." but it's children sum up to ".Util::humanFileSize($childSize).'</error>.');
+				$output->writeln('    Run <info>occ files:scan --path '.$node->getPath().'</info> to attempt to resolve this.');
 			}
 			if ($showChildren) {
-				$output->writeln('  children: ' . count($children) . ':');
+				$output->writeln('  children: '.count($children).':');
 				foreach ($children as $child) {
-					$output->writeln('  - ' . $child->getName());
+					$output->writeln('  - '.$child->getName());
 				}
 			} else {
-				$output->writeln('  children: ' . count($children) . ' (use <info>--children</info> option to list)');
+				$output->writeln('  children: '.count($children).' (use <info>--children</info> option to list)');
 			}
 		}
 		$this->outputStorageDetails($node->getMountPoint(), $node, $input, $output);
@@ -107,9 +107,9 @@  discard block
 block discarded – undo
 		foreach ($filesPerUser as $user => $files) {
 			$output->writeln("$user:");
 			foreach ($files as $userFile) {
-				$output->writeln('  ' . $userFile->getPath() . ': ' . $this->fileUtils->formatPermissions($userFile->getType(), $userFile->getPermissions()));
+				$output->writeln('  '.$userFile->getPath().': '.$this->fileUtils->formatPermissions($userFile->getType(), $userFile->getPermissions()));
 				$mount = $userFile->getMountPoint();
-				$output->writeln('    ' . $this->fileUtils->formatMountType($mount));
+				$output->writeln('    '.$this->fileUtils->formatMountType($mount));
 			}
 		}
 
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
 			return;
 		}
 		if (!$storage->instanceOfStorage(IHomeStorage::class)) {
-			$output->writeln('  mounted at: ' . $mountPoint->getMountPoint());
+			$output->writeln('  mounted at: '.$mountPoint->getMountPoint());
 		}
 		if ($storage->instanceOfStorage(ObjectStoreStorage::class)) {
 			/** @var ObjectStoreStorage $storage */
@@ -134,9 +134,9 @@  discard block
 block discarded – undo
 			$parts = explode(':', $objectStoreId);
 			/** @var string $bucket */
 			$bucket = array_pop($parts);
-			$output->writeln('  bucket: ' . $bucket);
+			$output->writeln('  bucket: '.$bucket);
 			if ($node instanceof \OC\Files\Node\File) {
-				$output->writeln('  object id: ' . $storage->getURN($node->getId()));
+				$output->writeln('  object id: '.$storage->getURN($node->getId()));
 				try {
 					$fh = $node->fopen('r');
 					if (!$fh) {
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
 					$stat = fstat($fh);
 					fclose($fh);
 					if ($stat['size'] !== $node->getSize()) {
-						$output->writeln('  <error>warning: object had a size of ' . $stat['size'] . ' but cache entry has a size of ' . $node->getSize() . '</error>. This should have been automatically repaired');
+						$output->writeln('  <error>warning: object had a size of '.$stat['size'].' but cache entry has a size of '.$node->getSize().'</error>. This should have been automatically repaired');
 					}
 				} catch (\Exception $e) {
 					$output->writeln('  <error>warning: object not found in bucket</error>');
@@ -158,19 +158,19 @@  discard block
 block discarded – undo
 		}
 		if ($mountPoint instanceof ExternalMountPoint) {
 			$storageConfig = $mountPoint->getStorageConfig();
-			$output->writeln('  external storage id: ' . $storageConfig->getId());
-			$output->writeln('  external type: ' . $storageConfig->getBackend()->getText());
+			$output->writeln('  external storage id: '.$storageConfig->getId());
+			$output->writeln('  external type: '.$storageConfig->getBackend()->getText());
 		} elseif ($mountPoint instanceof GroupMountPoint) {
-			$output->writeln('  groupfolder id: ' . $mountPoint->getFolderId());
+			$output->writeln('  groupfolder id: '.$mountPoint->getFolderId());
 		}
 		if ($input->getOption('storage-tree')) {
 			$storageTmp = $storage;
-			$storageClass = get_class($storageTmp) . ' (cache:' . get_class($storageTmp->getCache()) . ')';
+			$storageClass = get_class($storageTmp).' (cache:'.get_class($storageTmp->getCache()).')';
 			while ($storageTmp instanceof \OC\Files\Storage\Wrapper\Wrapper) {
 				$storageTmp = $storageTmp->getWrapperStorage();
-				$storageClass .= "\n\t" . '> ' . get_class($storageTmp) . ' (cache:' . get_class($storageTmp->getCache()) . ')';
+				$storageClass .= "\n\t".'> '.get_class($storageTmp).' (cache:'.get_class($storageTmp->getCache()).')';
 			}
-			$output->writeln('  storage wrapping: ' . $storageClass);
+			$output->writeln('  storage wrapping: '.$storageClass);
 		}
 
 	}

Please login to merge, or discard this patch.

		@@ -59,43 +59,43 @@ discard block
		block discarded – undo
59	59	}
60	60
61	61	$output->writeln($node->getName());
62		- $output->writeln(' fileid: ' . $node->getId());
63		- $output->writeln(' mimetype: ' . $node->getMimetype());
64		- $output->writeln(' modified: ' . (string)$this->l10n->l('datetime', $node->getMTime()));
	62	+ $output->writeln(' fileid: '.$node->getId());
	63	+ $output->writeln(' mimetype: '.$node->getMimetype());
	64	+ $output->writeln(' modified: '.(string) $this->l10n->l('datetime', $node->getMTime()));
65	65
66	66	if ($node instanceof OCPFile && $node->isEncrypted()) {
67		- $output->writeln(' ' . 'server-side encrypted: yes');
	67	+ $output->writeln(' '.'server-side encrypted: yes');
68	68	$keyPath = $this->encryptionUtil->getFileKeyDir('', $node->getPath());
69	69	if ($this->rootView->file_exists($keyPath)) {
70		- $output->writeln(' encryption key at: ' . $keyPath);
	70	+ $output->writeln(' encryption key at: '.$keyPath);
71	71	} else {
72		- $output->writeln(' <error>encryption key not found</error> should be located at: ' . $keyPath);
	72	+ $output->writeln(' <error>encryption key not found</error> should be located at: '.$keyPath);
73	73	}
74	74	}
75	75
76	76	if ($node instanceof Folder && $node->isEncrypted() \|\| $node instanceof OCPFile && $node->getParent()->isEncrypted()) {
77		- $output->writeln(' ' . 'end-to-end encrypted: yes');
	77	+ $output->writeln(' '.'end-to-end encrypted: yes');
78	78	}
79	79
80		- $output->writeln(' size: ' . Util::humanFileSize($node->getSize()));
81		- $output->writeln(' etag: ' . $node->getEtag());
82		- $output->writeln(' permissions: ' . $this->fileUtils->formatPermissions($node->getType(), $node->getPermissions()));
	80	+ $output->writeln(' size: '.Util::humanFileSize($node->getSize()));
	81	+ $output->writeln(' etag: '.$node->getEtag());
	82	+ $output->writeln(' permissions: '.$this->fileUtils->formatPermissions($node->getType(), $node->getPermissions()));
83	83	if ($node instanceof Folder) {
84	84	$children = $node->getDirectoryListing();
85		- $childSize = array_sum(array_map(function (Node $node) {
	85	+ $childSize = array_sum(array_map(function(Node $node) {
86	86	return $node->getSize();
87	87	}, $children));
88	88	if ($childSize != $node->getSize()) {
89		- $output->writeln(' <error>warning: folder has a size of ' . Util::humanFileSize($node->getSize()) . " but it's children sum up to " . Util::humanFileSize($childSize) . '</error>.');
90		- $output->writeln(' Run <info>occ files:scan --path ' . $node->getPath() . '</info> to attempt to resolve this.');
	89	+ $output->writeln(' <error>warning: folder has a size of '.Util::humanFileSize($node->getSize())." but it's children sum up to ".Util::humanFileSize($childSize).'</error>.');
	90	+ $output->writeln(' Run <info>occ files:scan --path '.$node->getPath().'</info> to attempt to resolve this.');
91	91	}
92	92	if ($showChildren) {
93		- $output->writeln(' children: ' . count($children) . ':');
	93	+ $output->writeln(' children: '.count($children).':');
94	94	foreach ($children as $child) {
95		- $output->writeln(' - ' . $child->getName());
	95	+ $output->writeln(' - '.$child->getName());
96	96	}
97	97	} else {
98		- $output->writeln(' children: ' . count($children) . ' (use <info>--children</info> option to list)');
	98	+ $output->writeln(' children: '.count($children).' (use <info>--children</info> option to list)');
99	99	}
100	100	}
101	101	$this->outputStorageDetails($node->getMountPoint(), $node, $input, $output);
		@@ -107,9 +107,9 @@ discard block
		block discarded – undo
107	107	foreach ($filesPerUser as $user => $files) {
108	108	$output->writeln("$user:");
109	109	foreach ($files as $userFile) {
110		- $output->writeln(' ' . $userFile->getPath() . ': ' . $this->fileUtils->formatPermissions($userFile->getType(), $userFile->getPermissions()));
	110	+ $output->writeln(' '.$userFile->getPath().': '.$this->fileUtils->formatPermissions($userFile->getType(), $userFile->getPermissions()));
111	111	$mount = $userFile->getMountPoint();
112		- $output->writeln(' ' . $this->fileUtils->formatMountType($mount));
	112	+ $output->writeln(' '.$this->fileUtils->formatMountType($mount));
113	113	}
114	114	}
115	115
		@@ -126,7 +126,7 @@ discard block
		block discarded – undo
126	126	return;
127	127	}
128	128	if (!$storage->instanceOfStorage(IHomeStorage::class)) {
129		- $output->writeln(' mounted at: ' . $mountPoint->getMountPoint());
	129	+ $output->writeln(' mounted at: '.$mountPoint->getMountPoint());
130	130	}
131	131	if ($storage->instanceOfStorage(ObjectStoreStorage::class)) {
132	132	/** @var ObjectStoreStorage $storage */
		@@ -134,9 +134,9 @@ discard block
		block discarded – undo
134	134	$parts = explode(':', $objectStoreId);
135	135	/** @var string $bucket */
136	136	$bucket = array_pop($parts);
137		- $output->writeln(' bucket: ' . $bucket);
	137	+ $output->writeln(' bucket: '.$bucket);
138	138	if ($node instanceof \OC\Files\Node\File) {
139		- $output->writeln(' object id: ' . $storage->getURN($node->getId()));
	139	+ $output->writeln(' object id: '.$storage->getURN($node->getId()));
140	140	try {
141	141	$fh = $node->fopen('r');
142	142	if (!$fh) {
		@@ -145,7 +145,7 @@ discard block
		block discarded – undo
145	145	$stat = fstat($fh);
146	146	fclose($fh);
147	147	if ($stat['size'] !== $node->getSize()) {
148		- $output->writeln(' <error>warning: object had a size of ' . $stat['size'] . ' but cache entry has a size of ' . $node->getSize() . '</error>. This should have been automatically repaired');
	148	+ $output->writeln(' <error>warning: object had a size of '.$stat['size'].' but cache entry has a size of '.$node->getSize().'</error>. This should have been automatically repaired');
149	149	}
150	150	} catch (\Exception $e) {
151	151	$output->writeln(' <error>warning: object not found in bucket</error>');
		@@ -158,19 +158,19 @@ discard block
		block discarded – undo
158	158	}
159	159	if ($mountPoint instanceof ExternalMountPoint) {
160	160	$storageConfig = $mountPoint->getStorageConfig();
161		- $output->writeln(' external storage id: ' . $storageConfig->getId());
162		- $output->writeln(' external type: ' . $storageConfig->getBackend()->getText());
	161	+ $output->writeln(' external storage id: '.$storageConfig->getId());
	162	+ $output->writeln(' external type: '.$storageConfig->getBackend()->getText());
163	163	} elseif ($mountPoint instanceof GroupMountPoint) {
164		- $output->writeln(' groupfolder id: ' . $mountPoint->getFolderId());
	164	+ $output->writeln(' groupfolder id: '.$mountPoint->getFolderId());
165	165	}
166	166	if ($input->getOption('storage-tree')) {
167	167	$storageTmp = $storage;
168		- $storageClass = get_class($storageTmp) . ' (cache:' . get_class($storageTmp->getCache()) . ')';
	168	+ $storageClass = get_class($storageTmp).' (cache:'.get_class($storageTmp->getCache()).')';
169	169	while ($storageTmp instanceof \OC\Files\Storage\Wrapper\Wrapper) {
170	170	$storageTmp = $storageTmp->getWrapperStorage();
171		- $storageClass .= "\n\t" . '> ' . get_class($storageTmp) . ' (cache:' . get_class($storageTmp->getCache()) . ')';
	171	+ $storageClass .= "\n\t".'> '.get_class($storageTmp).' (cache:'.get_class($storageTmp->getCache()).')';
172	172	}
173		- $output->writeln(' storage wrapping: ' . $storageClass);
	173	+ $output->writeln(' storage wrapping: '.$storageClass);
174	174	}
175	175
176	176	}

		@@ -27,151 +27,151 @@
		block discarded – undo
27	27	use Symfony\Component\Console\Output\OutputInterface;
28	28
29	29	class File extends Command {
30		- private IL10N $l10n;
31		- private View $rootView;
	30	+ private IL10N $l10n;
	31	+ private View $rootView;
32	32
33		- public function __construct(
34		- IFactory $l10nFactory,
35		- private FileUtils $fileUtils,
36		- private \OC\Encryption\Util $encryptionUtil,
37		- ) {
38		- $this->l10n = $l10nFactory->get('core');
39		- parent::__construct();
40		- $this->rootView = new View();
41		- }
	33	+ public function __construct(
	34	+ IFactory $l10nFactory,
	35	+ private FileUtils $fileUtils,
	36	+ private \OC\Encryption\Util $encryptionUtil,
	37	+ ) {
	38	+ $this->l10n = $l10nFactory->get('core');
	39	+ parent::__construct();
	40	+ $this->rootView = new View();
	41	+ }
42	42
43		- protected function configure(): void {
44		- $this
45		- ->setName('info:file')
46		- ->setDescription('get information for a file')
47		- ->addArgument('file', InputArgument::REQUIRED, 'File id or path')
48		- ->addOption('children', 'c', InputOption::VALUE_NONE, 'List children of folders')
49		- ->addOption('storage-tree', null, InputOption::VALUE_NONE, 'Show storage and cache wrapping tree');
50		- }
	43	+ protected function configure(): void {
	44	+ $this
	45	+ ->setName('info:file')
	46	+ ->setDescription('get information for a file')
	47	+ ->addArgument('file', InputArgument::REQUIRED, 'File id or path')
	48	+ ->addOption('children', 'c', InputOption::VALUE_NONE, 'List children of folders')
	49	+ ->addOption('storage-tree', null, InputOption::VALUE_NONE, 'Show storage and cache wrapping tree');
	50	+ }
51	51
52		- public function execute(InputInterface $input, OutputInterface $output): int {
53		- $fileInput = $input->getArgument('file');
54		- $showChildren = $input->getOption('children');
55		- $node = $this->fileUtils->getNode($fileInput);
56		- if (!$node) {
57		- $output->writeln("<error>file $fileInput not found</error>");
58		- return 1;
59		- }
	52	+ public function execute(InputInterface $input, OutputInterface $output): int {
	53	+ $fileInput = $input->getArgument('file');
	54	+ $showChildren = $input->getOption('children');
	55	+ $node = $this->fileUtils->getNode($fileInput);
	56	+ if (!$node) {
	57	+ $output->writeln("<error>file $fileInput not found</error>");
	58	+ return 1;
	59	+ }
60	60
61		- $output->writeln($node->getName());
62		- $output->writeln(' fileid: ' . $node->getId());
63		- $output->writeln(' mimetype: ' . $node->getMimetype());
64		- $output->writeln(' modified: ' . (string)$this->l10n->l('datetime', $node->getMTime()));
	61	+ $output->writeln($node->getName());
	62	+ $output->writeln(' fileid: ' . $node->getId());
	63	+ $output->writeln(' mimetype: ' . $node->getMimetype());
	64	+ $output->writeln(' modified: ' . (string)$this->l10n->l('datetime', $node->getMTime()));
65	65
66		- if ($node instanceof OCPFile && $node->isEncrypted()) {
67		- $output->writeln(' ' . 'server-side encrypted: yes');
68		- $keyPath = $this->encryptionUtil->getFileKeyDir('', $node->getPath());
69		- if ($this->rootView->file_exists($keyPath)) {
70		- $output->writeln(' encryption key at: ' . $keyPath);
71		- } else {
72		- $output->writeln(' <error>encryption key not found</error> should be located at: ' . $keyPath);
73		- }
74		- }
	66	+ if ($node instanceof OCPFile && $node->isEncrypted()) {
	67	+ $output->writeln(' ' . 'server-side encrypted: yes');
	68	+ $keyPath = $this->encryptionUtil->getFileKeyDir('', $node->getPath());
	69	+ if ($this->rootView->file_exists($keyPath)) {
	70	+ $output->writeln(' encryption key at: ' . $keyPath);
	71	+ } else {
	72	+ $output->writeln(' <error>encryption key not found</error> should be located at: ' . $keyPath);
	73	+ }
	74	+ }
75	75
76		- if ($node instanceof Folder && $node->isEncrypted() \|\| $node instanceof OCPFile && $node->getParent()->isEncrypted()) {
77		- $output->writeln(' ' . 'end-to-end encrypted: yes');
78		- }
	76	+ if ($node instanceof Folder && $node->isEncrypted() \|\| $node instanceof OCPFile && $node->getParent()->isEncrypted()) {
	77	+ $output->writeln(' ' . 'end-to-end encrypted: yes');
	78	+ }
79	79
80		- $output->writeln(' size: ' . Util::humanFileSize($node->getSize()));
81		- $output->writeln(' etag: ' . $node->getEtag());
82		- $output->writeln(' permissions: ' . $this->fileUtils->formatPermissions($node->getType(), $node->getPermissions()));
83		- if ($node instanceof Folder) {
84		- $children = $node->getDirectoryListing();
85		- $childSize = array_sum(array_map(function (Node $node) {
86		- return $node->getSize();
87		- }, $children));
88		- if ($childSize != $node->getSize()) {
89		- $output->writeln(' <error>warning: folder has a size of ' . Util::humanFileSize($node->getSize()) . " but it's children sum up to " . Util::humanFileSize($childSize) . '</error>.');
90		- $output->writeln(' Run <info>occ files:scan --path ' . $node->getPath() . '</info> to attempt to resolve this.');
91		- }
92		- if ($showChildren) {
93		- $output->writeln(' children: ' . count($children) . ':');
94		- foreach ($children as $child) {
95		- $output->writeln(' - ' . $child->getName());
96		- }
97		- } else {
98		- $output->writeln(' children: ' . count($children) . ' (use <info>--children</info> option to list)');
99		- }
100		- }
101		- $this->outputStorageDetails($node->getMountPoint(), $node, $input, $output);
	80	+ $output->writeln(' size: ' . Util::humanFileSize($node->getSize()));
	81	+ $output->writeln(' etag: ' . $node->getEtag());
	82	+ $output->writeln(' permissions: ' . $this->fileUtils->formatPermissions($node->getType(), $node->getPermissions()));
	83	+ if ($node instanceof Folder) {
	84	+ $children = $node->getDirectoryListing();
	85	+ $childSize = array_sum(array_map(function (Node $node) {
	86	+ return $node->getSize();
	87	+ }, $children));
	88	+ if ($childSize != $node->getSize()) {
	89	+ $output->writeln(' <error>warning: folder has a size of ' . Util::humanFileSize($node->getSize()) . " but it's children sum up to " . Util::humanFileSize($childSize) . '</error>.');
	90	+ $output->writeln(' Run <info>occ files:scan --path ' . $node->getPath() . '</info> to attempt to resolve this.');
	91	+ }
	92	+ if ($showChildren) {
	93	+ $output->writeln(' children: ' . count($children) . ':');
	94	+ foreach ($children as $child) {
	95	+ $output->writeln(' - ' . $child->getName());
	96	+ }
	97	+ } else {
	98	+ $output->writeln(' children: ' . count($children) . ' (use <info>--children</info> option to list)');
	99	+ }
	100	+ }
	101	+ $this->outputStorageDetails($node->getMountPoint(), $node, $input, $output);
102	102
103		- $filesPerUser = $this->fileUtils->getFilesByUser($node);
104		- $output->writeln('');
105		- $output->writeln('The following users have access to the file');
106		- $output->writeln('');
107		- foreach ($filesPerUser as $user => $files) {
108		- $output->writeln("$user:");
109		- foreach ($files as $userFile) {
110		- $output->writeln(' ' . $userFile->getPath() . ': ' . $this->fileUtils->formatPermissions($userFile->getType(), $userFile->getPermissions()));
111		- $mount = $userFile->getMountPoint();
112		- $output->writeln(' ' . $this->fileUtils->formatMountType($mount));
113		- }
114		- }
	103	+ $filesPerUser = $this->fileUtils->getFilesByUser($node);
	104	+ $output->writeln('');
	105	+ $output->writeln('The following users have access to the file');
	106	+ $output->writeln('');
	107	+ foreach ($filesPerUser as $user => $files) {
	108	+ $output->writeln("$user:");
	109	+ foreach ($files as $userFile) {
	110	+ $output->writeln(' ' . $userFile->getPath() . ': ' . $this->fileUtils->formatPermissions($userFile->getType(), $userFile->getPermissions()));
	111	+ $mount = $userFile->getMountPoint();
	112	+ $output->writeln(' ' . $this->fileUtils->formatMountType($mount));
	113	+ }
	114	+ }
115	115
116		- return 0;
117		- }
	116	+ return 0;
	117	+ }
118	118
119		- /**
120		- * @psalm-suppress UndefinedClass
121		- * @psalm-suppress UndefinedInterfaceMethod
122		- */
123		- private function outputStorageDetails(IMountPoint $mountPoint, Node $node, InputInterface $input, OutputInterface $output): void {
124		- $storage = $mountPoint->getStorage();
125		- if (!$storage) {
126		- return;
127		- }
128		- if (!$storage->instanceOfStorage(IHomeStorage::class)) {
129		- $output->writeln(' mounted at: ' . $mountPoint->getMountPoint());
130		- }
131		- if ($storage->instanceOfStorage(ObjectStoreStorage::class)) {
132		- /** @var ObjectStoreStorage $storage */
133		- $objectStoreId = $storage->getObjectStore()->getStorageId();
134		- $parts = explode(':', $objectStoreId);
135		- /** @var string $bucket */
136		- $bucket = array_pop($parts);
137		- $output->writeln(' bucket: ' . $bucket);
138		- if ($node instanceof \OC\Files\Node\File) {
139		- $output->writeln(' object id: ' . $storage->getURN($node->getId()));
140		- try {
141		- $fh = $node->fopen('r');
142		- if (!$fh) {
143		- throw new NotFoundException();
144		- }
145		- $stat = fstat($fh);
146		- fclose($fh);
147		- if ($stat['size'] !== $node->getSize()) {
148		- $output->writeln(' <error>warning: object had a size of ' . $stat['size'] . ' but cache entry has a size of ' . $node->getSize() . '</error>. This should have been automatically repaired');
149		- }
150		- } catch (\Exception $e) {
151		- $output->writeln(' <error>warning: object not found in bucket</error>');
152		- }
153		- }
154		- } else {
155		- if (!$storage->file_exists($node->getInternalPath())) {
156		- $output->writeln(' <error>warning: file not found in storage</error>');
157		- }
158		- }
159		- if ($mountPoint instanceof ExternalMountPoint) {
160		- $storageConfig = $mountPoint->getStorageConfig();
161		- $output->writeln(' external storage id: ' . $storageConfig->getId());
162		- $output->writeln(' external type: ' . $storageConfig->getBackend()->getText());
163		- } elseif ($mountPoint instanceof GroupMountPoint) {
164		- $output->writeln(' groupfolder id: ' . $mountPoint->getFolderId());
165		- }
166		- if ($input->getOption('storage-tree')) {
167		- $storageTmp = $storage;
168		- $storageClass = get_class($storageTmp) . ' (cache:' . get_class($storageTmp->getCache()) . ')';
169		- while ($storageTmp instanceof \OC\Files\Storage\Wrapper\Wrapper) {
170		- $storageTmp = $storageTmp->getWrapperStorage();
171		- $storageClass .= "\n\t" . '> ' . get_class($storageTmp) . ' (cache:' . get_class($storageTmp->getCache()) . ')';
172		- }
173		- $output->writeln(' storage wrapping: ' . $storageClass);
174		- }
	119	+ /**
	120	+ * @psalm-suppress UndefinedClass
	121	+ * @psalm-suppress UndefinedInterfaceMethod
	122	+ */
	123	+ private function outputStorageDetails(IMountPoint $mountPoint, Node $node, InputInterface $input, OutputInterface $output): void {
	124	+ $storage = $mountPoint->getStorage();
	125	+ if (!$storage) {
	126	+ return;
	127	+ }
	128	+ if (!$storage->instanceOfStorage(IHomeStorage::class)) {
	129	+ $output->writeln(' mounted at: ' . $mountPoint->getMountPoint());
	130	+ }
	131	+ if ($storage->instanceOfStorage(ObjectStoreStorage::class)) {
	132	+ /** @var ObjectStoreStorage $storage */
	133	+ $objectStoreId = $storage->getObjectStore()->getStorageId();
	134	+ $parts = explode(':', $objectStoreId);
	135	+ /** @var string $bucket */
	136	+ $bucket = array_pop($parts);
	137	+ $output->writeln(' bucket: ' . $bucket);
	138	+ if ($node instanceof \OC\Files\Node\File) {
	139	+ $output->writeln(' object id: ' . $storage->getURN($node->getId()));
	140	+ try {
	141	+ $fh = $node->fopen('r');
	142	+ if (!$fh) {
	143	+ throw new NotFoundException();
	144	+ }
	145	+ $stat = fstat($fh);
	146	+ fclose($fh);
	147	+ if ($stat['size'] !== $node->getSize()) {
	148	+ $output->writeln(' <error>warning: object had a size of ' . $stat['size'] . ' but cache entry has a size of ' . $node->getSize() . '</error>. This should have been automatically repaired');
	149	+ }
	150	+ } catch (\Exception $e) {
	151	+ $output->writeln(' <error>warning: object not found in bucket</error>');
	152	+ }
	153	+ }
	154	+ } else {
	155	+ if (!$storage->file_exists($node->getInternalPath())) {
	156	+ $output->writeln(' <error>warning: file not found in storage</error>');
	157	+ }
	158	+ }
	159	+ if ($mountPoint instanceof ExternalMountPoint) {
	160	+ $storageConfig = $mountPoint->getStorageConfig();
	161	+ $output->writeln(' external storage id: ' . $storageConfig->getId());
	162	+ $output->writeln(' external type: ' . $storageConfig->getBackend()->getText());
	163	+ } elseif ($mountPoint instanceof GroupMountPoint) {
	164	+ $output->writeln(' groupfolder id: ' . $mountPoint->getFolderId());
	165	+ }
	166	+ if ($input->getOption('storage-tree')) {
	167	+ $storageTmp = $storage;
	168	+ $storageClass = get_class($storageTmp) . ' (cache:' . get_class($storageTmp->getCache()) . ')';
	169	+ while ($storageTmp instanceof \OC\Files\Storage\Wrapper\Wrapper) {
	170	+ $storageTmp = $storageTmp->getWrapperStorage();
	171	+ $storageClass .= "\n\t" . '> ' . get_class($storageTmp) . ' (cache:' . get_class($storageTmp->getCache()) . ')';
	172	+ }
	173	+ $output->writeln(' storage wrapping: ' . $storageClass);
	174	+ }
175	175
176		- }
	176	+ }
177	177	}

nextcloud / server

Push — master ( f5f5a0...25ef41 )

Status

Category

Indentation +136 added lines, -136 removed lines patch added patch discarded remove patch

Spacing +28 added lines, -28 removed lines patch added patch discarded remove patch