From 52e5cc942dca20afa7912d09f5e1fa2a56c75bef Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Fri, 22 Nov 2019 11:37:18 -0500
Subject: more information on the list page

---
 teleterm-web/src/lib.rs        |  2 +-
 teleterm-web/src/model.rs      | 15 +++++------
 teleterm-web/src/protocol.rs   | 17 +++++++++++++
 teleterm-web/src/views/list.rs | 58 +++++++++++++++++++++++++++++++++++-------
 4 files changed, 73 insertions(+), 19 deletions(-)

(limited to 'teleterm-web')

diff --git a/teleterm-web/src/lib.rs b/teleterm-web/src/lib.rs
index 2ff1514..7e0f460 100644
--- a/teleterm-web/src/lib.rs
+++ b/teleterm-web/src/lib.rs
@@ -9,7 +9,7 @@ use crate::prelude::*;
 #[allow(clippy::large_enum_variant)]
 #[derive(Clone)]
 enum Msg {
-    List(seed::fetch::ResponseDataResult<Vec<crate::model::Session>>),
+    List(seed::fetch::ResponseDataResult<Vec<crate::protocol::Session>>),
     Refresh,
     StartWatching(String),
     Watch(String, ws::WebSocketEvent),
diff --git a/teleterm-web/src/model.rs b/teleterm-web/src/model.rs
index dfaccc8..fa0cb63 100644
--- a/teleterm-web/src/model.rs
+++ b/teleterm-web/src/model.rs
@@ -14,15 +14,9 @@ impl Drop for WatchConn {
     }
 }
 
-#[derive(Clone, Debug, serde::Deserialize)]
-pub struct Session {
-    pub id: String,
-    pub username: String,
-}
-
 #[derive(Default)]
 pub struct Model {
-    sessions: Vec<Session>,
+    sessions: Vec<crate::protocol::Session>,
     watch_conn: Option<WatchConn>,
 }
 
@@ -48,11 +42,14 @@ impl Model {
         self.watch_conn = Some(WatchConn { ws, term })
     }
 
-    pub fn sessions(&self) -> &[Session] {
+    pub fn sessions(&self) -> &[crate::protocol::Session] {
         &self.sessions
     }
 
-    pub fn update_sessions(&mut self, sessions: Vec<Session>) {
+    pub fn update_sessions(
+        &mut self,
+        sessions: Vec<crate::protocol::Session>,
+    ) {
         self.sessions = sessions;
     }
 
diff --git a/teleterm-web/src/protocol.rs b/teleterm-web/src/protocol.rs
index af40891..60047e0 100644
--- a/teleterm-web/src/protocol.rs
+++ b/teleterm-web/src/protocol.rs
@@ -6,3 +6,20 @@ pub enum Message {
     TerminalOutput { data: Vec<u8> },
     Disconnected,
 }
+
+#[derive(Clone, Debug, serde::Deserialize)]
+pub struct Session {
+    pub id: String,
+    pub username: String,
+    pub term_type: String,
+    pub size: Size,
+    pub idle_time: u32,
+    pub title: String,
+    pub watchers: u32,
+}
+
+#[derive(Clone, Debug, serde::Deserialize)]
+pub struct Size {
+    pub rows: u16,
+    pub cols: u16,
+}
diff --git a/teleterm-web/src/views/list.rs b/teleterm-web/src/views/list.rs
index 75fddf2..6d4ccd5 100644
--- a/teleterm-web/src/views/list.rs
+++ b/teleterm-web/src/views/list.rs
@@ -1,18 +1,58 @@
 use crate::prelude::*;
 
 pub(crate) fn render(model: &crate::model::Model) -> Vec<Node<crate::Msg>> {
-    let mut list = vec![];
-    for session in model.sessions() {
-        list.push(seed::li![seed::button![
+    let rows: Vec<_> = model.sessions().iter().map(row).collect();
+    vec![
+        seed::table![
+            seed::tr![
+                seed::th!["username"],
+                seed::th!["size"],
+                seed::th!["idle"],
+                seed::th!["watchers"],
+                seed::th!["title"],
+            ],
+            rows
+        ],
+        seed::button![simple_ev(Ev::Click, crate::Msg::Refresh), "refresh"],
+    ]
+}
+
+fn row(session: &crate::protocol::Session) -> Node<crate::Msg> {
+    seed::tr![
+        seed::td![seed::a![
             simple_ev(
                 Ev::Click,
                 crate::Msg::StartWatching(session.id.clone())
             ),
-            format!("{}: {}", session.username, session.id),
-        ]]);
-    }
-    vec![
-        seed::ul![list],
-        seed::button![simple_ev(Ev::Click, crate::Msg::Refresh), "refresh"],
+            session.username,
+        ]],
+        seed::td![format!("{}x{}", session.size.cols, session.size.rows)],
+        seed::td![format_time(session.idle_time)],
+        seed::td![format!("{}", session.watchers)],
+        seed::td![session.title],
     ]
 }
+
+// XXX copied from teleterm
+fn format_time(dur: u32) -> String {
+    let secs = dur % 60;
+    let dur = dur / 60;
+    if dur == 0 {
+        return format!("{}s", secs);
+    }
+
+    let mins = dur % 60;
+    let dur = dur / 60;
+    if dur == 0 {
+        return format!("{}m{:02}s", mins, secs);
+    }
+
+    let hours = dur % 24;
+    let dur = dur / 24;
+    if dur == 0 {
+        return format!("{}h{:02}m{:02}s", hours, mins, secs);
+    }
+
+    let days = dur;
+    format!("{}d{:02}h{:02}m{:02}s", days, hours, mins, secs)
+}
-- 
cgit v1.2.3-54-g00ecf