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::*::symlink is now a Option<Box<FsEntry>>; this improved symlinks, which gave errors some times

Browse Source
This commit is contained in:
ChristianVisintin
2020-12-12 16:26:03 +01:00
parent 23ac5089a7
commit f73e43304e
8 changed files with 108 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/fs/mod.rs
View File

@@ -57,7 +57,7 @@ pub struct FsDirectory {
pub last_access_time: SystemTime,
pub creation_time: SystemTime,
pub readonly: bool,
pub symlink: Option<PathBuf>, // UNIX only
pub symlink: Option<Box<FsEntry>>, // UNIX only
pub user: Option<u32>, // UNIX only
pub group: Option<u32>, // UNIX only
pub unix_pex: Option<(u8, u8, u8)>, // UNIX only
@@ -77,12 +77,48 @@ pub struct FsFile {
pub size: usize,
pub ftype: Option<String>, // File type
pub readonly: bool,
pub symlink: Option<PathBuf>, // UNIX only
pub symlink: Option<Box<FsEntry>>, // UNIX only
pub user: Option<u32>, // UNIX only
pub group: Option<u32>, // UNIX only
pub unix_pex: Option<(u8, u8, u8)>, // UNIX only
}
impl FsEntry {
/// ### get_abs_path
///
/// Get absolute path from `FsEntry`
pub fn get_abs_path(&self) -> PathBuf {
match self {
FsEntry::Directory(dir) => dir.abs_path.clone(),
FsEntry::File(file) => file.abs_path.clone(),
}
}
/// ### get_realfile
///
/// Return the real file pointed by a `FsEntry`
pub fn get_realfile(&self) -> Option<FsEntry> {
match self {
FsEntry::Directory(dir) => match &dir.symlink {
Some(symlink) => match symlink.get_realfile() {
// Recursive call
Some(e) => e.get_realfile(), // Recursive call
None => Some(*symlink.clone()),
},
None => None,
},
FsEntry::File(file) => match &file.symlink {
Some(symlink) => match symlink.get_realfile() {
// Recursive call
Some(e) => e.get_realfile(), // Recursive call
None => Some(*symlink.clone()),
},
None => None,
},
}
}
}
impl std::fmt::Display for FsEntry {
/// ### fmt_ls
///
@@ -279,3 +315,5 @@ impl std::fmt::Display for FsEntry {
}
}
}
// TODO: tests