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

Report errors as alerts

Browse Source
This commit is contained in:
ChristianVisintin
2020-12-05 19:36:33 +01:00
parent d73d56576c
commit 7e5e5d2df2
3 changed files with 234 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -332,6 +332,10 @@ impl FileTransferActivity {
LogLevel::Error, LogLevel::Error,
format!("Could not get current remote path: {}", err).as_ref(), format!("Could not get current remote path: {}", err).as_ref(),
); );
self.input_mode = InputMode::Popup(PopupType::Alert(
Color::Red,
format!("Could not get current remote path: {}", err),
));
return; return;
} }
}; };

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

@@ -137,7 +137,8 @@ impl FileTransferActivity {
) )
} }
} }
Err(err) => self.log( Err(err) => {
self.log(
LogLevel::Error, LogLevel::Error,
format!( format!(
"Failed to stat file \"{}\": {}", "Failed to stat file \"{}\": {}",
@@ -145,7 +146,17 @@ impl FileTransferActivity {
err err
) )
.as_ref(), .as_ref(),
);
self.input_mode =
InputMode::Popup(PopupType::Alert(
Color::Red,
format!(
"Failed to stat file \"{}\": {}",
realpath.display(),
err
), ),
));
}
} }
} }
} }
@@ -251,6 +262,10 @@ impl FileTransferActivity {
format!("Could not get current remote path: {}", err) format!("Could not get current remote path: {}", err)
.as_ref(), .as_ref(),
); );
self.input_mode = InputMode::Popup(PopupType::Alert(
Color::Red,
format!("Could not get current remote path: {}", err),
));
return; return;
} }
}; };
@@ -338,7 +353,8 @@ impl FileTransferActivity {
) )
} }
} }
Err(err) => self.log( Err(err) => {
self.log(
LogLevel::Error, LogLevel::Error,
format!( format!(
"Failed to stat file \"{}\": {}", "Failed to stat file \"{}\": {}",
@@ -346,7 +362,17 @@ impl FileTransferActivity {
err err
) )
.as_ref(), .as_ref(),
);
self.input_mode =
InputMode::Popup(PopupType::Alert(
Color::Red,
format!(
"Failed to stat file \"{}\": {}",
realpath.display(),
err
), ),
));
}
} }
} }
} }

158
src/ui/activities/filetransfer_activity/session.rs
View File

@@ -143,6 +143,10 @@ impl FileTransferActivity {
LogLevel::Error, LogLevel::Error,
format!("Could not rewind local file: {}", err).as_ref(), format!("Could not rewind local file: {}", err).as_ref(),
); );
self.input_mode = InputMode::Popup(PopupType::Alert(
Color::Red,
format!("Could not rewind local file: {}", err),
));
} }
// Write remote file // Write remote file
let mut total_bytes_written: usize = 0; let mut total_bytes_written: usize = 0;
@@ -170,6 +174,14 @@ impl FileTransferActivity {
format!("Could not write remote file: {}", err) format!("Could not write remote file: {}", err)
.as_ref(), .as_ref(),
); );
self.input_mode =
InputMode::Popup(PopupType::Alert(
Color::Red,
format!(
"Could not write remote file: {}",
err
),
));
} }
} }
} }
@@ -178,6 +190,10 @@ impl FileTransferActivity {
LogLevel::Error, LogLevel::Error,
format!("Could not read local file: {}", err).as_ref(), format!("Could not read local file: {}", err).as_ref(),
); );
self.input_mode = InputMode::Popup(PopupType::Alert(
Color::Red,
format!("Could not read local file: {}", err),
));
} }
} }
// Increase progress // Increase progress
@@ -207,7 +223,8 @@ impl FileTransferActivity {
.as_ref(), .as_ref(),
); );
} }
Err(err) => self.log( Err(err) => {
self.log(
LogLevel::Error, LogLevel::Error,
format!( format!(
"Failed to upload file \"{}\": {}", "Failed to upload file \"{}\": {}",
@@ -215,7 +232,16 @@ impl FileTransferActivity {
err err
) )
.as_ref(), .as_ref(),
);
self.input_mode = InputMode::Popup(PopupType::Alert(
Color::Red,
format!(
"Failed to upload file \"{}\": {}",
file.abs_path.display(),
err
), ),
));
}
}, },
Err(err) => { Err(err) => {
// Report error // Report error
@@ -228,6 +254,14 @@ impl FileTransferActivity {
) )
.as_ref(), .as_ref(),
); );
self.input_mode = InputMode::Popup(PopupType::Alert(
Color::Red,
format!(
"Failed to open file \"{}\": {}",
file.abs_path.display(),
err
),
));
} }
} }
} }
@@ -254,7 +288,8 @@ impl FileTransferActivity {
self.filetransfer_send(&entry, remote_path.as_path(), None); self.filetransfer_send(&entry, remote_path.as_path(), None);
} }
} }
Err(err) => self.log( Err(err) => {
self.log(
LogLevel::Error, LogLevel::Error,
format!( format!(
"Could not scan directory \"{}\": {}", "Could not scan directory \"{}\": {}",
@@ -262,10 +297,20 @@ impl FileTransferActivity {
err err
) )
.as_ref(), .as_ref(),
);
self.input_mode = InputMode::Popup(PopupType::Alert(
Color::Red,
format!(
"Could not scan directory \"{}\": {}",
dir.abs_path.display(),
err
), ),
));
} }
} }
Err(err) => self.log( }
Err(err) => {
self.log(
LogLevel::Error, LogLevel::Error,
format!( format!(
"Failed to create directory \"{}\": {}", "Failed to create directory \"{}\": {}",
@@ -273,7 +318,16 @@ impl FileTransferActivity {
err err
) )
.as_ref(), .as_ref(),
);
self.input_mode = InputMode::Popup(PopupType::Alert(
Color::Red,
format!(
"Failed to create directory \"{}\": {}",
remote_path.display(),
err
), ),
));
}
} }
} }
} }
@@ -281,8 +335,13 @@ impl FileTransferActivity {
if let Ok(path) = self.client.pwd() { if let Ok(path) = self.client.pwd() {
self.remote_scan(path.as_path()); self.remote_scan(path.as_path());
} }
// Eventually, Reset input mode to explorer // Eventually, Reset input mode to explorer (if input mode is wait or progress)
self.input_mode = InputMode::Explorer; if let InputMode::Popup(ptype) = &self.input_mode {
match ptype {
PopupType::Wait(_) | PopupType::Progress(_) => self.input_mode = InputMode::Explorer,
_ => { /* Nothing to do */ }
}
}
} }
/// ### filetransfer_recv /// ### filetransfer_recv
@@ -358,13 +417,28 @@ impl FileTransferActivity {
) )
.as_ref(), .as_ref(),
); );
} self.input_mode =
} InputMode::Popup(PopupType::Alert(
} Color::Red,
Err(err) => self.log( format!(
LogLevel::Error, "Could not write local file: {}",
format!("Could not read remote file: {}", err).as_ref(), err
), ),
));
}
}
}
Err(err) => {
self.log(
LogLevel::Error,
format!("Could not read remote file: {}", err)
.as_ref(),
);
self.input_mode = InputMode::Popup(PopupType::Alert(
Color::Red,
format!("Could not read remote file: {}", err),
));
}
} }
// Set progress // Set progress
self.set_progress(total_bytes_written, file.size); self.set_progress(total_bytes_written, file.size);
@@ -394,7 +468,8 @@ impl FileTransferActivity {
.as_ref(), .as_ref(),
); );
} }
Err(err) => self.log( Err(err) => {
self.log(
LogLevel::Error, LogLevel::Error,
format!( format!(
"Failed to download file \"{}\": {}", "Failed to download file \"{}\": {}",
@@ -402,7 +477,16 @@ impl FileTransferActivity {
err err
) )
.as_ref(), .as_ref(),
);
self.input_mode = InputMode::Popup(PopupType::Alert(
Color::Red,
format!(
"Failed to download file \"{}\": {}",
file.abs_path.display(),
err
), ),
));
}
} }
} }
Err(err) => { Err(err) => {
@@ -416,6 +500,14 @@ impl FileTransferActivity {
) )
.as_ref(), .as_ref(),
); );
self.input_mode = InputMode::Popup(PopupType::Alert(
Color::Red,
format!(
"Failed to open local file for write \"{}\": {}",
local_file_path.display(),
err
),
));
} }
} }
} }
@@ -449,7 +541,8 @@ impl FileTransferActivity {
self.filetransfer_recv(&entry, local_dir_path.as_path(), None); self.filetransfer_recv(&entry, local_dir_path.as_path(), None);
} }
} }
Err(err) => self.log( Err(err) => {
self.log(
LogLevel::Error, LogLevel::Error,
format!( format!(
"Could not scan directory \"{}\": {}", "Could not scan directory \"{}\": {}",
@@ -457,10 +550,20 @@ impl FileTransferActivity {
err err
) )
.as_ref(), .as_ref(),
);
self.input_mode = InputMode::Popup(PopupType::Alert(
Color::Red,
format!(
"Could not scan directory \"{}\": {}",
dir.abs_path.display(),
err
), ),
));
} }
} }
Err(err) => self.log( }
Err(err) => {
self.log(
LogLevel::Error, LogLevel::Error,
format!( format!(
"Failed to create directory \"{}\": {}", "Failed to create directory \"{}\": {}",
@@ -468,7 +571,8 @@ impl FileTransferActivity {
err err
) )
.as_ref(), .as_ref(),
), );
}
} }
} }
} }
@@ -488,7 +592,7 @@ impl FileTransferActivity {
// Set index; keep if possible, otherwise set to last item // Set index; keep if possible, otherwise set to last item
self.local.index = match self.local.files.get(self.local.index) { self.local.index = match self.local.files.get(self.local.index) {
Some(_) => self.local.index, Some(_) => self.local.index,
None => self.local.files.len() - 1 None => self.local.files.len() - 1,
}; };
// Sort files // Sort files
self.local.sort_files_by_name(); self.local.sort_files_by_name();
@@ -498,6 +602,10 @@ impl FileTransferActivity {
LogLevel::Error, LogLevel::Error,
format!("Could not scan current directory: {}", err).as_str(), format!("Could not scan current directory: {}", err).as_str(),
); );
self.input_mode = InputMode::Popup(PopupType::Alert(
Color::Red,
format!("Could not scan current directory: {}", err),
));
} }
} }
} }
@@ -512,7 +620,7 @@ impl FileTransferActivity {
// Set index; keep if possible, otherwise set to last item // Set index; keep if possible, otherwise set to last item
self.remote.index = match self.remote.files.get(self.remote.index) { self.remote.index = match self.remote.files.get(self.remote.index) {
Some(_) => self.remote.index, Some(_) => self.remote.index,
None => self.remote.files.len() - 1 None => self.remote.files.len() - 1,
}; };
// Sort files // Sort files
self.remote.sort_files_by_name(); self.remote.sort_files_by_name();
@@ -522,6 +630,10 @@ impl FileTransferActivity {
LogLevel::Error, LogLevel::Error,
format!("Could not scan current directory: {}", err).as_str(), format!("Could not scan current directory: {}", err).as_str(),
); );
self.input_mode = InputMode::Popup(PopupType::Alert(
Color::Red,
format!("Could not scan current directory: {}", err),
));
} }
} }
} }
@@ -556,6 +668,10 @@ impl FileTransferActivity {
} }
Err(err) => { Err(err) => {
// Report err // Report err
self.log(
LogLevel::Error,
format!("Could not change working directory: {}", err).as_str(),
);
self.input_mode = InputMode::Popup(PopupType::Alert( self.input_mode = InputMode::Popup(PopupType::Alert(
Color::Red, Color::Red,
format!("Could not change working directory: {}", err), format!("Could not change working directory: {}", err),
@@ -586,6 +702,10 @@ impl FileTransferActivity {
} }
Err(err) => { Err(err) => {
// Report err // Report err
self.log(
LogLevel::Error,
format!("Could not change working directory: {}", err).as_str(),
);
self.input_mode = InputMode::Popup(PopupType::Alert( self.input_mode = InputMode::Popup(PopupType::Alert(
Color::Red, Color::Red,
format!("Could not change working directory: {}", err), format!("Could not change working directory: {}", err),
@@ -595,6 +715,10 @@ impl FileTransferActivity {
} }
Err(err) => { Err(err) => {
// Report err // Report err
self.log(
LogLevel::Error,
format!("Could not change working directory: {}", err).as_str(),
);
self.input_mode = InputMode::Popup(PopupType::Alert( self.input_mode = InputMode::Popup(PopupType::Alert(
Color::Red, Color::Red,
format!("Could not change working directory: {}", err), format!("Could not change working directory: {}", err),