Move time provider to its own module

Author: paulyoung

examples/fat/src/fat/lib.rs

@@ -1,7 +1,12 @@
+mod time_provider;
+
+use crate::time_provider::InternetComputerTimeProvider;
 use ic_cdk_macros::{query, update};
-use std::convert::TryInto;
 use std::io::{Read, Write};
 
+#[cfg(target_arch = "wasm32")]
+use std::convert::TryInto;
+
 // type FileSystem = fatfs::FileSystem<
 //     fatfs::StdIoWrapper<fscommon::BufStream<icfs::StableMemory>>,
 //     InternetComputerTimeProvider,
@@ -109,64 +114,3 @@ fn _write_file(filename: String, contents: String) -> std::io::Result<()> {
         Ok(())
     })
 }
-
-// TODO: move to own module
-
-#[derive(Debug, Clone, Copy, Default)]
-pub struct InternetComputerTimeProvider {
-    _dummy: (),
-}
-
-impl InternetComputerTimeProvider {
-    #[must_use]
-    pub fn new() -> Self {
-        Self { _dummy: () }
-    }
-}
-
-impl fatfs::TimeProvider for InternetComputerTimeProvider {
-    fn get_current_date(&self) -> fatfs::Date {
-        self.get_current_date_time().date
-    }
-
-    fn get_current_date_time(&self) -> fatfs::DateTime {
-        let ns = time::Duration::nanoseconds(ic_cdk::api::time() as i64);
-
-        let epoch = time::PrimitiveDateTime::new(
-            time::Date::from_calendar_date(1970, time::Month::January, 1).unwrap(),
-            time::Time::from_hms(0, 0, 0).unwrap(),
-        );
-
-        let datetime = epoch.checked_add(ns).unwrap();
-
-        // NOTE: fatfs only supports years in the range [1980, 2107]
-        let year: u16 = datetime.year().try_into().unwrap();
-
-        let month = match datetime.month() {
-            time::Month::January => 1,
-            time::Month::February => 2,
-            time::Month::March => 3,
-            time::Month::April => 4,
-            time::Month::May => 5,
-            time::Month::June => 6,
-            time::Month::July => 7,
-            time::Month::August => 8,
-            time::Month::September => 9,
-            time::Month::October => 10,
-            time::Month::November => 11,
-            time::Month::December => 12,
-        };
-
-        let day = datetime.day() as u16;
-
-        let hour = datetime.hour() as u16;
-        let min = datetime.minute() as u16;
-        let sec = datetime.second() as u16;
-        let millis = datetime.millisecond() as u16;
-
-        fatfs::DateTime::new(
-            fatfs::Date::new(year, month, day),
-            fatfs::Time::new(hour, min, sec, millis),
-        )
-    }
-}

examples/fat/src/fat/time_provider.rs

@@ -0,0 +1,60 @@
+use std::convert::TryInto;
+
+#[derive(Debug, Clone, Copy, Default)]
+pub struct InternetComputerTimeProvider {
+    _dummy: (),
+}
+
+impl InternetComputerTimeProvider {
+    #[must_use]
+    pub fn new() -> Self {
+        Self { _dummy: () }
+    }
+}
+
+impl fatfs::TimeProvider for InternetComputerTimeProvider {
+    fn get_current_date(&self) -> fatfs::Date {
+        self.get_current_date_time().date
+    }
+
+    fn get_current_date_time(&self) -> fatfs::DateTime {
+        let ns = time::Duration::nanoseconds(ic_cdk::api::time() as i64);
+
+        let epoch = time::PrimitiveDateTime::new(
+            time::Date::from_calendar_date(1970, time::Month::January, 1).unwrap(),
+            time::Time::from_hms(0, 0, 0).unwrap(),
+        );
+
+        let datetime = epoch.checked_add(ns).unwrap();
+
+        // NOTE: fatfs only supports years in the range [1980, 2107]
+        let year: u16 = datetime.year().try_into().unwrap();
+
+        let month = match datetime.month() {
+            time::Month::January => 1,
+            time::Month::February => 2,
+            time::Month::March => 3,
+            time::Month::April => 4,
+            time::Month::May => 5,
+            time::Month::June => 6,
+            time::Month::July => 7,
+            time::Month::August => 8,
+            time::Month::September => 9,
+            time::Month::October => 10,
+            time::Month::November => 11,
+            time::Month::December => 12,
+        };
+
+        let day = datetime.day() as u16;
+
+        let hour = datetime.hour() as u16;
+        let min = datetime.minute() as u16;
+        let sec = datetime.second() as u16;
+        let millis = datetime.millisecond() as u16;
+
+        fatfs::DateTime::new(
+            fatfs::Date::new(year, month, day),
+            fatfs::Time::new(hour, min, sec, millis),
+        )
+    }
+}