Compare commits

..
Author SHA1 Message Date
Dylan M. Taylor 117f852bc8 refactor(pptx): reuse shared table style identifiers (#792) 2026-11-16 14:12:04 -05:00
20 changed files with 104 additions and 468 deletions
-31
View File
@@ -1,31 +0,0 @@
# This file is machine-generated by `gh actions-lock`.
# Do not edit by hand; run `gh actions-lock` to update.
# Docs: https://gh.io/actions-lockfile
version: 'v0.0.3'
workflows:
'.github/workflows/ci.yml':
- 'actions/checkout@v7.0.1'
- 'step-security/harden-runner@v2.22.4'
'.github/workflows/freebsd.yml': []
'.github/workflows/house-rules.yml': []
'.github/workflows/lockfile.yml':
- 'actions/checkout@v7.0.1'
- 'step-security/harden-runner@v2.22.4'
'.github/workflows/nix.yml': []
'.github/workflows/packaging-lint.yml':
- 'actions/checkout@v7.0.1'
- 'step-security/harden-runner@v2.22.4'
'.github/workflows/release.yml': []
'.github/workflows/sonarcloud.yml': []
'.github/workflows/windows-arm64.yml': []
dependencies:
'actions/checkout@v7.0.1':
ref: 'v7.0.1'
commit: 'sha1-3d3c42e5aac5ba805825da76410c181273ba90b1'
owner_id: 44036562
repo_id: 197814629
'step-security/harden-runner@v2.22.4':
ref: 'v2.22.4'
commit: 'sha1-1d88384fd173af6ecb012dfd0264a306b711241a'
owner_id: 88700172
repo_id: 422287306
+2 -2
View File
@@ -27,11 +27,11 @@ jobs:
CRAFT_FONTS_REF: 37827adc41fd165f9a9234ac40f94dbad353aa69 CRAFT_FONTS_REF: 37827adc41fd165f9a9234ac40f94dbad353aa69
steps: steps:
- name: Harden runner - name: Harden runner
uses: step-security/harden-runner@v2.22.4 uses: step-security/harden-runner@1d88384fd173af6ecb012dfd0264a306b711241a # v2.22.4
with: with:
egress-policy: audit egress-policy: audit
- name: Check out craft-fonts - name: Check out craft-fonts
uses: actions/checkout@v7.0.1 uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with: with:
repository: storytold/craft-fonts repository: storytold/craft-fonts
ref: ${{ env.CRAFT_FONTS_REF }} ref: ${{ env.CRAFT_FONTS_REF }}
-34
View File
@@ -1,34 +0,0 @@
name: Lockfile
# Fails when .github/workflows/actions.lock is out of sync with the workflows, or when a locked pin
# no longer verifies upstream, so a moved tag cannot slip a different commit into a run.
# Docs: https://gh.io/actions-lockfile
on:
pull_request:
push:
branches: [main]
workflow_dispatch:
permissions:
contents: read
env:
GH_TOKEN: ${{ github.token }}
jobs:
lockfile:
name: Lockfile is in sync
runs-on: ubuntu-24.04
timeout-minutes: 10
steps:
- name: Harden runner
uses: step-security/harden-runner@v2.22.4
with:
egress-policy: audit
- uses: actions/checkout@v7.0.1
with:
persist-credentials: false
- name: Install gh-actions-lock
run: gh extension install github/gh-actions-lock --pin v0.4.1
- name: Verify the lockfile
run: gh actions-lock --verify
+2 -2
View File
@@ -28,10 +28,10 @@ jobs:
runs-on: windows-latest runs-on: windows-latest
steps: steps:
- name: Harden runner - name: Harden runner
uses: step-security/harden-runner@v2.22.4 uses: step-security/harden-runner@1d88384fd173af6ecb012dfd0264a306b711241a # v2.22.4
with: with:
egress-policy: audit egress-policy: audit
- uses: actions/checkout@v7.0.1 - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with: with:
persist-credentials: false persist-credentials: false
- name: Install the pinned packaging toolchain - name: Install the pinned packaging toolchain
-4
View File
@@ -239,7 +239,3 @@ the `ROADMAP.md` progress log, and update each touched doc's status line and rev
- Workflows in `.github/workflows/` call the shared workflows in [`storytold/craft-common-actions`](https://github.com/storytold/craft-common-actions) at `@main`, with their inputs and secrets. No other jobs: if no shared workflow does what's needed, it doesn't go here. - Workflows in `.github/workflows/` call the shared workflows in [`storytold/craft-common-actions`](https://github.com/storytold/craft-common-actions) at `@main`, with their inputs and secrets. No other jobs: if no shared workflow does what's needed, it doesn't go here.
- Don't add or change CI in a feature or fix PR. If the existing workflows can't build or test a change, link an existing craft-common-actions issue or PR, or open a new issue, or a PR only for a small fix that is safe for every app and does not increase CI time. - Don't add or change CI in a feature or fix PR. If the existing workflows can't build or test a change, link an existing craft-common-actions issue or PR, or open a new issue, or a PR only for a small fix that is safe for every app and does not increase CI time.
- Some workflow files here still run their own jobs. Don't add to them. Moving a job into craft-common-actions is its own task, never part of another PR, and the job stays here until a shared workflow runs it. - Some workflow files here still run their own jobs. Don't add to them. Moving a job into craft-common-actions is its own task, never part of another PR, and the job stays here until a shared workflow runs it.
## Shared libraries
Before adding or changing file-format, codec, protocol, or reusable UI code, check `storytold/craft-libs` and its open PRs first; reuse or extend the shared library rather than duplicating it locally, keep app-specific policy and model mapping in the app, and preserve behavior, security/resource limits, attribution, and regression coverage during cutovers.
-3
View File
@@ -148,9 +148,6 @@ fn warn_if_damaged(path: &str, opened: &serde_json::Value) {
if slides > 0 { if slides > 0 {
eprintln!("deckcraft-cli: warning: {path}: {slides} slide{} couldn't be read and left out", if slides == 1 { "" } else { "s" }); eprintln!("deckcraft-cli: warning: {path}: {slides} slide{} couldn't be read and left out", if slides == 1 { "" } else { "s" });
} }
for w in opened.get("importWarnings").and_then(|v| v.as_array()).into_iter().flatten().filter_map(|w| w.as_str()) {
eprintln!("deckcraft-cli: warning: {path}: {w}");
}
if media > 0 { if media > 0 {
eprintln!("deckcraft-cli: warning: {path}: {media} picture or media file{} couldn't be read", if media == 1 { "" } else { "s" }); eprintln!("deckcraft-cli: warning: {path}: {media} picture or media file{} couldn't be read", if media == 1 { "" } else { "s" });
} }
-9
View File
@@ -433,15 +433,6 @@ pub(crate) fn shape_of(s: &Session, id: ShapeId) -> Result<deckcraft_model::Shap
pub fn xfrm_of(doc: &deckcraft_model::Presentation, sel: &crate::Selection, shape: &deckcraft_model::Shape) -> Xfrm { pub fn xfrm_of(doc: &deckcraft_model::Presentation, sel: &crate::Selection, shape: &deckcraft_model::Shape) -> Xfrm {
let mut x = shape.xfrm.unwrap_or_else(|| ctx_xfrm(doc, sel, shape)); let mut x = shape.xfrm.unwrap_or_else(|| ctx_xfrm(doc, sel, shape));
if let deckcraft_model::ShapeKind::Table(t) = &shape.kind { if let deckcraft_model::ShapeKind::Table(t) = &shape.kind {
// A loaded table may not be normalized yet: measure the bounded grid an edit will
// leave, not every cell the file stored.
let normalized;
let t = if t.is_normalized() {
t
} else {
normalized = t.normalized();
&normalized
};
let drawn: f64 = table_drawn_heights(doc, sel, t).iter().sum(); let drawn: f64 = table_drawn_heights(doc, sel, t).iter().sum();
if drawn.is_finite() && drawn > x.h { if drawn.is_finite() && drawn > x.h {
x.h = drawn; x.h = drawn;
+9 -17
View File
@@ -139,13 +139,11 @@ pub struct Damage {
pub media: Vec<String>, pub media: Vec<String>,
/// Slides a `.pptx` lists but that couldn't be read, so they are not in the presentation. /// Slides a `.pptx` lists but that couldn't be read, so they are not in the presentation.
pub slides: Vec<String>, pub slides: Vec<String>,
/// Content a `.pptx` had that was cut to fit a limit; the file still opened.
pub warnings: Vec<String>,
} }
impl Damage { impl Damage {
pub fn is_empty(&self) -> bool { pub fn is_empty(&self) -> bool {
self.media.is_empty() && self.slides.is_empty() && self.warnings.is_empty() self.media.is_empty() && self.slides.is_empty()
} }
} }
@@ -153,17 +151,17 @@ impl Damage {
pub fn open_checked(name: &str, bytes: &[u8]) -> Result<(Presentation, Damage)> { pub fn open_checked(name: &str, bytes: &[u8]) -> Result<(Presentation, Damage)> {
if deckcraft_format::sniff(bytes) { if deckcraft_format::sniff(bytes) {
let (p, media) = deckcraft_format::load_checked(bytes).map_err(|e| EngineError::Other(e.to_string()))?; let (p, media) = deckcraft_format::load_checked(bytes).map_err(|e| EngineError::Other(e.to_string()))?;
return Ok((p, Damage { media, ..Default::default() })); return Ok((p, Damage { media, slides: vec![] }));
} }
open_other(name, bytes).map(|(p, slides, warnings)| (p, Damage { slides, warnings, ..Default::default() })) open_other(name, bytes).map(|(p, slides)| (p, Damage { media: vec![], slides }))
} }
fn open_other(name: &str, bytes: &[u8]) -> Result<(Presentation, Vec<String>, Vec<String>)> { fn open_other(name: &str, bytes: &[u8]) -> Result<(Presentation, Vec<String>)> {
if deckcraft_pptx::sniff(bytes) { if deckcraft_pptx::sniff(bytes) {
let (mut p, lost_slides, warnings) = deckcraft_pptx::import_report(bytes).map_err(|e| EngineError::Other(e.to_string()))?; let (mut p, lost_slides) = deckcraft_pptx::import_checked(bytes).map_err(|e| EngineError::Other(e.to_string()))?;
deckcraft_format::repair(&mut p); deckcraft_format::repair(&mut p);
probe_clips(&mut p); probe_clips(&mut p);
return Ok((p, lost_slides, warnings)); return Ok((p, lost_slides));
} }
if deckcraft_pptx::is_encrypted(bytes) { if deckcraft_pptx::is_encrypted(bytes) {
return Err(EngineError::Other(format!("{name} is password-protected. DeckCraft can't open password-protected presentations yet."))); return Err(EngineError::Other(format!("{name} is password-protected. DeckCraft can't open password-protected presentations yet.")));
@@ -182,7 +180,7 @@ fn open_other(name: &str, bytes: &[u8]) -> Result<(Presentation, Vec<String>, Ve
if p.slides.is_empty() { if p.slides.is_empty() {
p = defaults::new_presentation(None); p = defaults::new_presentation(None);
} }
return Ok((p, vec![], vec![])); return Ok((p, vec![]));
} }
Err(EngineError::Other(format!("{name}: not a presentation DeckCraft can read"))) Err(EngineError::Other(format!("{name}: not a presentation DeckCraft can read")))
} }
@@ -278,7 +276,7 @@ fn adopt_loaded(s: &mut Session, f: LoadedFile) -> Result<Value> {
let st = s.doc()?; let st = s.doc()?;
Ok(json!({ Ok(json!({
"document": i, "slides": st.doc.slides.len(), "missingFonts": st.missing_fonts, "document": i, "slides": st.doc.slides.len(), "missingFonts": st.missing_fonts,
"damagedMedia": damaged.media, "lostSlides": damaged.slides, "importWarnings": damaged.warnings, "damagedMedia": damaged.media, "lostSlides": damaged.slides,
})) }))
} }
@@ -313,9 +311,7 @@ fn open_bytes(s: &mut Session, p: &Value) -> Result<Value> {
let (doc, damaged) = open_checked(name, &data)?; let (doc, damaged) = open_checked(name, &data)?;
let i = add_opened(s, name, None, doc); let i = add_opened(s, name, None, doc);
report_damage(s, &damaged)?; report_damage(s, &damaged)?;
Ok( Ok(json!({"document": i, "missingFonts": s.doc()?.missing_fonts, "damagedMedia": damaged.media, "lostSlides": damaged.slides}))
json!({"document": i, "missingFonts": s.doc()?.missing_fonts, "damagedMedia": damaged.media, "lostSlides": damaged.slides, "importWarnings": damaged.warnings}),
)
} }
/// Tell the user which pictures, media and slides a damaged file lost, and mark the copy repaired. /// Tell the user which pictures, media and slides a damaged file lost, and mark the copy repaired.
@@ -343,10 +339,6 @@ fn report_damage(s: &mut Session, damaged: &Damage) -> Result<()> {
if n == 1 { "was" } else { "were" }, if n == 1 { "was" } else { "were" },
)); ));
} }
for w in &damaged.warnings {
text.push_str(w);
text.push_str(". ");
}
text.push_str("It was opened as a repaired copy; save it under a new name to keep the original file."); text.push_str("It was opened as a repaired copy; save it under a new name to keep the original file.");
s.ui_requests.push(crate::UiRequest::Message { text }); s.ui_requests.push(crate::UiRequest::Message { text });
Ok(()) Ok(())
+4 -17
View File
@@ -286,12 +286,6 @@ fn with_table(s: &mut Session, p: &Value, cmd: &str, f: impl Fn(&mut Table) -> R
}; };
let r = edit_shapes(s, &json!({"id": id}), cmd, |sh| match &mut sh.kind { let r = edit_shapes(s, &json!({"id": id}), cmd, |sh| match &mut sh.kind {
ShapeKind::Table(t) => { ShapeKind::Table(t) => {
// Edits walk the grid: bound it first (a loaded table need not be normalized yet).
// An over-cap table is refused, not trimmed: a trim would delete rows while reporting success.
if t.over_cap() {
return Err(bad(cmd, format!("the table is larger than {} cells; edit refused", deckcraft_model::table::MAX_CELLS)));
}
t.normalize();
f(t)?; f(t)?;
t.normalize(); t.normalize();
let (w, h) = (t.width(), t.height()); let (w, h) = (t.width(), t.height());
@@ -325,17 +319,10 @@ fn rows_cols(s: &mut Session, p: &Value, op: &str, name: &'static str) -> Result
let op = op.to_string(); let op = op.to_string();
with_table(s, p, name, move |t| { with_table(s, p, name, move |t| {
match op.as_str() { match op.as_str() {
"rowAbove" | "rowBelow" | "colLeft" | "colRight" => { "rowAbove" => t.insert_row(r),
let ok = match op.as_str() { "rowBelow" => t.insert_row(r.saturating_add(1)),
"rowAbove" => t.insert_row(r), "colLeft" => t.insert_col(c),
"rowBelow" => t.insert_row(r.saturating_add(1)), "colRight" => t.insert_col(c.saturating_add(1)),
"colLeft" => t.insert_col(c),
_ => t.insert_col(c.saturating_add(1)),
};
if !ok {
return Err(bad(name, format!("the table is at its {}-cell limit", deckcraft_model::table::MAX_CELLS)));
}
}
"delRow" => { "delRow" => {
if !t.delete_row(r) { if !t.delete_row(r) {
return Err(bad(name, "can't delete the last row")); return Err(bad(name, "can't delete the last row"));
+1 -14
View File
@@ -115,7 +115,7 @@ fn split_rows(t: &mut Table, y: f64, x0: f64, x1: f64) -> bool {
let b = match ys.iter().position(|e| (e - y).abs() <= SNAP) { let b = match ys.iter().position(|e| (e - y).abs() <= SNAP) {
Some(b) => b, Some(b) => b,
None => { None => {
if t.rows.len() >= MAX_GRID || t.cols.len().saturating_mul(t.rows.len().saturating_add(1)) > deckcraft_model::table::MAX_CELLS { if t.rows.len() >= MAX_GRID {
return false; return false;
} }
let Some(k) = ys.windows(2).position(|w| w[0] < y && y < w[1]) else { return false }; let Some(k) = ys.windows(2).position(|w| w[0] < y && y < w[1]) else { return false };
@@ -273,17 +273,4 @@ mod tests {
} }
assert!(t.rows.len() <= MAX_GRID && n > 100, "{} rows", t.rows.len()); assert!(t.rows.len() <= MAX_GRID && n > 100, "{} rows", t.rows.len());
} }
#[test]
fn pencil_refuses_a_row_past_the_cell_cap() {
let cols = 1000;
let rows = deckcraft_model::table::MAX_CELLS / cols;
let mut t = Table {
cols: vec![10.0; cols],
rows: vec![deckcraft_model::table::Row { height: 50.0, cells: vec![Cell::new(""); cols] }; rows],
..Default::default()
};
assert!(!draw_line(&mut t, (0.0, 25.0), (10_000.0, 25.0)));
assert_eq!((t.n_rows(), t.n_cols()), (rows, cols));
}
} }
-39
View File
@@ -7297,45 +7297,6 @@ fn master_body_placeholder_format_keeps_per_level_formatting() {
assert_eq!(shown(&s), vec![Some(28.0), Some(24.0)]); assert_eq!(shown(&s), vec![Some(28.0), Some(24.0)]);
} }
#[test]
fn table_edits_past_the_cell_cap_are_refused_not_trimmed() {
use deckcraft_model::table::{MAX_CELLS, Row};
let mut s = session();
let id = table_at(&mut s, &[100.0, 100.0], json!([["a", "b"], ["c", "d"]]));
let cols = 200;
let rows = MAX_CELLS / cols;
let big = deckcraft_model::Table {
cols: vec![1.0; cols],
rows: vec![Row { height: 1.0, cells: vec![Default::default(); cols] }; rows],
..Default::default()
};
for sl in std::sync::Arc::make_mut(&mut s.doc_mut().unwrap().doc).slides.iter_mut() {
for sh in std::sync::Arc::make_mut(sl).shapes.iter_mut() {
if sh.id == id {
sh.kind = deckcraft_model::ShapeKind::Table(big.clone());
}
}
}
for cmd in ["table.insertRowAbove", "table.insertRowBelow"] {
let e = s.execute(cmd, &json!({"id": id.0, "row": 0})).unwrap_err().to_string();
assert!(e.contains("cell limit"), "{cmd}: {e}");
}
let e = s.execute("table.insertColumnLeft", &json!({"id": id.0, "col": 0})).unwrap_err().to_string();
assert!(e.contains("cell limit"), "{e}");
assert_eq!(table_of(&s, id), big, "a refused insert leaves every row in place");
// A table already over the cap is refused too, not trimmed behind a success.
let huge = deckcraft_model::Table { rows: vec![Row { height: 1.0, cells: vec![Default::default(); cols] }; rows + 1], ..big.clone() };
for sl in std::sync::Arc::make_mut(&mut s.doc_mut().unwrap().doc).slides.iter_mut() {
for sh in std::sync::Arc::make_mut(sl).shapes.iter_mut() {
if sh.id == id {
sh.kind = deckcraft_model::ShapeKind::Table(huge.clone());
}
}
}
assert!(s.execute("table.deleteRow", &json!({"id": id.0, "row": 0})).is_err());
assert_eq!(table_of(&s, id).n_rows(), rows + 1);
}
/// #2059: Decrease Font Size (Ctrl+[, Cmd+Shift+,) steps down one size at a time from any size: /// #2059: Decrease Font Size (Ctrl+[, Cmd+Shift+,) steps down one size at a time from any size:
/// PowerPoint's list up to 96, then 8 points at a time above it, as Increase Font Size steps up. /// PowerPoint's list up to 96, then 8 points at a time above it, as Increase Font Size steps up.
/// A size above 66 used to shrink straight to 66. /// A size above 66 used to shrink straight to 66.
+15 -185
View File
@@ -83,12 +83,6 @@ impl Default for Table {
} }
} }
/// Cells a table may hold after [`Table::normalize`] (PowerPoint's own limit is 75 x 75).
pub const MAX_CELLS: usize = 100_000;
/// Cell visits [`Table::merge`] may spend growing its rectangle over existing merges: a few
/// passes over the largest grid, where a real table needs one or two.
const MAX_MERGE_WORK: usize = 16 * MAX_CELLS;
impl Table { impl Table {
pub fn new(rows: usize, cols: usize, width: f64, row_height: f64) -> Self { pub fn new(rows: usize, cols: usize, width: f64, row_height: f64) -> Self {
let rows = rows.clamp(1, 1000); let rows = rows.clamp(1, 1000);
@@ -119,24 +113,15 @@ impl Table {
self.rows.iter().map(|r| r.height).sum() self.rows.iter().map(|r| r.height).sum()
} }
/// Insert an empty row before `at`. A merge the new row falls inside grows to cover it. /// Insert an empty row before `at`. A merge the new row falls inside grows to cover it.
/// Returns false, leaving the table as it was, when the row would take it past [`MAX_CELLS`]. pub fn insert_row(&mut self, at: usize) {
pub fn insert_row(&mut self, at: usize) -> bool {
if self.cols.len().saturating_mul(self.rows.len().saturating_add(1)) > MAX_CELLS {
return false;
}
let at = at.min(self.rows.len()); let at = at.min(self.rows.len());
let merges = self.merges(); let merges = self.merges();
let h = self.rows.get(at.saturating_sub(1)).map(|r| r.height).unwrap_or(30.0); let h = self.rows.get(at.saturating_sub(1)).map(|r| r.height).unwrap_or(30.0);
self.rows.insert(at, Row { height: h, cells: (0..self.cols.len()).map(|_| Cell::new("")).collect() }); self.rows.insert(at, Row { height: h, cells: (0..self.cols.len()).map(|_| Cell::new("")).collect() });
self.set_merges(merges.into_iter().map(|m| m.insert_row(at))); self.set_merges(merges.into_iter().map(|m| m.insert_row(at)));
true
} }
/// Insert an empty column before `at`. A merge the new column falls inside grows to cover it. /// Insert an empty column before `at`. A merge the new column falls inside grows to cover it.
/// Returns false, leaving the table as it was, when the column would take it past [`MAX_CELLS`]. pub fn insert_col(&mut self, at: usize) {
pub fn insert_col(&mut self, at: usize) -> bool {
if self.cols.len().saturating_add(1).saturating_mul(self.rows.len()) > MAX_CELLS {
return false;
}
let at = at.min(self.cols.len()); let at = at.min(self.cols.len());
let merges = self.merges(); let merges = self.merges();
let w = self.cols.get(at.saturating_sub(1)).copied().unwrap_or(80.0); let w = self.cols.get(at.saturating_sub(1)).copied().unwrap_or(80.0);
@@ -146,7 +131,6 @@ impl Table {
r.cells.insert(i, Cell::new("")); r.cells.insert(i, Cell::new(""));
} }
self.set_merges(merges.into_iter().map(|m| m.insert_col(at))); self.set_merges(merges.into_iter().map(|m| m.insert_col(at)));
true
} }
/// Delete row `at`. Merges through it shrink; a merge anchored on it moves its anchor (and /// Delete row `at`. Merges through it shrink; a merge anchored on it moves its anchor (and
/// text) to the next row it covers. /// text) to the next row it covers.
@@ -186,12 +170,8 @@ impl Table {
true true
} }
/// The merged areas: every uncovered cell spanning more than one cell, clipped to the grid. /// The merged areas: every uncovered cell spanning more than one cell, clipped to the grid.
/// Merges of a well-formed table do not overlap, so together they cover at most the grid; a
/// file's overlapping spans past that are dropped, so rebuilding them cannot revisit cells
/// without bound.
fn merges(&self) -> Vec<Merge> { fn merges(&self) -> Vec<Merge> {
let (nr, nc) = (self.rows.len(), self.cols.len()); let (nr, nc) = (self.rows.len(), self.cols.len());
let mut area = nr.saturating_mul(nc);
let mut out = vec![]; let mut out = vec![];
for (r, row) in self.rows.iter().enumerate() { for (r, row) in self.rows.iter().enumerate() {
for (c, cell) in row.cells.iter().enumerate().take(nc) { for (c, cell) in row.cells.iter().enumerate().take(nc) {
@@ -200,10 +180,7 @@ impl Table {
} }
let rs = (cell.row_span.max(1) as usize).min(nr - r); let rs = (cell.row_span.max(1) as usize).min(nr - r);
let gs = (cell.grid_span.max(1) as usize).min(nc - c); let gs = (cell.grid_span.max(1) as usize).min(nc - c);
if (rs > 1 || gs > 1) if rs > 1 || gs > 1 {
&& let Some(left) = area.checked_sub(rs.saturating_mul(gs))
{
area = left;
out.push(Merge { r, c, rs, gs }); out.push(Merge { r, c, rs, gs });
} }
} }
@@ -256,17 +233,9 @@ impl Table {
if r1 >= self.rows.len() || c1 >= self.cols.len() || (r0 == r1 && c0 == c1) { if r1 >= self.rows.len() || c1 >= self.cols.len() || (r0 == r1 && c0 == c1) {
return false; return false;
} }
// Grow the rectangle until no existing merge sticks out of it. Each pass reads the whole // Grow the rectangle until no existing merge sticks out of it.
// grid and may grow it by one row, so the passes are charged against
// [`MAX_MERGE_WORK`]: past it the merge is refused, before anything changed.
let (mut r0, mut c0, mut r1, mut c1) = (r0, c0, r1, c1); let (mut r0, mut c0, mut r1, mut c1) = (r0, c0, r1, c1);
let pass = self.rows.len().saturating_mul(self.cols.len()).max(1);
let mut work = 0usize;
loop { loop {
work = work.saturating_add(pass);
if work > MAX_MERGE_WORK {
return false;
}
let before = (r0, c0, r1, c1); let before = (r0, c0, r1, c1);
for (r, row) in self.rows.iter().enumerate() { for (r, row) in self.rows.iter().enumerate() {
for (c, cell) in row.cells.iter().enumerate().take(self.cols.len()) { for (c, cell) in row.cells.iter().enumerate().take(self.cols.len()) {
@@ -320,50 +289,21 @@ impl Table {
return false; return false;
} }
// Spans come from the file and may reach past the table; only walk the cells that exist. // Spans come from the file and may reach past the table; only walk the cells that exist.
let end = r.saturating_add(rs).min(self.rows.len()); for rr in r..r.saturating_add(rs).min(self.rows.len()) {
let gs = gs.min(self.cols.len().saturating_sub(c)); for cc in c..c.saturating_add(gs).min(self.cols.len()) {
for row in self.rows.get_mut(r..end).unwrap_or_default() { if let Some(x) = self.cell_mut(rr, cc) {
for x in row.cells.iter_mut().skip(c).take(gs) { x.h_merge = false;
x.h_merge = false; x.v_merge = false;
x.v_merge = false; x.grid_span = 1;
x.grid_span = 1; x.row_span = 1;
x.row_span = 1; }
} }
} }
true true
} }
/// Whether the grid is as [`Table::normalize`] leaves it: within [`MAX_CELLS`], every row /// Make every row have exactly `cols.len()` cells (repair after loading).
/// exactly `cols.len()` cells wide.
pub fn is_normalized(&self) -> bool {
let n = self.cols.len();
n <= MAX_CELLS && self.rows.len() <= (MAX_CELLS / n.max(1)).max(1) && self.rows.iter().all(|r| r.cells.len() == n)
}
/// Whether [`Table::normalize`] would drop rows or columns to fit [`MAX_CELLS`].
pub fn over_cap(&self) -> bool {
let n = self.cols.len();
n > MAX_CELLS || self.rows.len() > (MAX_CELLS / n.max(1)).max(1)
}
/// What [`Table::normalize`] would leave of this table, cloning only the rows and cells that
/// survive (an oversized table is not copied whole first).
pub fn normalized(&self) -> Table {
let n = self.cols.len().min(MAX_CELLS);
let keep = (MAX_CELLS / n.max(1)).max(1);
let rows = self.rows.iter().take(keep).map(|r| Row { height: r.height, cells: r.cells.iter().take(n).cloned().collect() }).collect();
let mut t = Table { cols: self.cols[..n].to_vec(), rows, background: self.background.clone(), style: self.style.clone(), ..*self };
t.normalize();
if self.over_cap() {
t.clip_spans();
}
t
}
/// Make every row have exactly `cols.len()` cells (repair after loading). A grid over
/// [`MAX_CELLS`] loses its last rows (and columns) first, so a file naming many rows and many
/// columns but few cells cannot make this allocate their product.
pub fn normalize(&mut self) { pub fn normalize(&mut self) {
let truncated = self.over_cap();
self.cols.truncate(MAX_CELLS);
let n = self.cols.len(); let n = self.cols.len();
self.rows.truncate((MAX_CELLS / n.max(1)).max(1));
for r in &mut self.rows { for r in &mut self.rows {
r.cells.resize_with(n, || Cell::new("")); r.cells.resize_with(n, || Cell::new(""));
for c in &mut r.cells { for c in &mut r.cells {
@@ -371,20 +311,6 @@ impl Table {
c.row_span = c.row_span.max(1); c.row_span = c.row_span.max(1);
} }
} }
if truncated {
self.clip_spans();
}
}
/// Cut every merge span to the rows and columns that remain, so no merge reaches past a
/// table that lost rows or columns to the cell cap.
fn clip_spans(&mut self) {
let (nr, nc) = (self.rows.len(), self.cols.len());
for (ri, r) in self.rows.iter_mut().enumerate() {
for (ci, c) in r.cells.iter_mut().enumerate() {
c.row_span = c.row_span.min((nr - ri) as u32).max(1);
c.grid_span = c.grid_span.min((nc - ci) as u32).max(1);
}
}
} }
} }
@@ -593,102 +519,6 @@ mod tests {
} }
} }
/// Each cell spans two rows, uncovered: merging the last two rows would grow the rectangle a
/// row per pass over the whole grid, 10,000 passes. The merge is refused at its work bound
/// instead, leaving the table as it was; a small merge still works.
#[test]
fn merge_expansion_stops_at_its_work_bound() {
let mut t = Table::new(1_000, 10, 400.0, 30.0);
for row in &mut t.rows {
for c in &mut row.cells {
c.row_span = 2;
}
}
let before = t.clone();
assert!(!t.merge(998, 0, 999, 9));
assert_eq!(t, before);
let mut small = Table::new(4, 4, 400.0, 30.0);
assert!(small.merge(0, 0, 1, 1));
assert!(small.is_normalized() && !Table { cols: vec![1.0; 3], rows: vec![Row::default(); 2], ..Default::default() }.is_normalized());
}
#[test]
fn normalize_caps_a_sparse_grid_at_max_cells() {
// 1,000 columns and 1,000 empty rows would be a million cells.
let mut t = Table { cols: vec![10.0; 1000], rows: vec![Row::default(); 1000], ..Default::default() };
t.normalize();
assert_eq!(t.cols.len(), 1000);
assert_eq!(t.rows.len(), MAX_CELLS / 1000);
assert!(t.rows.iter().all(|r| r.cells.len() == 1000));
// Columns alone past the cap keep one row of MAX_CELLS cells.
let mut t = Table { cols: vec![1.0; MAX_CELLS + 5], rows: vec![Row::default(); 3], ..Default::default() };
t.normalize();
assert_eq!((t.cols.len(), t.rows.len()), (MAX_CELLS, 1));
// `normalized` leaves what `normalize` does.
let wide = Table { cols: vec![10.0; 1000], rows: vec![Row { height: 1.0, cells: vec![Cell::new("x"); 1500] }; 150], ..Default::default() };
let mut n = wide.clone();
n.normalize();
assert_eq!(wide.normalized(), n);
// A normal table is untouched.
let mut t = Table::new(4, 4, 400.0, 30.0);
t.normalize();
assert_eq!((t.n_rows(), t.n_cols()), (4, 4));
}
#[test]
fn overlapping_file_spans_rebuild_in_bounded_work() {
// Every cell an uncovered anchor spanning to the far corner: their areas add up to about
// n^4 / 4, but only what fits the grid is kept, so an edit's rebuild stays near n^2.
let n = 200;
let mut t = Table::new(n, n, 400.0, 30.0);
for row in &mut t.rows {
for c in &mut row.cells {
c.grid_span = u32::MAX;
c.row_span = u32::MAX;
}
}
assert_eq!(t.merges().len(), 1, "the first anchor already covers the whole grid");
assert!(t.insert_row(n));
assert_eq!(t.n_rows(), n + 1);
assert!(t.split(0, 0));
}
/// A table at the cell cap refuses another row or column instead of losing rows to
/// normalization, and the cap sits above PowerPoint's own 75 x 75.
#[test]
fn insert_past_the_cap_is_refused() {
const { assert!(MAX_CELLS >= 75 * 75) };
let mut t =
Table { cols: vec![1.0; 200], rows: vec![Row { height: 1.0, cells: vec![Cell::new(""); 200] }; MAX_CELLS / 200], ..Default::default() };
assert!(!t.over_cap());
let before = t.clone();
assert!(!t.insert_row(0));
assert!(!t.insert_col(0));
assert_eq!(t, before);
assert!(Table::new(75, 75, 100.0, 10.0).insert_row(0));
}
/// A merge that crosses the truncation boundary is clipped to the rows and columns that remain.
#[test]
fn merges_are_clipped_when_the_cap_drops_rows() {
let cols = 1000;
let rows = MAX_CELLS / cols + 1;
let mut t = Table { cols: vec![1.0; cols], rows: vec![Row { height: 1.0, cells: vec![Cell::new(""); cols] }; rows], ..Default::default() };
t.rows[0].cells[0].row_span = rows as u32;
t.rows[0].cells[cols - 1].grid_span = 5;
let n = t.normalized();
assert_eq!(n.rows.len(), rows - 1);
assert_eq!(n.rows[0].cells[0].row_span as usize, rows - 1);
assert_eq!(n.rows[0].cells[cols - 1].grid_span, 1);
t.normalize();
assert_eq!(t.rows[0].cells[0].row_span as usize, rows - 1);
// Within the cap, spans are left as the file wrote them.
let mut small = Table::new(3, 3, 30.0, 10.0);
small.rows[2].cells[2].grid_span = 4;
small.normalize();
assert_eq!(small.rows[2].cells[2].grid_span, 4);
}
fn merged() -> Table { fn merged() -> Table {
// 4x4 with a 2x2 merge at (1,1) holding "M". // 4x4 with a 2x2 merge at (1,1) holding "M".
let mut t = Table::new(4, 4, 400.0, 30.0); let mut t = Table::new(4, 4, 400.0, 30.0);
@@ -722,10 +552,10 @@ mod tests {
fn row_and_column_edits_keep_merges_consistent() { fn row_and_column_edits_keep_merges_consistent() {
for at in 0..=4 { for at in 0..=4 {
let mut t = merged(); let mut t = merged();
assert!(t.insert_row(at)); t.insert_row(at);
assert_topology(&t); assert_topology(&t);
let mut t = merged(); let mut t = merged();
assert!(t.insert_col(at)); t.insert_col(at);
assert_topology(&t); assert_topology(&t);
} }
for at in 0..4 { for at in 0..4 {
+67 -16
View File
@@ -348,7 +348,73 @@ fn arc_to(d: &mut String, cur: (f64, f64), wr: f64, hr: f64, st: f64, sw: f64) -
} }
/// Parse our path syntax into commands. /// Parse our path syntax into commands.
pub use craft_drawingml::custgeom::parse_path; pub fn parse_path(d: &str) -> Vec<(char, Vec<f64>)> {
let mut out = vec![];
let mut cmd: Option<char> = None;
let mut nums: Vec<f64> = vec![];
let flush = |cmd: Option<char>, nums: &mut Vec<f64>, out: &mut Vec<(char, Vec<f64>)>| {
if let Some(c) = cmd {
let n = match c {
'M' | 'L' => 2,
'C' => 6,
'Q' => 4,
_ => 0,
};
if n == 0 {
out.push((c, vec![]));
} else {
for (i, chunk) in nums.chunks(n).enumerate() {
if chunk.len() == n && out.len() < 1_000_000 {
// Repeated coordinates after M continue as L.
let c2 = if c == 'M' && i > 0 { 'L' } else { c };
out.push((c2, chunk.to_vec()));
}
}
}
}
nums.clear();
};
let mut token = String::new();
let push_tok = |token: &mut String, nums: &mut Vec<f64>| {
if !token.is_empty() {
if let Ok(v) = token.parse::<f64>()
&& v.is_finite()
{
nums.push(v);
}
token.clear();
}
};
let cs: Vec<char> = d.chars().collect();
for (i, &ch) in cs.iter().enumerate() {
match ch {
// An 'E' inside a number followed by a digit (or a sign and a digit) is an exponent,
// not the end command.
'E' if !token.is_empty() && {
let n1 = cs.get(i + 1).copied().unwrap_or(' ');
let n2 = cs.get(i + 2).copied().unwrap_or(' ');
n1.is_ascii_digit() || ((n1 == '-' || n1 == '+') && n2.is_ascii_digit())
} =>
{
token.push(ch)
}
'M' | 'L' | 'C' | 'Q' | 'Z' | 'm' | 'l' | 'c' | 'q' | 'z' | 'E' => {
push_tok(&mut token, &mut nums);
flush(cmd, &mut nums, &mut out);
cmd = Some(ch.to_ascii_uppercase());
}
' ' | ',' | '\t' | '\n' => push_tok(&mut token, &mut nums),
'-' if !token.is_empty() && !token.ends_with(['e', 'E']) => {
push_tok(&mut token, &mut nums);
token.push(ch);
}
c => token.push(c),
}
}
push_tok(&mut token, &mut nums);
flush(cmd, &mut nums, &mut out);
out
}
/// Write custom paths as `a:custGeom`. Coordinates are integers in the file, so small path spaces /// Write custom paths as `a:custGeom`. Coordinates are integers in the file, so small path spaces
/// are scaled up. /// are scaled up.
@@ -530,18 +596,3 @@ mod tests {
assert!(parse_path("garbage ### C 1").is_empty() || parse_path("garbage").is_empty()); assert!(parse_path("garbage ### C 1").is_empty() || parse_path("garbage").is_empty());
} }
} }
#[cfg(test)]
mod shared_path_tests {
use super::parse_path;
#[test]
fn shared_path_tokens_preserve_exponents_repeats_and_dropped_tails() {
assert_eq!(
parse_path("M1E2 -3E-1 4 5 L6-7 Q8 9 10 11 Z"),
vec![('M', vec![100.0, -0.3]), ('L', vec![4.0, 5.0]), ('L', vec![6.0, -7.0]), ('Q', vec![8.0, 9.0, 10.0, 11.0]), ('Z', vec![]),]
);
assert_eq!(parse_path("M0 0 L1"), vec![('M', vec![0.0, 0.0])]);
assert_eq!(parse_path("MNaN 0 1 2"), vec![('M', vec![0.0, 1.0])]);
}
}
-6
View File
@@ -71,12 +71,6 @@ pub fn import_checked(bytes: &[u8]) -> Result<(Presentation, Vec<String>), PptxE
read::import_checked(bytes) read::import_checked(bytes)
} }
/// [`import_checked`], plus warnings for content cut to fit a limit (a table past the cell cap
/// keeps its leading rows); the file still opens.
pub fn import_report(bytes: &[u8]) -> Result<(Presentation, Vec<String>, Vec<String>), PptxError> {
read::import_report(bytes)
}
/// [`import`] with a lower presentation-wide chart point budget, so tests reach the over-budget /// [`import`] with a lower presentation-wide chart point budget, so tests reach the over-budget
/// path without a multi-million-point chart. /// path without a multi-million-point chart.
#[doc(hidden)] #[doc(hidden)]
+2 -28
View File
@@ -71,8 +71,6 @@ pub struct Imp<'a> {
pub tag_bytes: usize, pub tag_bytes: usize,
/// The tag budget ran out and the warning was given. /// The tag budget ran out and the warning was given.
pub tags_capped: bool, pub tags_capped: bool,
/// What the file lost that the reader kept going past (see [`MAX_IMPORT_WARNINGS`]).
pub warnings: Vec<String>,
/// Bytes of preserved theme XML kept by the masters read so far. /// Bytes of preserved theme XML kept by the masters read so far.
pub theme_extra_bytes: usize, pub theme_extra_bytes: usize,
/// Shapes read from SmartArt drawings so far (see `shapes::MAX_SMARTART_SHAPES`). /// Shapes read from SmartArt drawings so far (see `shapes::MAX_SMARTART_SHAPES`).
@@ -84,17 +82,7 @@ pub struct Imp<'a> {
pub has_rels: HashMap<String, bool>, pub has_rels: HashMap<String, bool>,
} }
/// Import warnings kept; a hostile file with many oversized tables adds no more than this.
const MAX_IMPORT_WARNINGS: usize = 32;
impl Imp<'_> { impl Imp<'_> {
/// Record something the file lost, and log it.
pub fn warn(&mut self, msg: String) {
log::warn!("pptx: {msg}");
if self.warnings.len() < MAX_IMPORT_WARNINGS {
self.warnings.push(msg);
}
}
pub fn alloc(&mut self) -> u32 { pub fn alloc(&mut self) -> u32 {
self.next = self.next.saturating_add(1); self.next = self.next.saturating_add(1);
self.next self.next
@@ -610,7 +598,6 @@ pub fn import_theme(bytes: &[u8]) -> Result<(deckcraft_model::theme::Theme, Vec<
tags_by_part: HashMap::new(), tags_by_part: HashMap::new(),
tag_bytes: 0, tag_bytes: 0,
tags_capped: false, tags_capped: false,
warnings: vec![],
theme_extra_bytes: 0, theme_extra_bytes: 0,
smartart_shapes: 0, smartart_shapes: 0,
diagram_xml_bytes: 0, diagram_xml_bytes: 0,
@@ -629,24 +616,13 @@ pub fn import(bytes: &[u8]) -> Result<Presentation, PptxError> {
/// or truncated slide part, or an entry whose relationship is missing): those slides are left /// or truncated slide part, or an entry whose relationship is missing): those slides are left
/// out, so a caller can say so (#203). /// out, so a caller can say so (#203).
pub fn import_checked(bytes: &[u8]) -> Result<(Presentation, Vec<String>), PptxError> { pub fn import_checked(bytes: &[u8]) -> Result<(Presentation, Vec<String>), PptxError> {
import_report(bytes).map(|(p, lost, _)| (p, lost)) import_with_chart_points(bytes, chart::MAX_PRESENTATION_CHART_POINTS)
}
/// [`import_checked`], plus warnings for content the file had that was cut to fit a limit (a
/// table past the cell cap keeps its leading rows).
pub fn import_report(bytes: &[u8]) -> Result<(Presentation, Vec<String>, Vec<String>), PptxError> {
import_report_with_chart_points(bytes, chart::MAX_PRESENTATION_CHART_POINTS)
} }
const MAX_SLIDE_ENTRIES: usize = 10_000; const MAX_SLIDE_ENTRIES: usize = 10_000;
/// [`import_checked`] with the presentation's chart point budget set (tests lower it). /// [`import_checked`] with the presentation's chart point budget set (tests lower it).
pub(crate) fn import_with_chart_points(bytes: &[u8], chart_points_cap: usize) -> Result<(Presentation, Vec<String>), PptxError> { pub(crate) fn import_with_chart_points(bytes: &[u8], chart_points_cap: usize) -> Result<(Presentation, Vec<String>), PptxError> {
import_report_with_chart_points(bytes, chart_points_cap).map(|(p, lost, _)| (p, lost))
}
/// [`import_report`] with the presentation's chart point budget set.
fn import_report_with_chart_points(bytes: &[u8], chart_points_cap: usize) -> Result<(Presentation, Vec<String>, Vec<String>), PptxError> {
let mut lost_slides: Vec<String> = vec![]; let mut lost_slides: Vec<String> = vec![];
let pkg = Package::open(bytes)?; let pkg = Package::open(bytes)?;
let root_rels = pkg.rels(""); let root_rels = pkg.rels("");
@@ -687,7 +663,6 @@ fn import_report_with_chart_points(bytes: &[u8], chart_points_cap: usize) -> Res
tags_by_part: HashMap::new(), tags_by_part: HashMap::new(),
tag_bytes: 0, tag_bytes: 0,
tags_capped: false, tags_capped: false,
warnings: vec![],
theme_extra_bytes: 0, theme_extra_bytes: 0,
smartart_shapes: 0, smartart_shapes: 0,
diagram_xml_bytes: 0, diagram_xml_bytes: 0,
@@ -722,7 +697,7 @@ fn import_report_with_chart_points(bytes: &[u8], chart_points_cap: usize) -> Res
p.media = std::mem::take(&mut imp.media); p.media = std::mem::take(&mut imp.media);
p.next_id = imp.next; p.next_id = imp.next;
p.fix_next_id(); p.fix_next_id();
Ok((p, lost_slides, std::mem::take(&mut imp.warnings))) Ok((p, lost_slides))
} }
/// Masters, layouts and slides to read, in file order and without duplicates: (master paths, /// Masters, layouts and slides to read, in file order and without duplicates: (master paths,
@@ -1662,7 +1637,6 @@ mod rollback_tests {
tags_by_part: HashMap::new(), tags_by_part: HashMap::new(),
tag_bytes: 0, tag_bytes: 0,
tags_capped: false, tags_capped: false,
warnings: vec![],
theme_extra_bytes: 0, theme_extra_bytes: 0,
smartart_shapes: 0, smartart_shapes: 0,
diagram_xml_bytes: 0, diagram_xml_bytes: 0,
-3
View File
@@ -856,9 +856,6 @@ fn table(imp: &mut Imp, part: &Part, tbl: &El) -> Table {
let n = t.rows.iter().map(|r| r.cells.len()).max().unwrap_or(0); let n = t.rows.iter().map(|r| r.cells.len()).max().unwrap_or(0);
t.cols = vec![72.0; n]; t.cols = vec![72.0; n];
} }
if t.over_cap() {
imp.warn(format!("a table in {} is over {} cells; its last rows were left out", part.name, deckcraft_model::table::MAX_CELLS));
}
t.normalize(); t.normalize();
t t
} }
-9
View File
@@ -65,8 +65,6 @@ pub struct Exp<'a> {
n_kept: u32, n_kept: u32,
pub slide_parts: HashMap<SlideId, String>, pub slide_parts: HashMap<SlideId, String>,
pub table_styles: Vec<String>, pub table_styles: Vec<String>,
/// A table past the cell cap was met; export fails rather than write a trimmed one.
pub table_over_cap: bool,
/// The ids in `table_styles`, for checking membership without a scan. /// The ids in `table_styles`, for checking membership without a scan.
pub table_style_set: std::collections::HashSet<String>, pub table_style_set: std::collections::HashSet<String>,
placeholder: Option<String>, placeholder: Option<String>,
@@ -560,7 +558,6 @@ pub fn export(p: &Presentation, main_ct: &str) -> Result<Vec<u8>, PptxError> {
n_kept: 0, n_kept: 0,
slide_parts: HashMap::new(), slide_parts: HashMap::new(),
table_styles: vec![], table_styles: vec![],
table_over_cap: false,
table_style_set: Default::default(), table_style_set: Default::default(),
placeholder: None, placeholder: None,
}; };
@@ -769,12 +766,6 @@ pub fn export(p: &Presentation, main_ct: &str) -> Result<Vec<u8>, PptxError> {
root.add_new(&k.rel_type, &k.name, false); root.add_new(&k.rel_type, &k.name, false);
} }
x.pkg.rels("", &root); x.pkg.rels("", &root);
if x.table_over_cap {
return Err(PptxError::Unsupported(format!(
"a table has more than {} cells; export refused rather than drop rows",
deckcraft_model::table::MAX_CELLS
)));
}
x.pkg.finish() x.pkg.finish()
} }
+2 -2
View File
@@ -724,8 +724,8 @@ fn frame_close(w: &mut W) {
} }
fn table(w: &mut W, x: &mut Exp, o: &mut Out, t: &Table) { fn table(w: &mut W, x: &mut Exp, o: &mut Out, t: &Table) {
x.table_over_cap |= t.over_cap(); let mut t = t.clone();
let t = t.normalized(); t.normalize();
w.open0("a:tbl"); w.open0("a:tbl");
let (guid, _) = crate::tables::guid_for_style(&t.style); let (guid, _) = crate::tables::guid_for_style(&t.style);
if x.table_style_set.insert(t.style.clone()) { if x.table_style_set.insert(t.style.clone()) {
-38
View File
@@ -288,44 +288,6 @@ fn unreadable_slide_is_reported() {
assert_eq!(deckcraft_pptx::import(&broken).expect("import").slides.len(), 1); assert_eq!(deckcraft_pptx::import(&broken).expect("import").slides.len(), 1);
} }
fn table_deck(rows: usize, cols: usize) -> deckcraft_model::Presentation {
use deckcraft_model::table::Row;
use deckcraft_model::{Shape, ShapeId, ShapeKind, Table, Xfrm};
let mut p = defaults::new_presentation(None);
let id = ShapeId(p.alloc_id().expect("ids"));
let t = Table { cols: vec![1.0; cols], rows: vec![Row { height: 1.0, cells: vec![Default::default(); cols] }; rows], ..Default::default() };
let slide = std::sync::Arc::make_mut(&mut p.slides[0]);
slide.shapes.push(Shape { id, name: "T".into(), xfrm: Some(Xfrm::new(0.0, 0.0, 10.0, 10.0)), kind: ShapeKind::Table(t), ..Default::default() });
p
}
/// A table past the cell cap opens with its leading rows and an import warning; saving one that
/// is over the cap is an error, never a silent trim.
#[test]
fn oversized_table_warns_on_import_and_refuses_export() {
let max = deckcraft_model::table::MAX_CELLS;
let cols = 1000;
let rows = max / cols;
// A table exactly at the cap round-trips with no warning.
let bytes = deckcraft_pptx::export(&table_deck(rows, cols)).expect("export at the cap");
let (_, _, warnings) = deckcraft_pptx::import_report(&bytes).expect("import");
assert!(warnings.is_empty(), "{warnings:?}");
// One more row in the file: kept truncated, and reported.
let mut es = entries(&bytes);
let slide = es.iter_mut().find(|(n, _)| n == "ppt/slides/slide1.xml").expect("slide1");
let xml = String::from_utf8(std::mem::take(&mut slide.1)).expect("utf8");
let start = xml.rfind("<a:tr ").expect("row");
let end = xml.rfind("</a:tr>").expect("row end") + "</a:tr>".len();
slide.1 = format!("{}{}{}", &xml[..end], &xml[start..end], &xml[end..]).into_bytes();
let (q, _, warnings) = deckcraft_pptx::import_report(&rezip(&es)).expect("import");
assert_eq!(warnings.len(), 1, "{warnings:?}");
let t = q.slides[0].shapes.iter().find_map(|s| if let deckcraft_model::ShapeKind::Table(t) = &s.kind { Some(t) } else { None }).expect("table");
assert_eq!((t.rows.len(), t.cols.len()), (rows, cols));
// A model table past the cap is refused on export.
let err = deckcraft_pptx::export(&table_deck(rows + 1, cols)).expect_err("over the cap");
assert!(err.to_string().contains("table"), "{err}");
}
/// Missing slide relationships must not turn a damaged deck into a clean partial load (#1910). /// Missing slide relationships must not turn a damaged deck into a clean partial load (#1910).
#[test] #[test]
fn missing_slide_relationships_are_reported() { fn missing_slide_relationships_are_reported() {
-9
View File
@@ -1,11 +1,2 @@
sonar.projectKey=storytold_deckcraft sonar.projectKey=storytold_deckcraft
sonar.organization=storytold sonar.organization=storytold
# githubactions:S7637 asks for every action to be pinned to a commit SHA. A workflow covered by
# .github/workflows/actions.lock runs the commit the lockfile records, so its tag refs are pinned
# and the lockfile covers the actions those actions use too. Sonar does not read lockfiles yet, so
# the rule flags the tag refs anyway:
# https://community.sonarsource.com/t/githubactions-s7637-false-positives-for-actions-pinned-through-native-actions-lock/190814
sonar.issue.ignore.multicriteria=gha-lockfile
sonar.issue.ignore.multicriteria.gha-lockfile.ruleKey=githubactions:S7637
sonar.issue.ignore.multicriteria.gha-lockfile.resourceKey=.github/workflows/**