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

Clippy optimizations

Browse Source
This commit is contained in:
ChristianVisintin
2020-12-16 16:35:11 +01:00
parent 65c541ff2a
commit 562a1b3ae8
4 changed files with 59 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/activity_manager.rs
View File

@@ -160,7 +160,7 @@ impl ActivityManager {
0 => None, 0 => None,
_ => Some(activity.password.clone()), _ => Some(activity.password.clone()),
}, },
protocol: activity.protocol.clone(), protocol: activity.protocol,
}); });
break; break;
} }

77
src/system/bookmarks_client.rs
View File

@@ -101,7 +101,7 @@ impl BookmarksClient {
/// Get bookmark associated to key /// Get bookmark associated to key
pub fn get_bookmark( pub fn get_bookmark(
&self, &self,
key: &String, key: &str,
) -> Option<(String, u16, FileTransferProtocol, String, Option<String>)> { ) -> Option<(String, u16, FileTransferProtocol, String, Option<String>)> {
let entry: &Bookmark = self.hosts.bookmarks.get(key)?; let entry: &Bookmark = self.hosts.bookmarks.get(key)?;
Some(( Some((
@@ -145,7 +145,7 @@ impl BookmarksClient {
/// ### del_bookmark /// ### del_bookmark
/// ///
/// Delete entry from bookmarks /// Delete entry from bookmarks
pub fn del_bookmark(&mut self, name: &String) { pub fn del_bookmark(&mut self, name: &str) {
let _ = self.hosts.bookmarks.remove(name); let _ = self.hosts.bookmarks.remove(name);
} }
/// ### iter_recents /// ### iter_recents
@@ -158,7 +158,7 @@ impl BookmarksClient {
/// ### get_recent /// ### get_recent
/// ///
/// Get recent associated to key /// Get recent associated to key
pub fn get_recent(&self, key: &String) -> Option<(String, u16, FileTransferProtocol, String)> { pub fn get_recent(&self, key: &str) -> Option<(String, u16, FileTransferProtocol, String)> {
// NOTE: password is not decrypted; recents will never have password // NOTE: password is not decrypted; recents will never have password
let entry: &Bookmark = self.hosts.recents.get(key)?; let entry: &Bookmark = self.hosts.recents.get(key)?;
Some(( Some((
@@ -217,7 +217,7 @@ impl BookmarksClient {
/// ### del_recent /// ### del_recent
/// ///
/// Delete entry from recents /// Delete entry from recents
pub fn del_recent(&mut self, name: &String) { pub fn del_recent(&mut self, name: &str) {
let _ = self.hosts.recents.remove(name); let _ = self.hosts.recents.remove(name);
} }
@@ -392,7 +392,8 @@ mod tests {
let tmp_dir: tempfile::TempDir = create_tmp_dir(); let tmp_dir: tempfile::TempDir = create_tmp_dir();
let (cfg_path, key_path): (PathBuf, PathBuf) = get_paths(tmp_dir.path()); let (cfg_path, key_path): (PathBuf, PathBuf) = get_paths(tmp_dir.path());
// Initialize a new bookmarks client // Initialize a new bookmarks client
let client: BookmarksClient = BookmarksClient::new(cfg_path.as_path(), key_path.as_path()).unwrap(); let client: BookmarksClient =
BookmarksClient::new(cfg_path.as_path(), key_path.as_path()).unwrap();
// Verify client // Verify client
assert_eq!(client.hosts.bookmarks.len(), 0); assert_eq!(client.hosts.bookmarks.len(), 0);
assert_eq!(client.hosts.recents.len(), 0); assert_eq!(client.hosts.recents.len(), 0);
@@ -402,7 +403,10 @@ mod tests {
#[test] #[test]
fn test_system_bookmarks_new_err() { fn test_system_bookmarks_new_err() {
assert!(BookmarksClient::new(Path::new("/tmp/oifoif/omar"), Path::new("/tmp/efnnu/omar")).is_err()); assert!(
BookmarksClient::new(Path::new("/tmp/oifoif/omar"), Path::new("/tmp/efnnu/omar"))
.is_err()
);
} }
#[test] #[test]
@@ -410,24 +414,40 @@ mod tests {
let tmp_dir: tempfile::TempDir = create_tmp_dir(); let tmp_dir: tempfile::TempDir = create_tmp_dir();
let (cfg_path, key_path): (PathBuf, PathBuf) = get_paths(tmp_dir.path()); let (cfg_path, key_path): (PathBuf, PathBuf) = get_paths(tmp_dir.path());
// Initialize a new bookmarks client // Initialize a new bookmarks client
let mut client: BookmarksClient = BookmarksClient::new(cfg_path.as_path(), key_path.as_path()).unwrap(); let mut client: BookmarksClient =
BookmarksClient::new(cfg_path.as_path(), key_path.as_path()).unwrap();
// Add some bookmarks // Add some bookmarks
client.add_bookmark(String::from("raspberry"), String::from("192.168.1.31"), 22, FileTransferProtocol::Sftp, String::from("pi"), Some(String::from("mypassword"))); client.add_bookmark(
client.add_recent(String::from("192.168.1.31"), 22, FileTransferProtocol::Sftp, String::from("pi")); String::from("raspberry"),
String::from("192.168.1.31"),
22,
FileTransferProtocol::Sftp,
String::from("pi"),
Some(String::from("mypassword")),
);
client.add_recent(
String::from("192.168.1.31"),
22,
FileTransferProtocol::Sftp,
String::from("pi"),
);
let recent_key: String = String::from(client.iter_recents().next().unwrap()); let recent_key: String = String::from(client.iter_recents().next().unwrap());
assert!(client.write_bookmarks().is_ok()); assert!(client.write_bookmarks().is_ok());
let key: String = client.key.clone(); let key: String = client.key.clone();
// Re-initialize a client // Re-initialize a client
let client: BookmarksClient = BookmarksClient::new(cfg_path.as_path(), key_path.as_path()).unwrap(); let client: BookmarksClient =
BookmarksClient::new(cfg_path.as_path(), key_path.as_path()).unwrap();
// Verify it loaded parameters correctly // Verify it loaded parameters correctly
assert_eq!(client.key, key); assert_eq!(client.key, key);
let bookmark: (String, u16, FileTransferProtocol, String, Option<String>) = client.get_bookmark(&String::from("raspberry")).unwrap(); let bookmark: (String, u16, FileTransferProtocol, String, Option<String>) =
client.get_bookmark(&String::from("raspberry")).unwrap();
assert_eq!(bookmark.0, String::from("192.168.1.31")); assert_eq!(bookmark.0, String::from("192.168.1.31"));
assert_eq!(bookmark.1, 22); assert_eq!(bookmark.1, 22);
assert_eq!(bookmark.2, FileTransferProtocol::Sftp); assert_eq!(bookmark.2, FileTransferProtocol::Sftp);
assert_eq!(bookmark.3, String::from("pi")); assert_eq!(bookmark.3, String::from("pi"));
assert_eq!(*bookmark.4.as_ref().unwrap(), String::from("mypassword")); assert_eq!(*bookmark.4.as_ref().unwrap(), String::from("mypassword"));
let bookmark: (String, u16, FileTransferProtocol, String) = client.get_recent(&recent_key).unwrap(); let bookmark: (String, u16, FileTransferProtocol, String) =
client.get_recent(&recent_key).unwrap();
assert_eq!(bookmark.0, String::from("192.168.1.31")); assert_eq!(bookmark.0, String::from("192.168.1.31"));
assert_eq!(bookmark.1, 22); assert_eq!(bookmark.1, 22);
assert_eq!(bookmark.2, FileTransferProtocol::Sftp); assert_eq!(bookmark.2, FileTransferProtocol::Sftp);
@@ -439,11 +459,20 @@ mod tests {
let tmp_dir: tempfile::TempDir = create_tmp_dir(); let tmp_dir: tempfile::TempDir = create_tmp_dir();
let (cfg_path, key_path): (PathBuf, PathBuf) = get_paths(tmp_dir.path()); let (cfg_path, key_path): (PathBuf, PathBuf) = get_paths(tmp_dir.path());
// Initialize a new bookmarks client // Initialize a new bookmarks client
let mut client: BookmarksClient = BookmarksClient::new(cfg_path.as_path(), key_path.as_path()).unwrap(); let mut client: BookmarksClient =
BookmarksClient::new(cfg_path.as_path(), key_path.as_path()).unwrap();
// Add bookmark // Add bookmark
client.add_bookmark(String::from("raspberry"), String::from("192.168.1.31"), 22, FileTransferProtocol::Sftp, String::from("pi"), Some(String::from("mypassword"))); client.add_bookmark(
String::from("raspberry"),
String::from("192.168.1.31"),
22,
FileTransferProtocol::Sftp,
String::from("pi"),
Some(String::from("mypassword")),
);
// Get bookmark // Get bookmark
let bookmark: (String, u16, FileTransferProtocol, String, Option<String>) = client.get_bookmark(&String::from("raspberry")).unwrap(); let bookmark: (String, u16, FileTransferProtocol, String, Option<String>) =
client.get_bookmark(&String::from("raspberry")).unwrap();
assert_eq!(bookmark.0, String::from("192.168.1.31")); assert_eq!(bookmark.0, String::from("192.168.1.31"));
assert_eq!(bookmark.1, 22); assert_eq!(bookmark.1, 22);
assert_eq!(bookmark.2, FileTransferProtocol::Sftp); assert_eq!(bookmark.2, FileTransferProtocol::Sftp);
@@ -464,12 +493,19 @@ mod tests {
let tmp_dir: tempfile::TempDir = create_tmp_dir(); let tmp_dir: tempfile::TempDir = create_tmp_dir();
let (cfg_path, key_path): (PathBuf, PathBuf) = get_paths(tmp_dir.path()); let (cfg_path, key_path): (PathBuf, PathBuf) = get_paths(tmp_dir.path());
// Initialize a new bookmarks client // Initialize a new bookmarks client
let mut client: BookmarksClient = BookmarksClient::new(cfg_path.as_path(), key_path.as_path()).unwrap(); let mut client: BookmarksClient =
BookmarksClient::new(cfg_path.as_path(), key_path.as_path()).unwrap();
// Add bookmark // Add bookmark
client.add_recent(String::from("192.168.1.31"), 22, FileTransferProtocol::Sftp, String::from("pi")); client.add_recent(
String::from("192.168.1.31"),
22,
FileTransferProtocol::Sftp,
String::from("pi"),
);
let key: String = String::from(client.iter_recents().next().unwrap()); let key: String = String::from(client.iter_recents().next().unwrap());
// Get bookmark // Get bookmark
let bookmark: (String, u16, FileTransferProtocol, String) = client.get_recent(&key).unwrap(); let bookmark: (String, u16, FileTransferProtocol, String) =
client.get_recent(&key).unwrap();
assert_eq!(bookmark.0, String::from("192.168.1.31")); assert_eq!(bookmark.0, String::from("192.168.1.31"));
assert_eq!(bookmark.1, 22); assert_eq!(bookmark.1, 22);
assert_eq!(bookmark.2, FileTransferProtocol::Sftp); assert_eq!(bookmark.2, FileTransferProtocol::Sftp);
@@ -485,7 +521,7 @@ mod tests {
} }
/// ### get_paths /// ### get_paths
/// ///
/// Get paths for configuration and key for bookmarks /// Get paths for configuration and key for bookmarks
fn get_paths(dir: &Path) -> (PathBuf, PathBuf) { fn get_paths(dir: &Path) -> (PathBuf, PathBuf) {
let mut k: PathBuf = PathBuf::from(dir); let mut k: PathBuf = PathBuf::from(dir);
@@ -496,10 +532,9 @@ mod tests {
} }
/// ### create_tmp_dir /// ### create_tmp_dir
/// ///
/// Create temporary directory /// Create temporary directory
fn create_tmp_dir() -> tempfile::TempDir { fn create_tmp_dir() -> tempfile::TempDir {
tempfile::TempDir::new().ok().unwrap() tempfile::TempDir::new().ok().unwrap()
} }
} }

2
src/ui/activities/auth_activity/bookmarks.rs
View File

@@ -228,7 +228,7 @@ impl AuthActivity {
// Prepare paths // Prepare paths
let mut bookmarks_file: PathBuf = path.clone(); let mut bookmarks_file: PathBuf = path.clone();
bookmarks_file.push("bookmarks.toml"); bookmarks_file.push("bookmarks.toml");
let mut key_file: PathBuf = path.clone(); let mut key_file: PathBuf = path;
key_file.push(".bookmarks.key"); // key file is hidden key_file.push(".bookmarks.key"); // key file is hidden
// Initialize client // Initialize client
match BookmarksClient::new(bookmarks_file.as_path(), key_file.as_path()) { match BookmarksClient::new(bookmarks_file.as_path(), key_file.as_path()) {

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

@@ -269,7 +269,7 @@ impl FileTransferActivity {
/// ///
/// Instantiates a new FileTransferActivity /// Instantiates a new FileTransferActivity
pub fn new(params: FileTransferParams) -> FileTransferActivity { pub fn new(params: FileTransferParams) -> FileTransferActivity {
let protocol: FileTransferProtocol = params.protocol.clone(); let protocol: FileTransferProtocol = params.protocol;
FileTransferActivity { FileTransferActivity {
disconnected: false, disconnected: false,
quit: false, quit: false,