use anyhow::{bail, format_err, Error};
use nix::sys::stat::Mode;
-use pxar::{mode, Entry, EntryKind, Metadata};
+use pxar::{mode, Entry, EntryKind, Metadata, format::StatxTimestamp};
/// Get the file permissions as `nix::Mode`
pub fn perms_from_metadata(meta: &Metadata) -> Result<Mode, Error> {
)
}
-pub fn format_single_line_entry(entry: &Entry) -> String {
+fn format_mtime(mtime: &StatxTimestamp) -> String {
use chrono::offset::TimeZone;
+ match chrono::Local.timestamp_opt(mtime.secs, mtime.nanos) {
+ chrono::LocalResult::Single(mtime) => mtime.format("%Y-%m-%d %H:%M:%S").to_string(),
+ _ => format!("{}.{}", mtime.secs, mtime.nanos),
+ }
+}
+
+pub fn format_single_line_entry(entry: &Entry) -> String {
let mode_string = mode_string(entry);
let meta = entry.metadata();
- let mtime = chrono::Local.timestamp(meta.stat.mtime.secs, meta.stat.mtime.nanos);
let (size, link) = match entry.kind() {
EntryKind::File { size, .. } => (format!("{}", *size), String::new()),
"{} {:<13} {} {:>8} {:?}{}",
mode_string,
format!("{}/{}", meta.stat.uid, meta.stat.gid),
- mtime.format("%Y-%m-%d %H:%M:%S"),
+ format_mtime(&meta.stat.mtime),
size,
entry.path(),
link,
}
pub fn format_multi_line_entry(entry: &Entry) -> String {
- use chrono::offset::TimeZone;
-
let mode_string = mode_string(entry);
let meta = entry.metadata();
- let mtime = chrono::Local.timestamp(meta.stat.mtime.secs, meta.stat.mtime.nanos);
let (size, link, type_name) = match entry.kind() {
EntryKind::File { size, .. } => (format!("{}", *size), String::new(), "file"),
mode_string,
meta.stat.uid,
meta.stat.gid,
- mtime.format("%Y-%m-%d %H:%M:%S"),
+ format_mtime(&meta.stat.mtime),
)
}