From fc75ffcd4eab4c74b6e96e394a808e86d32a1518 Mon Sep 17 00:00:00 2001
From: John Doty <john@d0ty.me>
Date: Mon, 28 Nov 2022 06:41:26 -0800
Subject: [PATCH] Remove the disconnected screen

---
 src/client/ui.rs | 83 +++++++++++++++++++++++-------------------------
 1 file changed, 40 insertions(+), 43 deletions(-)

diff --git a/src/client/ui.rs b/src/client/ui.rs
index f14193b..42b1259 100644
--- a/src/client/ui.rs
+++ b/src/client/ui.rs
@@ -36,6 +36,11 @@ pub enum UIEvent {
     Ports(Vec<PortDesc>),
 }
 
+pub enum UIReturn {
+    Quit,
+    Disconnected,
+}
+
 #[derive(Debug, Clone)]
 pub struct Logger {
     line_sender: mpsc::Sender<UIEvent>,
@@ -164,62 +169,54 @@ impl UI {
         }
     }
 
-    pub async fn run(&mut self) -> Result<()> {
+    pub async fn run(&mut self) -> Result<UIReturn> {
+        loop {
+            while !self.connected() {
+                let ev = self.events.recv().await;
+                self.handle_internal_event(ev);
+            }
+
+            let result = self.run_connected().await;
+            _ = self.leave_alternate_screen();
+            _ = self.disable_raw_mode();
+
+            match result {
+                Err(e) => {
+                    return Err(e);
+                }
+                Ok(UIReturn::Disconnected) => {
+                    continue;
+                }
+                Ok(UIReturn::Quit) => {
+                    return Ok(UIReturn::Quit);
+                }
+            }
+        }
+    }
+
+    async fn run_connected(&mut self) -> Result<UIReturn> {
         let mut console_events = EventStream::new();
         self.enter_alternate_screen()?;
+        self.enable_raw_mode()?;
 
         let stdout = std::io::stdout();
         let backend = CrosstermBackend::new(stdout);
         let mut terminal = Terminal::new(backend)?;
 
-        let mut last_connected = false;
-
         self.running = true;
-        while self.running {
+        while self.running && self.connected() {
             self.handle_events(&mut console_events).await;
-
-            let pos = terminal.get_cursor()?;
-
-            if last_connected != self.connected() {
-                terminal.clear()?;
-                last_connected = self.connected();
-            }
-
-            if self.connected() {
-                self.enable_raw_mode()?;
-            } else {
-                self.disable_raw_mode()?;
-            }
-
             terminal.draw(|f| {
-                if self.connected() {
-                    self.render_connected(f);
-                } else {
-                    self.render_disconnected(f, pos);
-                }
+                self.render_connected(f);
             })?;
         }
 
-        Ok(())
-    }
-
-    fn render_disconnected<T: Backend>(
-        &mut self,
-        frame: &mut Frame<T>,
-        pos: (u16, u16),
-    ) {
-        let size = frame.size();
-
-        let block = Block::default()
-            .title(Span::styled(
-                "Not Connected",
-                Style::default().fg(Color::Black).bg(Color::Red),
-            ))
-            .borders(Borders::NONE);
-
-        frame.render_widget(block, size);
-
-        frame.set_cursor(pos.0, pos.1);
+        let code = if self.running {
+            UIReturn::Disconnected
+        } else {
+            UIReturn::Quit
+        };
+        Ok(code)
     }
 
     fn render_connected<T: Backend>(&mut self, frame: &mut Frame<T>) {