feat: use origin ctime/mtime

Author: Xiphoseer

Cargo.lock

@@ -5,12 +5,15 @@ authors = ["Xiphoseer <xiphoseer@mailbox.org>"]
 edition = "2018"
 
 [dependencies]
-signum = { path = "../signum" }
 sdo-ps = { path = "../sdo-ps" }
 pdf-create = { path = "../pdf" }
 ccitt-t4-t6 = { path = "../ccitt" }
 log = "0.4"
 
+[dependencies.signum]
+path = "../signum"
+features = ["chrono"]
+
 [dev-dependencies]
 color-eyre = { version = "0.5", default-features = false }
-structopt = "0.3"
+structopt = "0.3"

crates/sdo-pdf/Cargo.toml

@@ -1,7 +1,8 @@
-use pdf_create::chrono::Local;
+use pdf_create::chrono::{DateTime, Local, NaiveDateTime, TimeZone};
 use pdf_create::common::{OutputIntent, OutputIntentSubtype, PdfString};
 use pdf_create::encoding::{pdf_doc_encode, PDFDocEncodingError};
 use pdf_create::high::{Handle, Info};
+use signum::docs::header::Header;
 
 /// Information to add into the PDF `/Info` dictionary
 #[derive(Debug, Clone, Default)]
@@ -12,6 +13,22 @@ pub struct MetaInfo {
     pub author: Option<String>,
     /// Subject
     pub subject: Option<String>,
+
+    /// Creation date of the document
+    pub creation_date: Option<DateTime<Local>>,
+    /// Date when the document was last updated
+    pub mod_date: Option<DateTime<Local>>,
+}
+
+impl MetaInfo {
+    /// Set the dates from the SDOC header
+    pub fn with_dates(&mut self, header: &Header) {
+        let ctime = NaiveDateTime::from(header.ctime);
+        let mtime = NaiveDateTime::from(header.mtime);
+        // FIXME: timezone?
+        self.creation_date = Local.from_local_datetime(&ctime).single();
+        self.mod_date = Local.from_local_datetime(&mtime).single();
+    }
 }
 
 /// Write PDF info data
@@ -33,8 +50,8 @@ pub fn prepare_info(info: &mut Info, meta: &MetaInfo) -> Result<(), PDFDocEncodi
     let producer = pdf_doc_encode("Signum! Document Toolbox")?;
     info.producer = Some(PdfString::new(producer));
     let now = Local::now();
-    info.creation_date = Some(now);
-    info.mod_date = Some(now);
+    info.creation_date = meta.creation_date.or(Some(now));
+    info.mod_date = meta.mod_date.or(Some(now));
     Ok(())
 }
 

crates/sdo-pdf/src/info.rs

@@ -423,10 +423,11 @@ impl Handle {
             xoffset: 0,
             yoffset: 0,
         };
-        let meta = MetaInfo {
+        let mut meta = MetaInfo {
             title: Some(active_doc.name.clone()),
             ..MetaInfo::default()
         };
+        meta.with_dates(&active_doc.sdoc.header);
         let pk = match active_doc.pd {
             FontKind::Editor => Err(JsError::new("editor font not supported")),
             FontKind::Printer(printer_kind) => Ok(printer_kind),

crates/sdo-web/src/lib.rs

@@ -9,6 +9,10 @@ description = "Implementation of Signum! (1986) file formats"
 repository = "https://github.com/Xiphoseer/sdo-tool/tree/main/crates/signum"
 homepage = "https://xiphoseer.github.io/sdo-tool/implementation#signum"
 
+[features]
+chrono = ["dep:chrono"]
+default = ["chrono"]
+
 [dependencies]
 nom = "7"
 thiserror = "1.0"
@@ -24,6 +28,11 @@ default-features = false
 version = "0.24"
 features = ["png"]
 
+[dependencies.chrono]
+optional = true
+default-features = false
+version = "0.4"
+
 [dev-dependencies]
 color-eyre = { version = "0.5", default-features = false }
 structopt = "0.3"

crates/signum/Cargo.toml

@@ -21,29 +21,61 @@ use super::Chunk;
 #[serde(transparent)]
 pub struct Date(pub u16);
 
-impl fmt::Display for Date {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+impl Date {
+    /// Return the year, month and day parts
+    pub fn to_ymd(&self) -> (u16, u16, u16) {
         let year = (self.0 >> 9) + 1980;
         let month = (self.0 >> 5) & 0b1111;
         let day = self.0 & 0b11111;
+        (year, month, day)
+    }
+}
+
+impl fmt::Display for Date {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let (year, month, day) = self.to_ymd();
         write!(f, "{:02}.{:02}.{:04}", day, month, year)
     }
 }
 
+#[cfg(feature = "chrono")]
+impl From<Date> for chrono::NaiveDate {
+    fn from(value: Date) -> Self {
+        let (year, month, day) = value.to_ymd();
+        chrono::NaiveDate::from_ymd_opt(year.into(), month.into(), day.into()).unwrap()
+    }
+}
+
 #[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
 /// A GEMDOS time
 #[serde(transparent)]
 pub struct Time(pub u16);
 
-impl fmt::Display for Time {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+impl Time {
+    /// Return the hours, minutes and seconds in this (local) time
+    pub fn to_hms(&self) -> (u16, u16, u16) {
         let hours = self.0 >> 11;
         let minutes = (self.0 >> 5) & 0b111111;
         let seconds = (self.0 & 0b11111) << 1;
+        (hours, minutes, seconds)
+    }
+}
+
+impl fmt::Display for Time {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let (hours, minutes, seconds) = self.to_hms();
         write!(f, "{:02}:{:02}:{:02}", hours, minutes, seconds)
     }
 }
 
+#[cfg(feature = "chrono")]
+impl From<Time> for chrono::NaiveTime {
+    fn from(value: Time) -> Self {
+        let (hours, minutes, seconds) = value.to_hms();
+        chrono::NaiveTime::from_hms_opt(hours.into(), minutes.into(), seconds.into()).unwrap()
+    }
+}
+
 #[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
 /// A GEMDOS date and time
 pub struct DateTime {
@@ -59,6 +91,13 @@ impl fmt::Display for DateTime {
     }
 }
 
+#[cfg(feature = "chrono")]
+impl From<DateTime> for chrono::NaiveDateTime {
+    fn from(value: DateTime) -> Self {
+        chrono::NaiveDateTime::new(value.date.into(), value.time.into())
+    }
+}
+
 #[derive(Debug, Serialize)]
 /// The header of a signum file
 pub struct Header<'a> {