diff --git a/README.md b/README.md index e5c1947..240f2ee 100644 --- a/README.md +++ b/README.md @@ -77,55 +77,55 @@ nexy -p /path/to/public_dir **Patterns** * `{list}` - entries list for the current directory ---list-dir-count +--list-dir-show-count Show files count in dir (as the alternative text for navigation links) ---list-dir-accessed +--list-dir-show-accessed Show directory accessed time ---list-dir-created +--list-dir-show-created Show directory created time ---list-dir-modified +--list-dir-show-modified Show directory modified time ---list-dir-sort-accessed +--list-dir-sort-by-accessed Sort dirs by time accessed (name by default) ---list-dir-sort-created +--list-dir-sort-by-created Sort dirs by time created (name by default) ---list-dir-sort-modified +--list-dir-sort-by-modified Sort dirs by time modified (name by default) ---list-dir-sort-count +--list-dir-sort-by-count Sort dirs by count (name by default) --list-dir-reverse Sort directories in list DESC (ASC by default) ---list-file-size +--list-file-show-size Show file size in list (as the alternative text for navigation links) ---list-file-accessed +--list-file-show-accessed Show file accessed time ---list-file-created +--list-file-show-created Show file created time ---list-file-modified +--list-file-show-modified Show file modified time ---list-file-sort-accessed +--list-file-sort-by-accessed Sort files by time accessed (name by default) ---list-file-sort-created +--list-file-sort-by-created Sort files by time created (name by default) ---list-file-sort-modified +--list-file-sort-by-modified Sort files by time modified (name by default) ---list-file-sort-size +--list-file-sort-by-size Sort files by size (name by default) --list-file-reverse diff --git a/src/config.rs b/src/config.rs index bdec844..ffeb07a 100644 --- a/src/config.rs +++ b/src/config.rs @@ -70,35 +70,35 @@ pub struct Config { /// Show files count in dir (as the alternative text for navigation links) #[arg(long, default_value_t = false)] - pub list_dir_count: bool, + pub list_dir_show_count: bool, /// Show directory accessed time #[arg(long, default_value_t = false)] - pub list_dir_accessed: bool, + pub list_dir_show_accessed: bool, /// Show directory created time #[arg(long, default_value_t = false)] - pub list_dir_created: bool, + pub list_dir_show_created: bool, /// Show directory modified time #[arg(long, default_value_t = false)] - pub list_dir_modified: bool, + pub list_dir_show_modified: bool, /// Sort dirs by time accessed (name by default) #[arg(long, default_value_t = false)] - pub list_dir_sort_accessed: bool, + pub list_dir_sort_by_accessed: bool, /// Sort dirs by time created (name by default) #[arg(long, default_value_t = false)] - pub list_dir_sort_created: bool, + pub list_dir_sort_by_created: bool, /// Sort dirs by time modified (name by default) #[arg(long, default_value_t = false)] - pub list_dir_sort_modified: bool, + pub list_dir_sort_by_modified: bool, /// Sort dirs by count (name by default) #[arg(long, default_value_t = false)] - pub list_dir_sort_count: bool, + pub list_dir_sort_by_count: bool, /// Sort directories in list DESC (ASC by default) #[arg(long, default_value_t = false)] @@ -106,35 +106,35 @@ pub struct Config { /// Show file size in list (as the alternative text for navigation links) #[arg(long, default_value_t = false)] - pub list_file_size: bool, + pub list_file_show_size: bool, /// Show file accessed time #[arg(long, default_value_t = false)] - pub list_file_accessed: bool, + pub list_file_show_accessed: bool, /// Show file created time #[arg(long, default_value_t = false)] - pub list_file_created: bool, + pub list_file_show_created: bool, /// Show file modified time #[arg(long, default_value_t = false)] - pub list_file_modified: bool, + pub list_file_show_modified: bool, /// Sort files by time accessed (name by default) #[arg(long, default_value_t = false)] - pub list_file_sort_accessed: bool, + pub list_file_sort_by_accessed: bool, /// Sort files by time created (name by default) #[arg(long, default_value_t = false)] - pub list_file_sort_created: bool, + pub list_file_sort_by_created: bool, /// Sort files by time modified (name by default) #[arg(long, default_value_t = false)] - pub list_file_sort_modified: bool, + pub list_file_sort_by_modified: bool, /// Sort files by size (name by default) #[arg(long, default_value_t = false)] - pub list_file_sort_size: bool, + pub list_file_sort_by_size: bool, /// Sort files in list DESC (ASC by default) #[arg(long, default_value_t = false)] diff --git a/src/session/storage/list_config.rs b/src/session/storage/list_config.rs index 35378d7..a093f20 100644 --- a/src/session/storage/list_config.rs +++ b/src/session/storage/list_config.rs @@ -58,18 +58,18 @@ impl ListConfig { c <= 1 } if !is_unique(&[ - config.list_dir_sort_accessed, - config.list_dir_sort_created, - config.list_dir_sort_modified, - config.list_dir_sort_count, + config.list_dir_sort_by_accessed, + config.list_dir_sort_by_created, + config.list_dir_sort_by_modified, + config.list_dir_sort_by_count, ]) { bail!("Dir sort option should be unique!") } if !is_unique(&[ - config.list_file_sort_accessed, - config.list_file_sort_created, - config.list_file_sort_modified, - config.list_file_sort_size, + config.list_file_sort_by_accessed, + config.list_file_sort_by_created, + config.list_file_sort_by_modified, + config.list_file_sort_by_size, ]) { bail!("File sort option should be unique!") } @@ -77,39 +77,39 @@ impl ListConfig { dir: Dir { alt: DirAlt { time: Time { - is_accessed: config.list_dir_accessed, - is_created: config.list_dir_created, - is_modified: config.list_dir_modified, + is_accessed: config.list_dir_show_accessed, + is_created: config.list_dir_show_created, + is_modified: config.list_dir_show_modified, }, - is_count: config.list_dir_count, + is_count: config.list_dir_show_count, }, is_reverse: config.list_dir_reverse, sort: DirSort { time: Time { - is_accessed: config.list_dir_sort_accessed, - is_created: config.list_dir_sort_created, - is_modified: config.list_dir_sort_modified, + is_accessed: config.list_dir_sort_by_accessed, + is_created: config.list_dir_sort_by_created, + is_modified: config.list_dir_sort_by_modified, }, - is_count: config.list_dir_sort_count, + is_count: config.list_dir_sort_by_count, }, }, file: File { alt: FileAlt { time: Time { - is_accessed: config.list_file_accessed, - is_created: config.list_file_created, - is_modified: config.list_file_modified, + is_accessed: config.list_file_show_accessed, + is_created: config.list_file_show_created, + is_modified: config.list_file_show_modified, }, - is_size: config.list_file_size, + is_size: config.list_file_show_size, }, is_reverse: config.list_file_reverse, sort: FileSort { time: Time { - is_accessed: config.list_file_sort_accessed, - is_created: config.list_file_sort_created, - is_modified: config.list_file_sort_modified, + is_accessed: config.list_file_sort_by_accessed, + is_created: config.list_file_sort_by_created, + is_modified: config.list_file_sort_by_modified, }, - is_size: config.list_file_sort_size, + is_size: config.list_file_sort_by_size, }, }, time_format: config.list_time_format.clone(),