X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fcommon%2Flogger.rs;h=022b155f7d1b90b9667d5291dd4b8da9115b5dbb;hb=a8836e8e83b9fbcd551eb1882dabac01c03efd3b;hp=824e26ca10b2025e6cd906804a8109897922354d;hpb=946cce9fdf4094ca5b3e2dd764a44e68cd3bf3a6;p=gps-watch.git diff --git a/src/common/logger.rs b/src/common/logger.rs index 824e26c..022b155 100644 --- 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,21 @@ 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() { + let t = self.indices[0]; + self.indices[0] = self.indices[i]; + self.indices[i] = t; + + downheap(&mut self.indices, 0, i - 1, self.sector_header); + } + } } impl<'a> Iterator for SectorHeaderIter<'a> { @@ -341,7 +346,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); @@ -574,6 +579,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 {