Remove unwrap (catching I/O error nicely) (#377)

* Remove unwrap (catching I/O error nicely)
* This may raise when falsely invoking from_file from a Gzip header
* or invoking from_gzip_file from a readable header
* bump to v0.20.2
* epoch: use epoch.to_gregorian directly
* hatanaka: remove unwrap from textdiff, iterating correctly
* Fix a few warnings

---------

Signed-off-by: Guillaume W. Bres <[email protected]>

Author: gwbres

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rinex"
-version = "0.20.1"
+version = "0.20.2"
 license = "MPL-2.0"
 authors = ["Guillaume W. Bres <[email protected]>"]
 description = "RINEX file parsing, analysis and production"

src/epoch.rs

@@ -5,8 +5,6 @@ use crate::{
     types::Type,
 };
 
-use std::str::FromStr;
-
 /// Infaillible `Epoch::now()` call.
 pub(crate) fn now() -> Epoch {
     Epoch::now().unwrap_or(Epoch::from_gregorian_utc_at_midnight(2000, 1, 1))
@@ -265,38 +263,8 @@ pub(crate) fn parse_ionex_utc(s: &str) -> Result<Epoch, ParsingError> {
     Ok(Epoch::from_gregorian_utc(y, m, d, hh, mm, ss, 0))
 }
 
-/*
- * Until Hifitime provides a decomposition method in timescale other than UTC
- * we have this tweak to decompose %Y %M %D %HH %MM %SS and without nanoseconds
- */
-pub(crate) fn epoch_decompose(e: Epoch) -> (i32, u8, u8, u8, u8, u8, u32) {
-    let isofmt = e.to_gregorian_str(e.time_scale);
-    let mut datetime = isofmt.split('T');
-    let date = datetime.next().unwrap();
-    let mut date = date.split('-');
-
-    let time = datetime.next().unwrap();
-    let mut time_scale = time.split(' ');
-    let time = time_scale.next().unwrap();
-    let mut time = time.split(':');
-
-    let years = date.next().unwrap().parse::<i32>().unwrap();
-    let months = date.next().unwrap().parse::<u8>().unwrap();
-    let days = date.next().unwrap().parse::<u8>().unwrap();
-
-    let hours = time.next().unwrap().parse::<u8>().unwrap();
-    let mins = time.next().unwrap().parse::<u8>().unwrap();
-    let seconds = f64::from_str(time.next().unwrap()).unwrap();
-
-    (
-        years,
-        months,
-        days,
-        hours,
-        mins,
-        seconds.floor() as u8,
-        (seconds.fract() * 1E9).round() as u32,
-    )
+pub(crate) fn epoch_decompose(epoch: Epoch) -> (i32, u8, u8, u8, u8, u8, u32) {
+    epoch.to_gregorian(epoch.time_scale)
 }
 
 #[cfg(test)]
@@ -336,6 +304,7 @@ mod test {
         assert_eq!(e.time_scale, TimeScale::UTC);
         assert_eq!(format(e, Type::NavigationData, 2), "21  1  1 16 15  0.0");
     }
+
     #[test]
     fn epoch_parse_nav_v2_nanos() {
         let e = parse_utc("20 12 31 23 45  0.1");
@@ -346,6 +315,7 @@ mod test {
         assert_eq!(ns, 100_000_000);
         assert_eq!(format(e, Type::NavigationData, 2), "20 12 31 23 45  0.1");
     }
+
     #[test]
     fn epoch_parse_nav_v3() {
         let e = parse_utc("2021 01 01 00 00 00 ");
@@ -401,6 +371,7 @@ mod test {
         assert_eq!(ns, 0);
         assert_eq!(format(e, Type::NavigationData, 3), "2020 06 25 09 49 04");
     }
+
     #[test]
     fn epoch_parse_obs_v2() {
         let e = parse_utc(" 21 12 21  0  0  0.0000000");
@@ -468,6 +439,7 @@ mod test {
             "21  1  1  0  7 30.0000000"
         );
     }
+
     #[test]
     fn epoch_parse_obs_v3() {
         let e = parse_utc(" 2022 01 09 00 00  0.0000000");
@@ -534,6 +506,7 @@ mod test {
             "2022 03 04 00 02 30.0000000"
         );
     }
+
     #[test]
     fn epoch_parse_obs_v2_nanos() {
         let e = parse_utc(" 21  1  1  0  7 39.1234567");
@@ -547,6 +520,7 @@ mod test {
             "21  1  1  0  7 39.1234567"
         );
     }
+
     #[test]
     fn epoch_parse_obs_v3_nanos() {
         let e = parse_utc("2022 01 09 00 00  0.1000000");
@@ -582,6 +556,7 @@ mod test {
             "2022 01 09 00 00  8.7654321"
         );
     }
+
     #[test]
     fn epoch_parse_meteo_v2() {
         let e = parse_utc(" 22  1  4  0  0  0  ");
@@ -597,6 +572,7 @@ mod test {
         assert_eq!(ns, 0);
         assert_eq!(format(e, Type::MeteoData, 2), "22  1  4  0  0  0");
     }
+
     #[test]
     fn ionex_parsing() {
         for (desc, expected) in [(
@@ -609,6 +585,7 @@ mod test {
             assert_eq!(epoch, expected, "invalid IONEX/UTC epoch");
         }
     }
+
     #[test]
     fn epoch_decomposition() {
         for (epoch, y, m, d, hh, mm, ss, ns) in [
@@ -630,6 +607,7 @@ mod test {
             );
         }
     }
+
     #[test]
     fn test_formatted_month() {
         assert_eq!(parse_formatted_month("Jan").unwrap(), 1);

src/hatanaka/textdiff.rs

@@ -85,15 +85,17 @@ impl TextDiff {
             let mut compressed = self.compressed.as_bytes_mut().iter_mut();
 
             while let Some(buffered) = buffered.next() {
-                let byte = bytes.next().unwrap();
-                let compressed = compressed.next().unwrap();
-                if byte == buffered {
-                    *compressed = b' ';
-                } else {
-                    if *byte == b' ' {
-                        *compressed = b'&';
-                    } else {
-                        *compressed = *byte;
+                if let Some(byte) = bytes.next() {
+                    if let Some(compressed) = compressed.next() {
+                        if byte == buffered {
+                            *compressed = b' ';
+                        } else {
+                            if *byte == b' ' {
+                                *compressed = b'&';
+                            } else {
+                                *compressed = *byte;
+                            }
+                        }
                     }
                 }
             }

src/header/parsing.rs

@@ -72,11 +72,17 @@ impl Header {
         let mut ionex = IonexHeaderFields::default();
         let mut doris = DorisHeader::default();
 
-        for l in reader.lines() {
-            let line = l.unwrap();
+        for line in reader.lines() {
+            if line.is_err() {
+                continue;
+            }
+
+            let line = line.unwrap();
+
             if line.len() < 60 {
                 continue; // --> invalid header content
             }
+
             let (content, marker) = line.split_at(60);
             ///////////////////////////////
             // [0] END OF HEADER

src/navigation/ephemeris/mod.rs

@@ -269,8 +269,6 @@ impl Ephemeris {
 
     /// Return Time of [Ephemeris] (ToE) expressed as [Epoch]
     pub fn toe(&self, sv: SV) -> Option<Epoch> {
-        let timescale = sv.constellation.timescale()?;
-
         // TODO: in CNAV V4 TOC is said to be TOE... ...
         let (week, seconds) = (self.get_week()?, self.get_orbit_f64("toe")?);
         let nanos = (seconds * 1.0E9).round() as u64;

src/navigation/rinex/feature.rs

@@ -15,7 +15,7 @@ impl Rinex {
     /// ## Returns
     /// - orbital state: expressed as ECEF [Orbit]
     pub fn sv_orbit(&self, sv: SV, t: Epoch) -> Option<Orbit> {
-        let (toc, _, eph) = self.nav_ephemeris_selection(sv, t)?;
+        let (_, _, eph) = self.nav_ephemeris_selection(sv, t)?;
         eph.kepler2position(sv, t)
     }
 
@@ -52,8 +52,6 @@ impl Rinex {
     /// Note that `ToE` does not exist for GEO/SBAS [SV], so `ToC` is simply
     /// copied in this case, to maintain the API.
     pub fn nav_ephemeris_selection(&self, sv: SV, t: Epoch) -> Option<(Epoch, Epoch, &Ephemeris)> {
-        let sv_ts = sv.constellation.timescale()?;
-
         if sv.constellation.is_sbas() {
             self.nav_ephemeris_frames_iter()
                 .filter_map(|(k, eph)| {

src/navigation/time/parsing.rs

@@ -156,7 +156,7 @@ impl TimeOffset {
         let t_ref = parse_epoch_in_timescale(epoch.trim(), lhs)?;
         let (t_week, t_nanos) = t_ref.to_time_of_week();
 
-        let (t_tm, rem) = line_2.split_at(23);
+        let (_, rem) = line_2.split_at(23);
         let (a0, rem) = rem.split_at(19);
         let (a1, rem) = rem.split_at(19);
         let (a2, _) = rem.split_at(19);

src/reader.rs

@@ -68,6 +68,7 @@ impl<R: Read> BufRead for Reader<R> {
         }
         Ok(&self.buf[self.rd_ptr..])
     }
+
     fn consume(&mut self, s: usize) {
         let avail = 8192 - self.rd_ptr;
         if avail >= s {

src/record/parsing.rs

@@ -332,8 +332,9 @@ impl Record {
                         },
 
                         Type::AntennaData => {
-                            let (antenna, content) = parse_antex_antenna(&epoch_buf).unwrap();
-                            atx_rec.push((antenna, content));
+                            if let Ok((antenna, content)) = parse_antex_antenna(&epoch_buf) {
+                                atx_rec.push((antenna, content));
+                            }
                         },
 
                         Type::IonosphereMaps => {

src/tests/crinex/decompression/mod.rs

@@ -19,7 +19,7 @@ use std::{
 use crate::{
     hatanaka::Decompressor,
     prelude::{Constellation, Observable},
-    tests::toolkit::{generic_observation_comparison, random_name},
+    tests::toolkit::generic_observation_comparison,
 };
 
 /// This method is used by all "raw" decompression tests