common: Use slice.swap() to clean up SectorHeaderIter::sort().

[gps-watch.git] / src / common / logger.rs

diff --git a/src/common/logger.rs b/src/common/logger.rs
index 029cc9a473466f52b346762b3568e8eda4e1a514..95f4a4342a1f0320f76a98b26d5909f217442663 100644 (file)
--- a/src/common/logger.rs
+++ b/src/common/logger.rs
@@ -28,6 +28,7 @@ use systick::elapsed_ms;
 use buffer::Buffer;
 use yencode::Yencode;
 use fmt::*;
+use time::Time;
 
 pub const MEMORY_SIZE: usize = 2 << 20;
 const SECTOR_SIZE: usize = 4 << 10;
@@ -204,18 +205,7 @@ impl<'a> SectorHeaderIter<'a> {
 
         if num_elts_to_sort != 0 {
             // Sort the used directory entries.
-            for i in (1..((num_elts_to_sort + 1) / 2) + 1).rev() {
-                downheap(&mut iter.indices, i - 1, num_elts_to_sort - 1,
-                         iter.sector_header);
-            }
-
-            for i in (1..num_elts_to_sort).rev() {
-                let t = iter.indices[0];
-                iter.indices[0] = iter.indices[i];
-                iter.indices[i] = t;
-
-                downheap(&mut iter.indices, 0, i - 1, iter.sector_header);
-            }
+            iter.sort(num_elts_to_sort);
         }
 
         // Now put the indices of the unused directory entries in the array.
@@ -254,6 +244,19 @@ impl<'a> SectorHeaderIter<'a> {
 
         iter
     }
+
+    fn sort(&mut self, num_elts_to_sort: usize) {
+        for i in (1..((num_elts_to_sort + 1) / 2) + 1).rev() {
+            downheap(&mut self.indices, i - 1, num_elts_to_sort - 1,
+                     self.sector_header);
+        }
+
+        for i in (1..num_elts_to_sort).rev() {
+            self.indices.swap(0, i);
+
+            downheap(&mut self.indices, 0, i - 1, self.sector_header);
+        }
+    }
 }
 
 impl<'a> Iterator for SectorHeaderIter<'a> {
@@ -341,7 +344,7 @@ impl<'a> Logger<'a> {
 
     fn read_sector_header(&mut self, sector_index: usize) {
         let address = sector_index * SECTOR_SIZE;
-        let mut chunk = [0u8; 4];
+        let mut chunk = [0u8; 8];
 
         self.storage.read(address, &mut chunk);
 
@@ -430,8 +433,10 @@ impl<'a> Logger<'a> {
 
         let this_sector = self.first_sector + self.sectors_written;
 
-        self.storage.write(this_sector as usize * SECTOR_SIZE,
-                           &self.write_buffer);
+        if self.storage.write(this_sector as usize * SECTOR_SIZE,
+                              &self.write_buffer).is_err() {
+            // XXX
+        }
 
         self.sectors_written += 1;
 
@@ -553,8 +558,10 @@ impl<'a> Logger<'a> {
             // our buffer with 0xff, so we don't need to do anything here.
             let this_sector = self.first_sector + self.sectors_written;
 
-            self.storage.write(this_sector as usize * SECTOR_SIZE,
-                               &self.write_buffer);
+            if self.storage.write(this_sector as usize * SECTOR_SIZE,
+                                  &self.write_buffer).is_err() {
+                // XXX
+            }
 
             self.sectors_written += 1;
 
@@ -570,6 +577,38 @@ impl<'a> Logger<'a> {
         self.write_buffer_offset += num_bytes_written;
     }
 
+    ///
+    /// Write a listing of the stored recordings to @p tx_buf.
+    pub fn list_recordings(&mut self, tx_buf: &mut Buffer) {
+        for index in self.sector_header_iter().rev() {
+            let sector_header = &self.sector_header[index as usize];
+
+            if !sector_header.starts_recording() {
+                continue;
+            }
+
+            let mut date_time_s = [b' '; 19];
+
+            if let Some(tm) = Time::from_unix_time(sector_header.start_time) {
+                tm.fmt_date(&mut date_time_s[0..]);
+                tm.fmt_time(&mut date_time_s[11..]);
+            }
+
+            let mut recording_id_s = [b'0'; 9];
+            let recording_id_s_len =
+                fmt_u32_pad(&mut recording_id_s,
+                            sector_header.recording_id as u32,
+                            8, b' ');
+
+            tx_buf.write(&date_time_s);
+            tx_buf.write(b"       ");
+            tx_buf.write(&recording_id_s[0..recording_id_s_len]);
+            tx_buf.write(b"\n");
+
+            tx_buf.flush();
+        }
+    }
+
     ///
     /// Check whether or not recording @p recording_id exists.
     pub fn has_recording(&mut self, recording_id: u16) -> bool {