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

FsEntry::get_name() returns &str

Browse Source
This commit is contained in:
ChristianVisintin
2020-12-26 10:51:01 +01:00
parent c0fdc9b8f8
commit 8ccf5eb0bb
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/fs/mod.rs
View File

@@ -97,10 +97,10 @@ impl FsEntry {
/// ### get_name /// ### get_name
/// ///
/// Get file name from `FsEntry` /// Get file name from `FsEntry`
pub fn get_name(&self) -> String { pub fn get_name(&self) -> &'_ str {
match self { match self {
FsEntry::Directory(dir) => dir.name.clone(), FsEntry::Directory(dir) => dir.name.as_ref(),
FsEntry::File(file) => file.name.clone(), FsEntry::File(file) => file.name.as_ref(),
} }
} }
@@ -273,10 +273,10 @@ impl std::fmt::Display for FsEntry {
// Get date // Get date
let datetime: String = fmt_time(self.get_last_change_time(), "%b %d %Y %H:%M"); let datetime: String = fmt_time(self.get_last_change_time(), "%b %d %Y %H:%M");
// Set file name (or elide if too long) // Set file name (or elide if too long)
let name: String = self.get_name(); let name: &str = self.get_name();
let name: String = match name.len() >= 24 { let name: String = match name.len() >= 24 {
false => name, false => name.to_string(),
true => format!("{}...", &name.as_str()[0..20]), true => format!("{}...", &name[0..20]),
}; };
write!( write!(
f, f,

4
src/ui/activities/filetransfer_activity/input.rs
View File

@@ -297,7 +297,7 @@ impl FileTransferActivity {
if self.local.files.get(self.local.index).is_some() { if self.local.files.get(self.local.index).is_some() {
let file: FsEntry = let file: FsEntry =
self.local.files.get(self.local.index).unwrap().clone(); self.local.files.get(self.local.index).unwrap().clone();
let name: String = file.get_name(); let name: String = file.get_name().to_string();
// Call upload; pass realfile, keep link name // Call upload; pass realfile, keep link name
self.filetransfer_send( self.filetransfer_send(
&file.get_realfile(), &file.get_realfile(),
@@ -519,7 +519,7 @@ impl FileTransferActivity {
if self.remote.files.get(self.remote.index).is_some() { if self.remote.files.get(self.remote.index).is_some() {
let file: FsEntry = let file: FsEntry =
self.remote.files.get(self.remote.index).unwrap().clone(); self.remote.files.get(self.remote.index).unwrap().clone();
let name: String = file.get_name(); let name: String = file.get_name().to_string();
// Call upload; pass realfile, keep link name // Call upload; pass realfile, keep link name
let wrkdir: PathBuf = self.local.wrkdir.clone(); let wrkdir: PathBuf = self.local.wrkdir.clone();
self.filetransfer_recv( self.filetransfer_recv(

2
src/ui/activities/filetransfer_activity/layout.rs
View File

@@ -483,7 +483,7 @@ impl FileTransferActivity {
Some(fsentry) => { Some(fsentry) => {
// Get name and path // Get name and path
let abs_path: PathBuf = fsentry.get_abs_path(); let abs_path: PathBuf = fsentry.get_abs_path();
let name: String = fsentry.get_name(); let name: String = fsentry.get_name().to_string();
let ctime: String = fmt_time(fsentry.get_creation_time(), "%b %d %Y %H:%M:%S"); let ctime: String = fmt_time(fsentry.get_creation_time(), "%b %d %Y %H:%M:%S");
let atime: String = fmt_time(fsentry.get_last_access_time(), "%b %d %Y %H:%M:%S"); let atime: String = fmt_time(fsentry.get_last_access_time(), "%b %d %Y %H:%M:%S");
let mtime: String = fmt_time(fsentry.get_creation_time(), "%b %d %Y %H:%M:%S"); let mtime: String = fmt_time(fsentry.get_creation_time(), "%b %d %Y %H:%M:%S");