fix: emit all OLE embed streams and the second weekly group code

Author: MrSrsen

crates/rpt/src/io/mod.rs

@@ -283,10 +283,14 @@ fn decode_saved_data(streams: &[RecordStream]) -> Option<crate::model::SavedData
     })
 }
 
-/// Summarise embedded OLE objects: for each top-level `Embedding N` storage, hash its `\x01Ole`
-/// stream into an [`Embed`] (Name `Ole`, byte size, Base64-MD5), in directory order. Only the
-/// `Ole` stream is listed (not `CompObj` / `CONTENTS`).
+/// Summarise embedded OLE objects: for each top-level `Embedding N` storage, hash each of its
+/// OLE data streams into an [`Embed`] (Name, byte size, Base64-MD5), in directory order. The
+/// engine emits the OLE data streams — `Ole`, `OlePres000`, `Ole10Native` — but not the
+/// `CompObj` (OLE class descriptor) or a `CONTENTS` sub-storage, so those are skipped.
 fn raise_embeds(container: &Container) -> Vec<crate::model::Embed> {
+    // Streams present under an `Embedding N` storage that the oracle does NOT list. `CompObj` is
+    // the OLE1 class-moniker blob; `CONTENTS` (when present) is a nested storage, not object data.
+    const SKIP: [&str; 2] = ["CompObj", "CONTENTS"];
     let mut out = Vec::new();
     for s in container.streams() {
         // Path components below the root, e.g. `["Embedding 2", "\x01Ole"]`. Only top-level
@@ -300,9 +304,9 @@ fn raise_embeds(container: &Container) -> Vec<crate::model::Embed> {
         let [storage, stream] = parts.as_slice() else {
             continue;
         };
-        // The stream name carries a `\x01` (OLE control) prefix; strip control chars for the Name.
+        // The stream name carries a `\x01`/`\x02` (OLE control) prefix; strip control chars for the Name.
         let name: String = stream.chars().filter(|c| !c.is_control()).collect();
-        if storage.starts_with("Embedding ") && name == "Ole" {
+        if storage.starts_with("Embedding ") && !SKIP.contains(&name.as_str()) {
             out.push(crate::model::Embed {
                 name,
                 size: s.bytes.len() as u64,

crates/rpt/src/project/raise/data_def.rs

@@ -586,20 +586,21 @@ pub(super) fn raise_group(
     use crate::model::FieldValueType::*;
     // The longer date-grouping periods are selected by the byte after the report-group order marker
     // (`@Group #N Order`), where the trailing structure is `01 00 <code> ff ff`: 0x03 = monthly,
-    // 0x06 = weekly. (Daily is instead flagged at `used + 4 == 0x02`; discrete date grouping leaves
-    // both clear.) Unmapped codes are left undecoded rather than guessed.
+    // 0x06 / 0x08 = weekly (the engine emits two week codes — e.g. week-of-year vs a week starting
+    // on a fixed weekday — that both render as "Weekly"). Daily is 0x01, or via the older
+    // `used + 4 == 0x02` flag (with the selector left 0); discrete date grouping leaves both clear.
+    // Quarterly/yearly codes are not present in the corpus, so they are left undecoded rather than
+    // guessed.
     let period_code = lp_scan(&bytes, Scan::Consume)
         .find(|(_, s, _)| s.starts_with("@Group #") && s.ends_with(" Order"))
         .and_then(|(i, _, consumed)| bytes.get(i + consumed + 2).copied());
     let date_condition = field_types
         .get(&field.to_lowercase())
         .filter(|t| matches!(t, Date | Time | DateTime | Boolean))
         .and_then(|_| match period_code {
-            // The period selector after the order marker; daily also appears via the older
-            // `used + 4 == 0x02` flag (with the selector left 0).
             Some(0x01) => Some("daily".to_string()),
             Some(0x03) => Some("monthly".to_string()),
-            Some(0x06) => Some("weekly".to_string()),
+            Some(0x06) | Some(0x08) => Some("weekly".to_string()),
             _ if bytes.get(used + 4).copied() == Some(0x02) => Some("daily".to_string()),
             _ => None,
         });