mirror of
https://github.com/storytold/gridcraft.git
synced 2026-11-03 00:41:56 -06:00
Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e4db0f448c |
@@ -104,6 +104,13 @@ pub(super) fn find(s: &mut Session, p: &Json) -> Result<Json> {
|
||||
Ok(json!({"cell": c.a1(), "sheet": si, "value": t, "count": hits.len()}))
|
||||
}
|
||||
|
||||
/// Longest text one replacement may give a cell, in bytes: Excel's 32,767 characters, each up to
|
||||
/// four bytes. Every occurrence copies the replacement text, so a short cell full of matches and a
|
||||
/// long replacement would otherwise expand to gigabytes.
|
||||
const REPLACE_CELL_MAX_BYTES: usize = 32_767 * 4;
|
||||
/// Most bytes of replaced text one Replace All builds across all its cells.
|
||||
const REPLACE_TOTAL_MAX_BYTES: usize = 256 * 1024 * 1024;
|
||||
|
||||
pub(super) fn replace(s: &mut Session, p: &Json) -> Result<Json> {
|
||||
let what = str_param(p, "what").unwrap_or("").to_string();
|
||||
let with = str_param(p, "with").unwrap_or("").to_string();
|
||||
@@ -119,6 +126,7 @@ pub(super) fn replace(s: &mut Session, p: &Json) -> Result<Json> {
|
||||
let n = edit(s, |cx| {
|
||||
let sheets: Vec<usize> = if workbook { (0..cx.wb.sheets.len()).collect() } else { vec![cx.wb.active_sheet()] };
|
||||
let mut n = 0;
|
||||
let mut total = 0usize;
|
||||
for si in sheets {
|
||||
let cells: Vec<(CellRef, String)> =
|
||||
cx.wb.sheet(si).map(|sh| sh.cells.iter().map(|(c, _)| (c, sh.input_text(c))).collect()).unwrap_or_default();
|
||||
@@ -130,12 +138,19 @@ pub(super) fn replace(s: &mut Session, p: &Json) -> Result<Json> {
|
||||
continue;
|
||||
}
|
||||
let new = if whole {
|
||||
with.clone()
|
||||
Some(with.clone()).filter(|w| w.len() <= REPLACE_CELL_MAX_BYTES)
|
||||
} else if case {
|
||||
text.replace(&what, &with)
|
||||
replace_cs_within(&text, &what, &with, REPLACE_CELL_MAX_BYTES)
|
||||
} else {
|
||||
replace_ci(&text, &what, &with)
|
||||
replace_ci_within(&text, &what, &with, REPLACE_CELL_MAX_BYTES)
|
||||
};
|
||||
let Some(new) = new else {
|
||||
return Err(EngineError::Other(format!("The replacement makes the text of {} too long.", c.a1())));
|
||||
};
|
||||
total = total.saturating_add(new.len());
|
||||
if total > REPLACE_TOTAL_MAX_BYTES {
|
||||
return Err(EngineError::Other("The replacements make too much text. Replace in a smaller range.".into()));
|
||||
}
|
||||
// A Python cell's text is its code: the replacement edits the code and the cell
|
||||
// stays a Python cell. Code that would no longer fit in a PY formula is left as it was.
|
||||
let old_py = cx.wb.sheet(si).and_then(|sh| sh.cell(c)).and_then(|x| x.py.clone());
|
||||
@@ -190,7 +205,37 @@ fn folds_in_place(s: &str) -> bool {
|
||||
})
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
pub(super) fn replace_ci(text: &str, what: &str, with: &str) -> String {
|
||||
replace_ci_within(text, what, with, usize::MAX).unwrap_or_default()
|
||||
}
|
||||
|
||||
/// `text` with every `what` replaced by `with`, or `None` once the result passes `limit` bytes
|
||||
/// (checked before each copy, so nothing larger is allocated).
|
||||
pub(super) fn replace_cs_within(text: &str, what: &str, with: &str, limit: usize) -> Option<String> {
|
||||
if what.is_empty() {
|
||||
return (text.len() <= limit).then(|| text.to_string());
|
||||
}
|
||||
let mut out = String::new();
|
||||
let mut i = 0;
|
||||
for (pos, m) in text.match_indices(what) {
|
||||
if out.len() + (pos - i) + with.len() > limit {
|
||||
return None;
|
||||
}
|
||||
out.push_str(text.get(i..pos).unwrap_or(""));
|
||||
out.push_str(with);
|
||||
i = pos + m.len();
|
||||
}
|
||||
let rest = text.get(i..).unwrap_or("");
|
||||
if out.len() + rest.len() > limit {
|
||||
return None;
|
||||
}
|
||||
out.push_str(rest);
|
||||
Some(out)
|
||||
}
|
||||
|
||||
/// Case-insensitive [`replace_cs_within`].
|
||||
pub(super) fn replace_ci_within(text: &str, what: &str, with: &str, limit: usize) -> Option<String> {
|
||||
let lower = text.to_lowercase();
|
||||
let w = what.to_lowercase();
|
||||
// Slicing `text` at positions found in `lower` is only sound when folding kept every byte
|
||||
@@ -198,15 +243,22 @@ pub(super) fn replace_ci(text: &str, what: &str, with: &str) -> String {
|
||||
// boundaries (U+212A KELVIN SIGN shrinks 3→1 bytes, U+0130 grows 2→3), where the tail used
|
||||
// to be dropped. Those fall back to the case-sensitive replace, as length changes already do.
|
||||
if lower.len() != text.len() || w.is_empty() || !folds_in_place(text) || !folds_in_place(what) {
|
||||
return text.replace(what, with);
|
||||
return replace_cs_within(text, what, with, limit);
|
||||
}
|
||||
let mut out = String::new();
|
||||
let mut i = 0;
|
||||
while let Some(pos) = lower.get(i..).and_then(|s| s.find(&w)) {
|
||||
if out.len() + pos + with.len() > limit {
|
||||
return None;
|
||||
}
|
||||
out.push_str(text.get(i..i + pos).unwrap_or(""));
|
||||
out.push_str(with);
|
||||
i += pos + w.len();
|
||||
}
|
||||
out.push_str(text.get(i..).unwrap_or(""));
|
||||
out
|
||||
let rest = text.get(i..).unwrap_or("");
|
||||
if out.len() + rest.len() > limit {
|
||||
return None;
|
||||
}
|
||||
out.push_str(rest);
|
||||
Some(out)
|
||||
}
|
||||
|
||||
@@ -353,6 +353,36 @@ fn cut_paste_that_overflows_the_grid_moves_nothing() {
|
||||
assert_eq!(get(&mut s, "XFD2")["value"], json!(2.0));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn replace_refuses_text_that_would_grow_past_a_cell() {
|
||||
// 10,000 matches × a 1,000-character replacement would make a 10 MB cell (and a few such
|
||||
// cells gigabytes); the replacement is refused before that text is built.
|
||||
let mut s = Session::new();
|
||||
s.new_workbook();
|
||||
let long = "a".repeat(10_000);
|
||||
s.execute("range.setValues", json!({"range": "A1", "values": [[long.clone()], ["abc"]]})).unwrap();
|
||||
for case in [false, true] {
|
||||
let err = s.execute("edit.replace", json!({"what": "a", "with": "x".repeat(1_000), "matchCase": case})).expect_err("too long");
|
||||
assert!(err.to_string().contains("too long"), "{err}");
|
||||
assert_eq!(s.execute("cell.get", json!({"cell": "A1"})).unwrap()["value"], json!(long));
|
||||
assert_eq!(s.execute("cell.get", json!({"cell": "A2"})).unwrap()["value"], json!("abc"));
|
||||
}
|
||||
// A replacement that stays within a cell's limit still happens.
|
||||
s.execute("edit.replace", json!({"what": "b", "with": "x".repeat(100)})).unwrap();
|
||||
assert_eq!(s.execute("cell.get", json!({"cell": "A2"})).unwrap()["value"], json!(format!("a{}c", "x".repeat(100))));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn bounded_replace_stops_at_its_limit() {
|
||||
use super::find::{replace_ci_within, replace_cs_within};
|
||||
assert_eq!(replace_cs_within("abab", "a", "xy", 6).as_deref(), Some("xybxyb"));
|
||||
assert_eq!(replace_cs_within("abab", "a", "xy", 5), None);
|
||||
assert_eq!(replace_ci_within("AbAb", "a", "xy", 6).as_deref(), Some("xybxyb"));
|
||||
assert_eq!(replace_ci_within("AbAb", "a", "xy", 5), None);
|
||||
assert_eq!(replace_cs_within("abc", "z", "", 3).as_deref(), Some("abc"));
|
||||
assert_eq!(replace_cs_within("abc", "z", "", 2), None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn replace_case_insensitive() {
|
||||
assert_eq!(replace_ci("Apple apple APPLE", "apple", "pear"), "pear pear pear");
|
||||
|
||||
@@ -228,82 +228,6 @@ fn draw_border(pg: &mut Page, b: &BorderLine, wb: &Workbook, start: Point, end:
|
||||
pg.stroke_line_dashed(Point::new(x0, y0), Point::new(x1, y1), lw, color, &border_dash(b.style, k));
|
||||
}
|
||||
|
||||
/// Merged areas active at one row of a downward sweep, kept disjoint: by first column, their last
|
||||
/// column and last row. Adding, dropping and looking up a merge costs log(active merges).
|
||||
#[derive(Default)]
|
||||
struct MergeSweep {
|
||||
cols: std::collections::BTreeMap<u32, (u32, u32)>,
|
||||
/// (last row, first column) of the active merges, soonest ending first.
|
||||
ends: std::collections::BinaryHeap<std::cmp::Reverse<(u32, u32)>>,
|
||||
}
|
||||
|
||||
impl MergeSweep {
|
||||
/// Moves down to `row` (rows never decrease), dropping the merges that end above it.
|
||||
fn advance(&mut self, row: u32) {
|
||||
while let Some(std::cmp::Reverse((end, col))) = self.ends.peek().copied() {
|
||||
if end >= row {
|
||||
break;
|
||||
}
|
||||
self.ends.pop();
|
||||
self.cols.remove(&col);
|
||||
}
|
||||
}
|
||||
|
||||
/// Does an active merge meet columns `c0..=c1`? The intervals are disjoint, so only the last
|
||||
/// one starting at or before `c1` can.
|
||||
fn meets(&self, c0: u32, c1: u32) -> bool {
|
||||
self.cols.range(..=c1).next_back().is_some_and(|(_, (end, _))| *end >= c0)
|
||||
}
|
||||
|
||||
/// Adds merge `m`, at row `row`, unless it overlaps an active one.
|
||||
fn add(&mut self, m: RangeRef, row: u32) -> bool {
|
||||
self.advance(row);
|
||||
if self.meets(m.start.col, m.end.col) {
|
||||
return false;
|
||||
}
|
||||
self.cols.insert(m.start.col, (m.end.col, m.end.row));
|
||||
self.ends.push(std::cmp::Reverse((m.end.row, m.start.col)));
|
||||
true
|
||||
}
|
||||
}
|
||||
|
||||
/// The merged areas that meet `block`, ordered by the row where they enter it, then by column,
|
||||
/// leaving out any that overlaps one kept before it (only a damaged file has overlapping merges;
|
||||
/// Excel drops them when it repairs one). One sweep down the rows instead of a scan of every
|
||||
/// merge per cell.
|
||||
fn block_merges(sh: &Sheet, block: RangeRef) -> Vec<RangeRef> {
|
||||
let top = |m: &RangeRef| m.start.row.max(block.start.row);
|
||||
let mut merges: Vec<RangeRef> = sh.merges.iter().filter(|m| m.intersects(&block)).copied().collect();
|
||||
merges.sort_by_key(|m| (top(m), m.start.col));
|
||||
let mut sweep = MergeSweep::default();
|
||||
merges.retain(|m| sweep.add(*m, top(m)));
|
||||
merges
|
||||
}
|
||||
|
||||
/// Answers "is this cell inside a merge?" for cells asked in row-major order, from the merges of
|
||||
/// [`block_merges`].
|
||||
struct Covered<'a> {
|
||||
merges: &'a [RangeRef],
|
||||
top: u32,
|
||||
next: usize,
|
||||
sweep: MergeSweep,
|
||||
}
|
||||
|
||||
impl<'a> Covered<'a> {
|
||||
fn new(merges: &'a [RangeRef], block: RangeRef) -> Self {
|
||||
Self { merges, top: block.start.row, next: 0, sweep: MergeSweep::default() }
|
||||
}
|
||||
|
||||
fn covers(&mut self, c: CellRef) -> bool {
|
||||
while let Some(m) = self.merges.get(self.next).filter(|m| m.start.row.max(self.top) <= c.row) {
|
||||
self.sweep.add(*m, m.start.row.max(self.top));
|
||||
self.next += 1;
|
||||
}
|
||||
self.sweep.advance(c.row);
|
||||
self.sweep.meets(c.col, c.col)
|
||||
}
|
||||
}
|
||||
|
||||
/// Draws the cells of a block: fills, gridlines, data bars, borders and text.
|
||||
pub(super) fn draw_block(pg: &mut Page, b: &Block, gridlines: bool, cf: &mut Option<crate::cf::CfCache>) {
|
||||
let (bx, by) = (b.xs.first().copied().unwrap_or(0.0), b.ys.first().copied().unwrap_or(0.0));
|
||||
@@ -313,18 +237,17 @@ pub(super) fn draw_block(pg: &mut Page, b: &Block, gridlines: bool, cf: &mut Opt
|
||||
}
|
||||
let block = b.range();
|
||||
let sh = b.sh;
|
||||
let merges = block_merges(sh, block);
|
||||
let by_start: std::collections::HashMap<CellRef, RangeRef> = merges.iter().map(|m| (m.start, *m)).collect();
|
||||
// Cells worth visiting, in row-major order (which `Covered` needs).
|
||||
let mut covered = Covered::new(&merges, block);
|
||||
let merges: Vec<RangeRef> = sh.merges.iter().filter(|m| m.intersects(&block)).copied().collect();
|
||||
let covered = |c: CellRef| merges.iter().any(|m| m.contains(c));
|
||||
// Cells worth visiting.
|
||||
let cells: Vec<CellRef> = if block.count() <= DENSE_BLOCK {
|
||||
block.iter().filter(|c| !covered.covers(*c)).collect()
|
||||
block.iter().filter(|c| !covered(*c)).collect()
|
||||
} else {
|
||||
let mut set: Vec<CellRef> = sh.cells.iter_range(block).map(|(c, _)| c).collect();
|
||||
set.extend(sh.spill.range(block.start..=block.end).map(|(c, _)| *c).filter(|c| block.contains(*c)));
|
||||
set.sort_unstable();
|
||||
set.dedup();
|
||||
set.retain(|c| !covered.covers(*c));
|
||||
set.retain(|c| !covered(*c));
|
||||
set
|
||||
};
|
||||
pg.save();
|
||||
@@ -354,14 +277,14 @@ pub(super) fn draw_block(pg: &mut Page, b: &Block, gridlines: bool, cf: &mut Opt
|
||||
.filter(|(c, l)| {
|
||||
l.fill.is_some()
|
||||
|| l.cf.is_some()
|
||||
|| by_start.contains_key(c)
|
||||
|| merges.iter().any(|m| m.start == *c)
|
||||
|| !sh.value(*c).is_empty()
|
||||
|| l.style.borders != Borders::default()
|
||||
|| l.style.num_fmt.as_str() == "checkbox"
|
||||
})
|
||||
.collect();
|
||||
let rect_of = |c: CellRef| -> (f32, f32, f32, f32, bool) {
|
||||
match by_start.get(&c) {
|
||||
match merges.iter().find(|m| m.start == c) {
|
||||
Some(m) => {
|
||||
let (x, y, w, h) = b.rect(*m);
|
||||
(x, y, w, h, true)
|
||||
@@ -399,7 +322,7 @@ pub(super) fn draw_block(pg: &mut Page, b: &Block, gridlines: bool, cf: &mut Opt
|
||||
continue;
|
||||
}
|
||||
let bd = &l.style.borders;
|
||||
let (right, bottom) = match by_start.get(c).filter(|_| merged) {
|
||||
let (right, bottom) = match merges.iter().find(|m| m.start == *c).filter(|_| merged) {
|
||||
Some(m) => (
|
||||
b.wb.styles.get(sh.style_id(CellRef::new(m.start.row, m.end.col))).borders.right,
|
||||
b.wb.styles.get(sh.style_id(CellRef::new(m.end.row, m.start.col))).borders.bottom,
|
||||
@@ -484,12 +407,11 @@ pub(super) struct PrintedBlock {
|
||||
pub(super) fn draw_block_links(pg: &mut Page, b: &Block, page: usize, pending: &mut Vec<PendingPdfLink>) {
|
||||
let range = b.range();
|
||||
let (Some(&bx), Some(&by), Some(&right), Some(&bottom)) = (b.xs.first(), b.ys.first(), b.xs.last(), b.ys.last()) else { return };
|
||||
let by_start: std::collections::HashMap<CellRef, RangeRef> = block_merges(b.sh, range).into_iter().map(|m| (m.start, m)).collect();
|
||||
for (cell, link) in b.sh.hyperlinks.range(range.start..=range.end) {
|
||||
if !range.contains(*cell) {
|
||||
continue;
|
||||
}
|
||||
let cell_range = by_start.get(cell).copied().unwrap_or(RangeRef::cell(*cell));
|
||||
let cell_range = b.sh.merges.iter().find(|m| m.start == *cell).copied().unwrap_or(RangeRef::cell(*cell));
|
||||
let (x, y, w, h) = b.rect(cell_range);
|
||||
let (x0, y0, x1, y1) = (x.max(bx), y.max(by), (x + w).min(right), (y + h).min(bottom));
|
||||
if x1 <= x0 || y1 <= y0 {
|
||||
@@ -581,44 +503,3 @@ pub(super) fn make_block<'a>(
|
||||
}
|
||||
Block { wb, si, sh, rows, cols, xs, ys, k, scale: lay.scale }
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod merge_tests {
|
||||
use super::{CellRef, Covered, RangeRef, Sheet, block_merges};
|
||||
|
||||
fn r(a: &str) -> RangeRef {
|
||||
RangeRef::parse(a).unwrap()
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn block_merges_drop_overlaps_and_cover_like_a_scan() {
|
||||
let mut sh = Sheet::new("S");
|
||||
sh.merges = vec![r("B2:C3"), r("E1:F8"), r("B2:B5"), r("A10:D10"), r("H3:H4"), r("Z1:Z2"), r("C3:D4"), r("A1:A1048576")];
|
||||
let block = r("B1:H12");
|
||||
let merges = block_merges(&sh, block);
|
||||
// B2:B5 and C3:D4 overlap B2:C3, which comes first; Z1:Z2 is outside the block.
|
||||
assert_eq!(merges, vec![r("E1:F8"), r("B2:C3"), r("H3:H4"), r("A10:D10")]);
|
||||
let mut covered = Covered::new(&merges, block);
|
||||
for c in block.iter() {
|
||||
assert_eq!(covered.covers(c), merges.iter().any(|m| m.contains(c)), "{}", c.a1());
|
||||
}
|
||||
// Cells asked sparsely, still in order.
|
||||
let mut covered = Covered::new(&merges, block);
|
||||
for (a, want) in [("C1", false), ("F5", true), ("G5", false), ("D10", true), ("H12", false)] {
|
||||
assert_eq!(covered.covers(CellRef::parse(a).unwrap()), want, "{a}");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn many_stacked_merges_are_swept_once() {
|
||||
// 50,000 merges over the same cells: one is kept, and the block is checked against it
|
||||
// without comparing every cell with every merge.
|
||||
let mut sh = Sheet::new("S");
|
||||
sh.merges = (0..50_000u32).map(|i| RangeRef::new(CellRef::new(0, 0), CellRef::new(199, 1 + i % 50))).collect();
|
||||
let block = r("A1:AZ200");
|
||||
let merges = block_merges(&sh, block);
|
||||
assert_eq!(merges, vec![r("A1:B200")]);
|
||||
let mut covered = Covered::new(&merges, block);
|
||||
assert_eq!(block.iter().filter(|c| covered.covers(*c)).count(), 400);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user