finish implementing list

dev_daemon.py

@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+
 import socket
 import sys
 import os

src/client.rs

@@ -1,7 +1,6 @@
 
-use std::io::{self, BufRead, BufReader, BufWriter, LineWriter, Write};
-use std::net::TcpStream;
-use std::path::{Path, PathBuf};
+use std::io::{self, BufRead, BufReader, LineWriter, Write};
+use std::path::PathBuf;
 use std::os::unix::net::UnixStream;
 
 use dirs;

src/daemon/handle_client.rs

@@ -30,7 +30,7 @@ impl CmdHandlerCtx {
  }
 
  fn list(&self) -> ListResponse {
- ListResponse::ok(self.state.get_timerinfo_for_client())
+ ListResponse::ok(self.state.get_timerinfo_for_client(self.now))
  }
 
 

src/daemon/state.rs

@@ -35,8 +35,8 @@ impl DaemonCtx {
  id
  }
 
- pub fn get_timerinfo_for_client(&self) -> Vec<TimerInfoForClient> {
- self.timers.get_timerinfo_for_client()
+ pub fn get_timerinfo_for_client(&self, now: Instant) -> Vec<TimerInfoForClient> {
+ self.timers.get_timerinfo_for_client(now)
  }
 
  pub fn add_timer(&self, now: Instant, duration: Duration) -> TimerId {

src/sand/timer.rs

@@ -32,10 +32,27 @@ pub enum Timer {
 }
 
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
-pub struct TimerInfoForClient;
+pub enum TimerStateForClient {
+ Paused,
+ Running,
+}
+
+#[derive(Debug, PartialEq, Serialize, Deserialize)]
+pub struct TimerInfoForClient {
+ id: TimerId,
+ state: TimerStateForClient,
+ remaining_millis: u64,
+}
 
-impl TimerInfoForClient {
- pub fn new(_id: TimerId, _timer: &Timer) -> Self {
- Self
+impl TimerInfoForClient {
+
+ pub fn new(id: TimerId, timer: &Timer, now: Instant) -> Self {
+ let (state, remaining_millis) = match timer {
+ Timer::Paused { remaining } =>
+ (TimerStateForClient::Paused, remaining.as_millis() as u64),
+ Timer::Running { due, .. } => 
+ (TimerStateForClient::Running, (*due - now).as_millis() as u64),
+ };
+ Self { id, state, remaining_millis }
  }
 }

src/sand/timers.rs

@@ -1,4 +1,6 @@
 
+use std::time::Instant;
+
 use dashmap::{DashMap, Entry};
 
 use crate::sand::timer::*;
@@ -13,9 +15,10 @@ impl Timers{
  }
  }
 
- pub fn get_timerinfo_for_client(&self) -> Vec<TimerInfoForClient> {
- self.0.iter().map(|rm| {
- TimerInfoForClient::new(*rm.key(), rm.value())
+ pub fn get_timerinfo_for_client(&self, now: Instant) -> Vec<TimerInfoForClient> {
+ self.0.iter().map(|ref_multi| {
+ let (id, timer) = ref_multi.pair();
+ TimerInfoForClient::new(*id, timer, now)
  }).collect()
  }
 

test.py

@@ -61,6 +61,9 @@ def daemon_socket():
  log(f"Removing socket file {SOCKET_PATH}")
  ensure_deleted(SOCKET_PATH)
 
+# TODO refactor daemon tests to use fake client, client tests to use fake daemon
+# they should be testable independently
+
 @pytest.fixture
 def daemon(daemon_socket):