aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryemkareems <yemkareems@gmail.com>2024-07-09 18:07:55 +0530
committeryemkareems <yemkareems@gmail.com>2024-07-30 10:01:15 +0530
commitb516475d15231d7491d3c4a3cb320866d8c0274c (patch)
treeefed4f2d05c20bf8e048e2d9ffa69ee5c357ccc7
parent31e05a558269ca96ab362f9ffd2b5ecc5d2a3501 (diff)
downloadnextcloud-server-b516475d15231d7491d3c4a3cb320866d8c0274c.tar.gz
nextcloud-server-b516475d15231d7491d3c4a3cb320866d8c0274c.zip
fix: issues with sorting fixed
Signed-off-by: yemkareems <yemkareems@gmail.com>
-rw-r--r--apps/files/lib/Command/ListFiles.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/apps/files/lib/Command/ListFiles.php b/apps/files/lib/Command/ListFiles.php
index 0bfb1e73550..3ebc2a5a526 100644
--- a/apps/files/lib/Command/ListFiles.php
+++ b/apps/files/lib/Command/ListFiles.php
@@ -74,6 +74,7 @@ class ListFiles extends Base {
$nodeInfo = [
"name" => $node->getName(),
"size" => \OCP\Util::humanFileSize($node->getSize()),
+ "realSize" => $node->getSize(),
"perm" => $node->getPermissions(),
"owner" => $node->getOwner()?->getDisplayName(),
"created-at" => $node->getCreationTime(),
@@ -246,6 +247,9 @@ class ListFiles extends Base {
$sortKey = array_key_exists($input->getOption("sort"), $fileInfo)
? $input->getOption("sort")
: "";
+ if($sortKey == 'size') {
+ $sortKey = 'realSize';
+ }
$order = $input->getOption("order") == "ASC" ? SORT_ASC : SORT_DESC;
$fileArr = array_column($this->fileInfo, $sortKey);
$dirArr = array_column($this->dirInfo, $sortKey);
@@ -253,11 +257,13 @@ class ListFiles extends Base {
array_multisort(
$fileArr,
$order,
+ SORT_NATURAL | SORT_FLAG_CASE,
$this->fileInfo
);
array_multisort(
$dirArr,
$order,
+ SORT_NATURAL | SORT_FLAG_CASE,
$this->dirInfo
);
}