vh/termscp
1
0
Fork 0
mirror of https://github.com/veeso/termscp.git synced 2025-12-07 09:36:00 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Removed redundant code for fsEntry fmt

Browse Source
This commit is contained in:
ChristianVisintin
2020-12-12 17:36:39 +01:00
parent 5aea1d286b
commit 3b33c55d97
1 changed files with 2 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/fs/mod.rs
View File

@@ -215,7 +215,6 @@ impl std::fmt::Display for FsEntry {
/// ### fmt_ls /// ### fmt_ls
/// ///
/// Format File Entry as `ls` does /// Format File Entry as `ls` does
#[cfg(any(target_os = "unix", target_os = "macos", target_os = "linux"))]
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
// Create mode string // Create mode string
let mut mode: String = String::with_capacity(10); let mut mode: String = String::with_capacity(10);
@@ -229,6 +228,7 @@ impl std::fmt::Display for FsEntry {
Some((owner, group, others)) => mode.push_str(fmt_pex(owner, group, others).as_str()), Some((owner, group, others)) => mode.push_str(fmt_pex(owner, group, others).as_str()),
} }
// Get username // Get username
#[cfg(any(target_os = "unix", target_os = "macos", target_os = "linux"))]
let username: String = match self.get_user() { let username: String = match self.get_user() {
Some(uid) => match get_user_by_uid(uid) { Some(uid) => match get_user_by_uid(uid) {
Some(user) => user.name().to_string_lossy().to_string(), Some(user) => user.name().to_string_lossy().to_string(),
@@ -236,51 +236,7 @@ impl std::fmt::Display for FsEntry {
}, },
None => String::from("0"), None => String::from("0"),
}; };
// Get group #[cfg(target_os = "windows")]
/*
let group: String = match self.get_group() {
Some(gid) => match get_group_by_gid(gid) {
Some(group) => group.name().to_string_lossy().to_string(),
None => gid.to_string(),
},
None => String::from("0"),
};
*/
// Get byte size
let size: ByteSize = ByteSize(self.get_size() as u64);
// Get date
let datetime: String = time_to_str(self.get_last_change_time(), "%b %d %Y %H:%M");
// Set file name (or elide if too long)
let name: String = self.get_name();
let name: String = match name.len() >= 24 {
false => name,
true => format!("{}...", &name.as_str()[0..20]),
};
write!(
f,
"{:24}\t{:12}\t{:12}\t{:9}\t{:17}",
name, mode, username, size, datetime
)
}
/// ### fmt_ls
///
/// Format File Entry as `ls` does
#[cfg(target_os = "windows")]
#[cfg(not(tarpaulin_include))]
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
// Create mode string
let mut mode: String = String::with_capacity(10);
let file_type: char = match self.is_symlink() {
true => 'l',
false => 'd',
};
mode.push(file_type);
match self.get_unix_pex() {
None => mode.push_str("?????????"),
Some((owner, group, others)) => mode.push_str(fmt_pex(owner, group, others).as_str()),
}
// Get username
let username: usize = match self.get_user() { let username: usize = match self.get_user() {
Some(uid) => uid, Some(uid) => uid,
None => 0, None => 0,