upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-11 09:42:09 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 57

fix: humanFileSize added for size, type strict check removed as it is breaking the listing, inputPath check removed as path is mandatory, sorting done only when sort param is there, writeTableInOutputFormat done

Browse source 
Signed-off-by: yemkareems <yemkareems@gmail.com>
This commit is contained in:
yemkareems 2024-07-09 14:31:47 +05:30
parent 66fa88fad2
commit e4a7de92df
1 changed files with 30 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
apps/files/lib/Command/ListFiles.php
View file

@ -74,7 +74,7 @@ class ListFiles extends Base {
private function getNodeInfo(Node $node): array {
$nodeInfo = [
"name" => $node->getName(),
"size" => $node->getSize() . " bytes",
"size" => \OCP\Util::humanFileSize($node->getSize()),
"perm" => $node->getPermissions(),
"owner" => $node->getOwner()?->getDisplayName(),
"created-at" => $node->getCreationTime(),
@ -105,7 +105,7 @@ class ListFiles extends Base {
$fileNode = $file;
$includeType = $includeMin = $includeMax = true;
$nodeInfo = $this->getNodeInfo($fileNode);
if ($type !== "" && $type !== $nodeInfo['type']) {
if ($type != "" && $type !== $nodeInfo['type']) {
$includeType = false;
}
if ($minSize > 0) {
@ -152,11 +152,8 @@ class ListFiles extends Base {
OutputInterface $output
): int {
$inputPath = $input->getArgument("path");
$user = '';
if ($inputPath) {
$inputPath = ltrim($inputPath, "path=");
[, $user] = explode("/", rtrim($inputPath, "/").'/', 4);
}
$inputPath = ltrim($inputPath, "path=");
[, $user] = explode("/", rtrim($inputPath, "/").'/', 4);
$this->initTools($output);
@ -245,56 +242,47 @@ class ListFiles extends Base {
InputInterface $input,
OutputInterface $output
): void {
$headers = [
"Permission",
"Size",
"Owner",
"Created at",
"Filename",
"Type",
];
$rows = [];
$fileInfo = $this->fileInfo[0] ?? [];
$sortKey = array_key_exists($input->getOption("sort"), $fileInfo)
? $input->getOption("sort")
: "name";
: "";
$order = $input->getOption("order") == "ASC" ? SORT_ASC : SORT_DESC;
$fileArr = array_column($this->fileInfo, $sortKey);
$dirArr = array_column($this->dirInfo, $sortKey);
array_multisort(
$fileArr,
$order,
$this->fileInfo
);
array_multisort(
$dirArr,
$order,
$this->dirInfo
);
if($sortKey != '') {
array_multisort(
$fileArr,
$order,
$this->fileInfo
);
array_multisort(
$dirArr,
$order,
$this->dirInfo
);
}
foreach ($this->fileInfo as $k => $item) {
$rows[$k] = [
$item["perm"],
$item["size"],
$item["owner"],
$item["created-at"],
$item["name"],
$item["type"],
"Permission" => $item["perm"],
"Size" => $item["size"],
"Owner" => $item["owner"],
"Created at" => $item["created-at"],
"Filename" => $item["name"],
"Type" => $item["type"],
];
}
foreach ($this->dirInfo as $k => $item) {
$rows[] = [
$item["perm"],
$item["size"],
$item["owner"],
$item["created-at"],
$item["name"],
$item["type"],
"Permission" => $item["perm"],
"Size" => $item["size"],
"Owner" => $item["owner"],
"Created at" => $item["created-at"],
"Filename" => $item["name"],
"Type" => $item["type"],
];
}
$table = new Table($output);
$table->setHeaders($headers)->setRows($rows);
$table->render();
$this->writeTableInOutputFormat($input, $output, $rows);
}
}