maxmustermann/termscp
1
0
Fork 0
Code Issues Pull requests 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
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/ui/activities/auth_activity/bookmarks.rs
View file

@ -250,7 +250,7 @@ impl AuthActivity {
};
Ok(Bookmark {
address: self.address.clone(),
port: port,
port,
protocol: match self.protocol {
FileTransferProtocol::Ftp(secure) => match secure {
true => String::from("FTPS"),
@ -267,8 +267,7 @@ impl AuthActivity {
///
/// Write bookmarks to file
fn write_bookmarks(&mut self) {
if self.bookmarks.is_some() {
if self.context.is_some() {
if self.bookmarks.is_some() && self.context.is_some() {
// Open file for write
if let Some(bookmarks_file) = self.init_bookmarks() {
match self
@ -307,7 +306,6 @@ impl AuthActivity {
}
}
}
}
/// ### init_bookmarks
///
@ -348,8 +346,8 @@ impl AuthActivity {
// Append bookmarks.toml
p.push("bookmarks.toml");
// If bookmarks.toml doesn't exist, initializae it
if self.context.is_some() {
if !self
if self.context.is_some()
&& !self
.context
.as_ref()
.unwrap()
@ -368,8 +366,7 @@ impl AuthActivity {
Ok(writer) => {
let serializer: BookmarkSerializer = BookmarkSerializer {};
// Serialize and write
if let Err(err) = serializer.serialize(Box::new(writer), &default_hosts)
{
if let Err(err) = serializer.serialize(Box::new(writer), &default_hosts) {
self.input_mode = InputMode::Popup(PopupType::Alert(
Color::Yellow,
format!(
@ -394,7 +391,6 @@ impl AuthActivity {
}
}
}
}
// return path
Some(p)
} else {

8
src/ui/activities/auth_activity/input.rs
View file

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

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

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