Skip to content

Commit

Permalink
add relative time option
Browse files Browse the repository at this point in the history
  • Loading branch information
@mike-ward
mike-ward committed Jan 3, 2025
1 parent b2345f7 commit 216f745
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 31 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file.
- implied . and .. folders to -a option
- almost all option (-A)
- full path option (-F)
- add relative time option (-T)

## [2024.6]
### Added
Expand Down
82 changes: 51 additions & 31 deletions lsv/format_long.v
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ struct Longest {
size int
checksum int
file int
mtime int
atime int
ctime int
}

enum StatTime {
Expand Down Expand Up @@ -87,7 +90,8 @@ fn format_long_listing(entries []Entry, options Options) {
print_space()

content := permissions(entry, options)
print(format_cell(content, permissions_title.len, .right, no_style, options))
print(format_cell(content, real_length(permissions_title), .right, no_style,
options))
print_space()
}

Expand Down Expand Up @@ -142,19 +146,25 @@ fn format_long_listing(entries []Entry, options Options) {

// date/time(modified)
if !options.no_date {
print(format_time(entry, .modified, options))
ftime := format_time(entry, .modified, options)
fcell := format_cell(ftime, longest.mtime, .right, dim, options)
print(fcell)
print_space()
}

// date/time (accessed)
if options.accessed_date {
print(format_time(entry, .accessed, options))
ftime := format_time(entry, .modified, options)
fcell := format_cell(ftime, longest.atime, .right, dim, options)
print(fcell)
print_space()
}

// date/time (status change)
if options.changed_date {
print(format_time(entry, .changed, options))
ftime := format_time(entry, .modified, options)
fcell := format_cell(ftime, longest.ctime, .right, dim, options)
print(fcell)
print_space()
}

Expand Down Expand Up @@ -198,6 +208,9 @@ fn longest_entries(entries []Entry, options Options) Longest {
size: longest_size_len(entries, size_title, options)
checksum: longest_checksum_len(entries, options.checksum, options)
file: longest_file_name_len(entries, name_title, options)
mtime: if !options.no_date { longest_time(entries, .modified, date_modified_title, options ) } else { 0 }
atime: if options.accessed_date { longest_time(entries, .accessed, date_accessed_title, options ) } else { 0 }
ctime: if options.changed_date { longest_time(entries, .changed, date_status_title, options ) } else { 0 }
// vfmt on
}
}
Expand Down Expand Up @@ -234,11 +247,11 @@ fn format_header(options Options, longest Longest) (string, []int) {
if !options.no_permissions {
buffer += 'T ${table_pad}'
cols << real_length(buffer) - 1
buffer += left_pad(permissions_title, permissions_title.len) + table_pad
buffer += left_pad(permissions_title, real_length(permissions_title)) + table_pad
cols << real_length(buffer) - 1
}
if options.octal_permissions {
buffer += left_pad(mask_title, mask_title.len) + table_pad
buffer += left_pad(mask_title, real_length(mask_title)) + table_pad
cols << real_length(buffer) - 1
}
if !options.no_hard_links {
Expand All @@ -263,20 +276,17 @@ fn format_header(options Options, longest Longest) (string, []int) {
}
if !options.no_date {
title := if options.header { date_modified_title } else { '' }
width := time_format(options).len
buffer += right_pad(title, width) + table_pad
buffer += right_pad(title, longest.mtime) + table_pad
cols << real_length(buffer) - 1
}
if options.accessed_date {
title := if options.header { date_accessed_title } else { '' }
width := time_format(options).len
buffer += right_pad(title, width) + table_pad
buffer += right_pad(title, longest.atime) + table_pad
cols << real_length(buffer) - 1
}
if options.changed_date {
title := if options.header { date_status_title } else { '' }
width := time_format(options).len
buffer += right_pad(title, width) + table_pad
buffer += right_pad(title, longest.ctime) + table_pad
cols << real_length(buffer) - 1
}

Expand All @@ -297,17 +307,17 @@ fn time_format(options Options) string {
}

fn left_pad(s string, width int) string {
pad := width - s.len
pad := width - real_length(s)
return if pad > 0 { space.repeat(pad) + s + space } else { s + space }
}

fn right_pad(s string, width int) string {
pad := width - s.len
pad := width - real_length(s)
return if pad > 0 { s + space.repeat(pad) + space } else { s + space }
}

fn right_pad_end(s string, width int) string {
pad := width - s.len
pad := width - real_length(s)
return if pad > 0 { s + space.repeat(pad) } else { s }
}

Expand Down Expand Up @@ -399,17 +409,20 @@ fn format_time(entry Entry, stat_time StatTime, options Options) string {
.modified { entry.stat.mtime }
}

mut date := time.unix(entry_time)
.local()
.custom_format(time_format(options))

if date.starts_with('0') {
date = ' ' + date[1..]
local := time.unix(entry_time).local()
date := if options.time_relative {
local.relative_short()
} else {
mut dt := local.custom_format(time_format(options))
if dt.starts_with('0') {
' ' + dt[1..]
} else {
dt
}
}

dim := if options.no_dim { no_style } else { dim_style }
content := if entry.invalid { '?' + space.repeat(date.len - 1) } else { date }
return format_cell(content, date.len, .left, dim, options)
content := if entry.invalid { '?' + space.repeat(real_length(date) - 1) } else { date }
return content
}

fn longest_nlink_len(entries []Entry, title string, options Options) int {
Expand All @@ -419,15 +432,15 @@ fn longest_nlink_len(entries []Entry, title string, options Options) int {
}

fn longest_owner_name_len(entries []Entry, title string, options Options) int {
lengths := entries.map(get_owner_name(it.stat.uid).len)
lengths := entries.map(real_length(get_owner_name(it.stat.uid)))
max := arrays.max(lengths) or { 0 }
return if options.no_owner_name || !options.header { max } else { max(max, title.len) }
}

fn longest_group_name_len(entries []Entry, title string, options Options) int {
lengths := entries.map(get_group_name(it.stat.gid).len)
lengths := entries.map(real_length(get_group_name(it.stat.gid)))
max := arrays.max(lengths) or { 0 }
return if options.no_group_name || !options.header { max } else { max(max, title.len) }
return if options.no_group_name || !options.header { max } else { max(max, real_length(title)) }
}

fn longest_size_len(entries []Entry, title string, options Options) int {
Expand All @@ -441,23 +454,30 @@ fn longest_size_len(entries []Entry, title string, options Options) int {
// vfmt on
})
max := arrays.max(lengths) or { 0 }
return if options.no_size || !options.header { max } else { max(max, title.len) }
return if options.no_size || !options.header { max } else { max(max, real_length(title)) }
}

fn longest_inode_len(entries []Entry, title string, options Options) int {
lengths := entries.map(it.stat.inode.str().len)
max := arrays.max(lengths) or { 0 }
return if !options.inode || !options.header { max } else { max(max, title.len) }
return if !options.inode || !options.header { max } else { max(max, real_length(title)) }
}

fn longest_file_name_len(entries []Entry, title string, options Options) int {
lengths := entries.map(real_length(format_entry_name(it, options)))
max := arrays.max(lengths) or { 0 }
return if !options.header { max } else { max(max, title.len) }
return if !options.header { max } else { max(max, real_length(title)) }
}

fn longest_checksum_len(entries []Entry, title string, options Options) int {
lengths := entries.map(it.checksum.len)
max := arrays.max(lengths) or { 0 }
return if !options.header { max } else { max(max, title.len) }
return if !options.header { max } else { max(max, real_length(title)) }
}

fn longest_time(entries []Entry, stat_time StatTime, title string, options Options) int {
names := entries.map(format_time(it, stat_time, options))
lengths := names.map(real_length(it))
max := arrays.max(lengths) or { 0 }
return max
}
3 changes: 3 additions & 0 deletions lsv/options.v
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ struct Options {
time_iso bool
time_compact bool
time_compact_with_day bool
time_relative bool
checksum string
//
// from ls colors
Expand Down Expand Up @@ -125,6 +126,7 @@ fn parse_args(args []string) Options {
time_iso := fp.bool('', `I`, false, 'show time in iso format')
time_compact := fp.bool('', `J`, false, 'show time in compact format')
time_compact_with_day := fp.bool('', `L`, false, 'show time in compact format with week day')
time_relative := fp.bool('', `T`, false, 'show relative time')
inode := fp.bool('', `N`, false, 'show inodes')
no_wrap := fp.bool('', `Z`, false, 'do not wrap long lines\n')

Expand Down Expand Up @@ -204,6 +206,7 @@ fn parse_args(args []string) Options {
time_compact: time_compact
time_compact_with_day: time_compact_with_day
time_iso: time_iso
time_relative: time_relative
width_in_cols: width_in_cols
with_commas: with_commas
}
Expand Down

0 comments on commit 216f745

Please sign in to comment.