system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-21 01:55:07 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

ls: Add the -S option to sort files by size

Browse source 
This option will override the `-t` option and vice-versa.
This commit is contained in:
Tim Ledbetter 2023-09-23 22:18:42 +01:00 committed by Sam Atkins
parent f9520af71e
commit 01ec695ae3
2 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Base/usr/share/man/man1/ls.md
View file

@ -23,7 +23,8 @@ If no *path* argument is provided the current working directory is used.
* `-F`, `--classify`: Append a file type indicator to entries
* `-d`, `--directory`: List directories themselves, not their contents
* `-l`, `--long`: Display long info
* `-t`: Sort files by timestamp
* `-t`: Sort files by timestamp (newest first)
* `-S`: Sort files by size (largest first)
* `-r`, `--reverse`: Reverse sort order
* `-G`: Use pretty colors
* `-i`, `--inode`: Show inode ids

29
Userland/Utilities/ls.cpp
View file

@ -43,6 +43,12 @@ struct FileMetadata {
};
};
enum class FieldToSortBy {
ModifiedAt,
Name,
Size
};
static int do_file_system_object_long(DeprecatedString const& path);
static int do_file_system_object_short(DeprecatedString const& path);
@ -63,7 +69,7 @@ static bool flag_print_numeric = false;
static bool flag_hide_group = false;
static bool flag_human_readable = false;
static bool flag_human_readable_si = false;
static bool flag_sort_by_timestamp = false;
static FieldToSortBy flag_sort_by { FieldToSortBy::Name };
static bool flag_reverse_sort = false;
static bool flag_disable_hyperlinks = false;
static bool flag_recursive = false;
@ -108,7 +114,22 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
args_parser.add_option(flag_ignore_backups, "Do not list implied entries ending with ~", "ignore-backups", 'B');
args_parser.add_option(flag_list_directories_only, "List directories themselves, not their contents", "directory", 'd');
args_parser.add_option(flag_long, "Display long info", "long", 'l');
args_parser.add_option(flag_sort_by_timestamp, "Sort files by timestamp", nullptr, 't');
args_parser.add_option(Core::ArgsParser::Option {
.argument_mode = Core::ArgsParser::OptionArgumentMode::None,
.help_string = "Sort files by timestamp (newest first)",
.short_name = 't',
.accept_value = [](StringView) {
flag_sort_by = FieldToSortBy::ModifiedAt;
return true;
} });
args_parser.add_option(Core::ArgsParser::Option {
.argument_mode = Core::ArgsParser::OptionArgumentMode::None,
.help_string = "Sort files by size (largest first)",
.short_name = 'S',
.accept_value = [](StringView) {
flag_sort_by = FieldToSortBy::Size;
return true;
} });
args_parser.add_option(flag_reverse_sort, "Reverse sort order", "reverse", 'r');
args_parser.add_option(flag_classify, "Append a file type indicator to entries", "classify", 'F');
args_parser.add_option(flag_colorize, "Use pretty colors", nullptr, 'G');
@ -589,7 +610,9 @@ int do_file_system_object_short(DeprecatedString const& path)
bool filemetadata_comparator(FileMetadata& a, FileMetadata& b)
{
if (flag_sort_by_timestamp && (a.stat.st_mtime != b.stat.st_mtime))
if (flag_sort_by == FieldToSortBy::ModifiedAt && (a.stat.st_mtime != b.stat.st_mtime))
return (a.stat.st_mtime > b.stat.st_mtime) ^ flag_reverse_sort;
if (flag_sort_by == FieldToSortBy::Size && a.stat.st_size != b.stat.st_size)
return (a.stat.st_size > b.stat.st_size) ^ flag_reverse_sort;
return (a.name < b.name) ^ flag_reverse_sort;
}