X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fcommon%2Fshell.rs;h=097bd0cf8d7e5b9cd8b85134aadf4bbe50cc1cb3;hb=cc19114907acfc14874032c8cb520138dd47c31c;hp=bb59b62e322f62edd5e81685d9cf4664361f3837;hpb=ed56d89bbb0692755ed06f18d227d4d1e39e6b05;p=gps-watch.git

diff --git a/src/common/shell.rs b/src/common/shell.rs
index bb59b62..097bd0c 100644
--- a/src/common/shell.rs
+++ b/src/common/shell.rs
@@ -79,6 +79,44 @@ impl<'a> Iterator for ArgumentIter<'a> {
     }
 }
 
+fn atoi32(s: &[u8]) -> Option<u32> {
+    let mut u = 0u32;
+
+    for o in 0..s.len() {
+        let c = s[o];
+        let zero = b'0' as u8;
+        let nine = b'9' as u8;
+
+        if c < zero || c > nine {
+            return None;
+        }
+
+        let d = (c - zero) as u32;
+
+        if let Some(u2) = u.checked_mul(10) {
+            if let Some(u3) = u2.checked_add(d) {
+                u = u3;
+            } else {
+                return None;
+            }
+        } else {
+            return None;
+        }
+    }
+
+    Some(u)
+}
+
+fn atoi16(s: &[u8]) -> Option<u16> {
+    atoi32(s).and_then(|u| {
+        if u <= u16::max_value() as u32 {
+            Some(u as u16)
+        } else {
+            None
+        }
+    })
+}
+
 fn read_char() -> Option<u8> {
     unsafe {
         let mut c = b'\0';
@@ -159,6 +197,8 @@ impl<'a> Shell<'a> {
                 let usage = b"\
 Supported commands:
     help           Show this help message.
+    ls             List recordings.
+    get REC_ID     Retrieve recording.
     clear_storage  Fully erase the flash's contents.
     dump_storage   Dump the flash's contents.
 ";
@@ -166,6 +206,8 @@ Supported commands:
                 self.tx_buf.write(usage);
             },
 
+            Some(b"ls") => self.run_ls(logger),
+            Some(b"get") => self.run_get(logger, &mut args_iter),
             Some(b"clear_storage") => self.run_clear_storage(logger),
             Some(b"dump_storage") => self.run_dump_storage(logger),
 
@@ -180,6 +222,48 @@ Supported commands:
         }
     }
 
+    fn run_ls(&mut self, logger: &mut Logger) {
+        logger.list_recordings(self.tx_buf);
+    }
+
+    fn run_get(&mut self, logger: &mut Logger, args_iter: &mut ArgumentIter) {
+        if let Some(recording_id_s) = args_iter.next() {
+            if let Some(recording_id) = atoi16(recording_id_s) {
+                if logger.has_recording(recording_id) {
+                    self.tx_buf.write(b"waiting for receiver to start...\n");
+                    self.tx_buf.flush();
+
+                    let have_receiver = read_char_delay_ms(5000).map(|c| {
+                        c == b'R'
+                    }).map_or_else(|| {
+                        false
+                    }, |_| {
+                        let result = logger.get_recording(recording_id,
+                                                          self.tx_buf);
+
+                        if result.is_err() {
+                            self.tx_buf.write(b"get: failed to retrieve recording\n");
+                        }
+
+                        true
+                    });
+
+                    if !have_receiver {
+                        self.tx_buf.write(b"no signal from receiver\n");
+                    }
+                } else {
+                    self.tx_buf.write(b"get: no such recording\n");
+                }
+            } else {
+                self.tx_buf.write(b"get: invalid argument\n");
+            }
+        } else {
+            self.tx_buf.write(b"get: missing argument\n");
+        }
+
+        self.tx_buf.flush();
+    }
+
     fn run_clear_storage(&self, logger: &mut Logger) {
         logger.storage.clear();
     }