DevComp/ssh-portfolio
1
1
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor(ssh): remove commented out code and rearrange async block

Browse source
This commit is contained in:
Erica Marigold 2025-08-14 09:40:06 +01:00
parent 6242af5bff
commit dbd6ae9dad
Signed by: DevComp
SSH key fingerprint: SHA256:jD3oMT4WL3WHPJQbrjC3l5feNCnkv7ndW8nYaHX5wFw
1 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/ssh.rs
View file

@ -109,12 +109,6 @@ impl SshSession {
session: &Handle, session: &Handle,
channel_id: ChannelId, channel_id: ChannelId,
) -> eyre::Result<()> { ) -> eyre::Result<()> {
// let mut tui_inner = Tui::new(writer.clone())?;
// let mut app_tmp = app.lock().await;
// app_tmp.resize(&mut tui_inner, 169, 34)?;
// drop(app_tmp);
// tui.write().await.get_or_insert(tui_inner);
app.lock_owned().await.run(writer, tui).await?; app.lock_owned().await.run(writer, tui).await?;
session session
.close(channel_id) .close(channel_id)
@ -152,7 +146,7 @@ impl Handler for SshSession {
tracing::info!("Serving app to open session"); tracing::info!("Serving app to open session");
tokio::task::spawn(async move { tokio::task::spawn(async move {
let result: Result<(), Box<dyn std::error::Error + Send + Sync>> = (|| async { let result = async || -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
let ((term_width, term_height), (pixel_width, pixel_height)) = rx.await?; let ((term_width, term_height), (pixel_width, pixel_height)) = rx.await?;
let writer = Arc::new(Mutex::new(Terminal::new(SshBackend::new( let writer = Arc::new(Mutex::new(Terminal::new(SshBackend::new(
TermWriter::new(session_handle.clone(), channel), TermWriter::new(session_handle.clone(), channel),
@ -164,11 +158,9 @@ impl Handler for SshSession {
Self::run_app(inner_app, writer, tui, &session_handle, channel_id).await?; Self::run_app(inner_app, writer, tui, &session_handle, channel_id).await?;
Ok(()) Ok(())
})( };
)
.await;
match result { match result().await {
Ok(()) => tracing::info!("Session exited successfully"), Ok(()) => tracing::info!("Session exited successfully"),
Err(err) => { Err(err) => {
tracing::error!("Session errored: {err}"); tracing::error!("Session errored: {err}");