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 ok

Browse Source
This commit is contained in:
ChristianVisintin
2020-12-15 16:31:21 +01:00
parent b865fed7e9
commit ff4f35e5f5
3 changed files with 61 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -250,7 +250,7 @@ impl AuthActivity {
}; };
Ok(Bookmark { Ok(Bookmark {
address: self.address.clone(), address: self.address.clone(),
port: port, port,
protocol: match self.protocol { protocol: match self.protocol {
FileTransferProtocol::Ftp(secure) => match secure { FileTransferProtocol::Ftp(secure) => match secure {
true => String::from("FTPS"), true => String::from("FTPS"),
@@ -267,33 +267,21 @@ impl AuthActivity {
/// ///
/// Write bookmarks to file /// Write bookmarks to file
fn write_bookmarks(&mut self) { fn write_bookmarks(&mut self) {
if self.bookmarks.is_some() { if self.bookmarks.is_some() && self.context.is_some() {
if self.context.is_some() { // Open file for write
// Open file for write if let Some(bookmarks_file) = self.init_bookmarks() {
if let Some(bookmarks_file) = self.init_bookmarks() { match self
match self .context
.context .as_ref()
.as_ref() .unwrap()
.unwrap() .local
.local .open_file_write(bookmarks_file.as_path())
.open_file_write(bookmarks_file.as_path()) {
{ Ok(writer) => {
Ok(writer) => { let serializer: BookmarkSerializer = BookmarkSerializer {};
let serializer: BookmarkSerializer = BookmarkSerializer {}; if let Err(err) = serializer
if let Err(err) = serializer .serialize(Box::new(writer), &self.bookmarks.as_ref().unwrap())
.serialize(Box::new(writer), &self.bookmarks.as_ref().unwrap()) {
{
self.input_mode = InputMode::Popup(PopupType::Alert(
Color::Yellow,
format!(
"Could not write default bookmarks at \"{}\": {}",
bookmarks_file.display(),
err
),
));
}
}
Err(err) => {
self.input_mode = InputMode::Popup(PopupType::Alert( self.input_mode = InputMode::Popup(PopupType::Alert(
Color::Yellow, Color::Yellow,
format!( format!(
@@ -301,9 +289,19 @@ impl AuthActivity {
bookmarks_file.display(), bookmarks_file.display(),
err err
), ),
)) ));
} }
} }
Err(err) => {
self.input_mode = InputMode::Popup(PopupType::Alert(
Color::Yellow,
format!(
"Could not write default bookmarks at \"{}\": {}",
bookmarks_file.display(),
err
),
))
}
} }
} }
} }
@@ -348,40 +346,27 @@ impl AuthActivity {
// Append bookmarks.toml // Append bookmarks.toml
p.push("bookmarks.toml"); p.push("bookmarks.toml");
// If bookmarks.toml doesn't exist, initializae it // If bookmarks.toml doesn't exist, initializae it
if self.context.is_some() { if self.context.is_some()
if !self && !self
.context .context
.as_ref() .as_ref()
.unwrap() .unwrap()
.local .local
.file_exists(p.as_path()) .file_exists(p.as_path())
{
// Write file
let default_hosts: UserHosts = Default::default();
match self
.context
.as_ref()
.unwrap()
.local
.open_file_write(p.as_path())
{ {
// Write file Ok(writer) => {
let default_hosts: UserHosts = Default::default(); let serializer: BookmarkSerializer = BookmarkSerializer {};
match self // Serialize and write
.context if let Err(err) = serializer.serialize(Box::new(writer), &default_hosts) {
.as_ref()
.unwrap()
.local
.open_file_write(p.as_path())
{
Ok(writer) => {
let serializer: BookmarkSerializer = BookmarkSerializer {};
// Serialize and write
if let Err(err) = serializer.serialize(Box::new(writer), &default_hosts)
{
self.input_mode = InputMode::Popup(PopupType::Alert(
Color::Yellow,
format!(
"Could not write default bookmarks at \"{}\": {}",
p.display(),
err
),
));
return None;
}
}
Err(err) => {
self.input_mode = InputMode::Popup(PopupType::Alert( self.input_mode = InputMode::Popup(PopupType::Alert(
Color::Yellow, Color::Yellow,
format!( format!(
@@ -393,6 +378,17 @@ impl AuthActivity {
return None; return None;
} }
} }
Err(err) => {
self.input_mode = InputMode::Popup(PopupType::Alert(
Color::Yellow,
format!(
"Could not write default bookmarks at \"{}\": {}",
p.display(),
err
),
));
return None;
}
} }
} }
// return path // return path

16
src/ui/activities/auth_activity/input.rs
View File

@@ -234,11 +234,9 @@ impl AuthActivity {
// Move bookmarks index up // Move bookmarks index up
if self.bookmarks_idx > 0 { if self.bookmarks_idx > 0 {
self.bookmarks_idx -= 1; self.bookmarks_idx -= 1;
} else { } else if let Some(hosts) = &self.bookmarks {
if let Some(hosts) = &self.bookmarks { // Put to last index (wrap)
// Put to last index (wrap) self.bookmarks_idx = hosts.bookmarks.len() - 1;
self.bookmarks_idx = hosts.bookmarks.len() - 1;
}
} }
} }
KeyCode::Down => { KeyCode::Down => {
@@ -317,11 +315,9 @@ impl AuthActivity {
// Move bookmarks index up // Move bookmarks index up
if self.recents_idx > 0 { if self.recents_idx > 0 {
self.recents_idx -= 1; self.recents_idx -= 1;
} else { } else if let Some(hosts) = &self.bookmarks {
if let Some(hosts) = &self.bookmarks { // Put to last index (wrap)
// Put to last index (wrap) self.recents_idx = hosts.recents.len() - 1;
self.recents_idx = hosts.recents.len() - 1;
}
} }
} }
KeyCode::Down => { KeyCode::Down => {

8
src/ui/activities/auth_activity/layout.rs
View File

@@ -273,9 +273,7 @@ impl AuthActivity {
/// ///
/// Draw local explorer list /// Draw local explorer list
pub(super) fn draw_bookmarks_tab(&self) -> Option<List> { pub(super) fn draw_bookmarks_tab(&self) -> Option<List> {
if self.bookmarks.is_none() { self.bookmarks.as_ref()?;
return None;
}
let hosts: Vec<ListItem> = self let hosts: Vec<ListItem> = self
.bookmarks .bookmarks
.as_ref() .as_ref()
@@ -318,9 +316,7 @@ impl AuthActivity {
/// ///
/// Draw local explorer list /// Draw local explorer list
pub(super) fn draw_recents_tab(&self) -> Option<List> { pub(super) fn draw_recents_tab(&self) -> Option<List> {
if self.bookmarks.is_none() { self.bookmarks.as_ref()?;
return None;
}
let hosts: Vec<ListItem> = self let hosts: Vec<ListItem> = self
.bookmarks .bookmarks
.as_ref() .as_ref()