PdfCraft: An open-source PDF reader and editor written by scratch in pure Rust
fix(sonar): clear css:S9441 and S3776 in forms actions
Dylan M. Taylorf94668f1c8c7
diff --git a/assets/demo/showcase.html b/assets/demo/showcase.htmlindex b26f24565..3b14ea3b4 100644--- a/assets/demo/showcase.html+++ b/assets/demo/showcase.html@@ -14,27 +14,27 @@(highlight, sticky note, stamp, ...), so annotation geometry follows the layout.--><style>-@font-face { font-display: block; font-family: "PC Mono"; src: url("{{ASSETS}}/fonts/JetBrainsMono-Regular.ttf"); }-@font-face { font-display: block; font-family: "PC Inter"; src: url("{{FONTS}}/Inter[opsz,wght].ttf"); font-weight: 100 900; }-@font-face { font-display: block; font-family: "PC Inter"; src: url("{{FONTS}}/Inter-Italic[opsz,wght].ttf"); font-weight: 100 900; font-style: italic; }-@font-face { font-display: block; font-family: "PC Garamond"; src: url("{{FONTS}}/EBGaramond[wght].ttf"); font-weight: 400 800; }-@font-face { font-display: block; font-family: "PC Garamond"; src: url("{{FONTS}}/EBGaramond-Italic[wght].ttf"); font-weight: 400 800; font-style: italic; }-@font-face { font-display: block; font-family: "PC Playfair"; src: url("{{FONTS}}/PlayfairDisplay[wght].ttf"); font-weight: 400 900; }-@font-face { font-display: block; font-family: "PC Playfair"; src: url("{{FONTS}}/PlayfairDisplay-Italic[wght].ttf"); font-weight: 400 900; font-style: italic; }-@font-face { font-display: block; font-family: "PC Vibes"; src: url("{{FONTS}}/GreatVibes-Regular.ttf"); }-@font-face { font-display: block; font-family: "PC Math"; src: url("{{FONTS}}/STIXTwoMath-Regular.ttf"); }-@font-face { font-display: block; font-family: "PC Amiri"; src: url("{{FONTS}}/Amiri-Regular.ttf"); }-@font-face { font-display: block; font-family: "PC Hebrew"; src: url("{{FONTS}}/NotoSansHebrew[wdth,wght].ttf"); font-weight: 100 900; }-@font-face { font-display: block; font-family: "PC Devanagari"; src: url("{{FONTS}}/NotoSansDevanagari[wdth,wght].ttf"); font-weight: 100 900; }-@font-face { font-display: block; font-family: "PC Thai"; src: url("{{FONTS}}/NotoSansThai[wdth,wght].ttf"); font-weight: 100 900; }-@font-face { font-display: block; font-family: "PC Armenian"; src: url("{{FONTS}}/NotoSansArmenian[wdth,wght].ttf"); font-weight: 100 900; }-@font-face { font-display: block; font-family: "PC Georgian"; src: url("{{FONTS}}/NotoSansGeorgian[wdth,wght].ttf"); font-weight: 100 900; }-@font-face { font-display: block; font-family: "PC Tamil"; src: url("{{FONTS}}/NotoSansTamil[wdth,wght].ttf"); font-weight: 100 900; }-@font-face { font-display: block; font-family: "PC Charis"; src: url("{{FONTS}}/CharisSIL-Regular.ttf"); }-@font-face { font-display: block; font-family: "PC XiaoWei"; src: url("{{FONTS}}/ZCOOLXiaoWei-Regular.ttf"); }-@font-face { font-display: block; font-family: "PC Mincho"; src: url("{{FONTS}}/ShipporiMincho-Regular.ttf"); }-@font-face { font-display: block; font-family: "PC Gowun"; src: url("{{FONTS}}/GowunBatang-Regular.ttf"); }-@font-face { font-display: block; font-family: "PC Emoji"; src: url("{{FONTS}}/NotoColorEmoji-Regular.ttf"); }+@font-face { font-display: swap; font-family: "PC Mono"; src: url("{{ASSETS}}/fonts/JetBrainsMono-Regular.ttf"); }+@font-face { font-display: swap; font-family: "PC Inter"; src: url("{{FONTS}}/Inter[opsz,wght].ttf"); font-weight: 100 900; }+@font-face { font-display: swap; font-family: "PC Inter"; src: url("{{FONTS}}/Inter-Italic[opsz,wght].ttf"); font-weight: 100 900; font-style: italic; }+@font-face { font-display: swap; font-family: "PC Garamond"; src: url("{{FONTS}}/EBGaramond[wght].ttf"); font-weight: 400 800; }+@font-face { font-display: swap; font-family: "PC Garamond"; src: url("{{FONTS}}/EBGaramond-Italic[wght].ttf"); font-weight: 400 800; font-style: italic; }+@font-face { font-display: swap; font-family: "PC Playfair"; src: url("{{FONTS}}/PlayfairDisplay[wght].ttf"); font-weight: 400 900; }+@font-face { font-display: swap; font-family: "PC Playfair"; src: url("{{FONTS}}/PlayfairDisplay-Italic[wght].ttf"); font-weight: 400 900; font-style: italic; }+@font-face { font-display: swap; font-family: "PC Vibes"; src: url("{{FONTS}}/GreatVibes-Regular.ttf"); }+@font-face { font-display: swap; font-family: "PC Math"; src: url("{{FONTS}}/STIXTwoMath-Regular.ttf"); }+@font-face { font-display: swap; font-family: "PC Amiri"; src: url("{{FONTS}}/Amiri-Regular.ttf"); }+@font-face { font-display: swap; font-family: "PC Hebrew"; src: url("{{FONTS}}/NotoSansHebrew[wdth,wght].ttf"); font-weight: 100 900; }+@font-face { font-display: swap; font-family: "PC Devanagari"; src: url("{{FONTS}}/NotoSansDevanagari[wdth,wght].ttf"); font-weight: 100 900; }+@font-face { font-display: swap; font-family: "PC Thai"; src: url("{{FONTS}}/NotoSansThai[wdth,wght].ttf"); font-weight: 100 900; }+@font-face { font-display: swap; font-family: "PC Armenian"; src: url("{{FONTS}}/NotoSansArmenian[wdth,wght].ttf"); font-weight: 100 900; }+@font-face { font-display: swap; font-family: "PC Georgian"; src: url("{{FONTS}}/NotoSansGeorgian[wdth,wght].ttf"); font-weight: 100 900; }+@font-face { font-display: swap; font-family: "PC Tamil"; src: url("{{FONTS}}/NotoSansTamil[wdth,wght].ttf"); font-weight: 100 900; }+@font-face { font-display: swap; font-family: "PC Charis"; src: url("{{FONTS}}/CharisSIL-Regular.ttf"); }+@font-face { font-display: swap; font-family: "PC XiaoWei"; src: url("{{FONTS}}/ZCOOLXiaoWei-Regular.ttf"); }+@font-face { font-display: swap; font-family: "PC Mincho"; src: url("{{FONTS}}/ShipporiMincho-Regular.ttf"); }+@font-face { font-display: swap; font-family: "PC Gowun"; src: url("{{FONTS}}/GowunBatang-Regular.ttf"); }+@font-face { font-display: swap; font-family: "PC Emoji"; src: url("{{FONTS}}/NotoColorEmoji-Regular.ttf"); }@page { size: Letter; margin: 0; }diff --git a/crates/forms/src/actions.rs b/crates/forms/src/actions.rsindex f58bd1078..5eb57c6c1 100644--- a/crates/forms/src/actions.rs+++ b/crates/forms/src/actions.rs@@ -260,6 +260,47 @@ fn write(doc: &mut Document, a: &FieldAction, pages: &[pdfcraft_cos::ObjRef]) ->Ok(Some(Object::Ref(doc.add(Object::Dict(d)))))}+/// Rewrite one trigger of a widget to `new` (`None` clears it), given the `old` value read from+/// the widget. `aa` and `a_entry` are the widget's `/AA` dict and `/A` entry, updated in place.+#[allow(clippy::too_many_arguments)]+fn replace_trigger(+ doc: &mut Document,+ pages: &[pdfcraft_cos::ObjRef],+ scripts: &mut pdfcraft_cos::DecodeBudget,+ t: Trigger,+ new: Option<&FieldAction>,+ old: Option<Object>,+ aa: &mut Dict,+ a_entry: &mut Option<Object>,+) -> Result<(), FormError> {+ let old_action = old.as_ref().and_then(|o| read(doc, o, pages, scripts));+ if new.is_some() && new == old_action.as_ref() {+ return Ok(());+ }+ // The list shows a trigger's first action: replacing it keeps the ones chained after it.+ let next = new.and(old).and_then(|o| doc.resolve(&o).as_dict().and_then(|d| d.get(b"Next").cloned()));+ let obj = match new {+ Some(a) => write(doc, a, pages)?,+ None => None,+ };+ if let (Some(Object::Ref(r)), Some(next)) = (&obj, next) {+ doc.update_dict(*r, |d| d.set(b"Next".to_vec(), next))?;+ }+ match t.key() {+ None => {+ *a_entry = obj;+ aa.remove(b"U");+ }+ Some(k) => match obj {+ Some(o) => aa.set(k.to_vec(), o),+ None => {+ aa.remove(k);+ }+ },+ }+ Ok(())+}+/// Replace field `name`'s actions (on every widget) with `actions`; triggers not listed lose/// theirs. `Other` actions, and actions that read the same as before, are left as they are (with/// their chain and the keys this module doesn't read); a replaced action keeps its chain.@@ -281,31 +322,7 @@ pub fn set_field_actions(doc: &mut Document, name: &str, actions: &[(Trigger, FiNone => wd.get(b"A").cloned().or_else(|| aa.get(b"U").cloned()),Some(k) => aa.get(k).cloned(),};- let old_action = old.as_ref().and_then(|o| read(doc, o, &pages, &mut scripts));- if new.is_some() && new == old_action.as_ref() {- continue;- }- // The list shows a trigger's first action: replacing it keeps the ones chained after it.- let next = new.and(old).and_then(|o| doc.resolve(&o).as_dict().and_then(|d| d.get(b"Next").cloned()));- let obj = match new {- Some(a) => write(doc, a, &pages)?,- None => None,- };- if let (Some(Object::Ref(r)), Some(next)) = (&obj, next) {- doc.update_dict(*r, |d| d.set(b"Next".to_vec(), next))?;- }- match t.key() {- None => {- a_entry = obj;- aa.remove(b"U");- }- Some(k) => match obj {- Some(o) => aa.set(k.to_vec(), o),- None => {- aa.remove(k);- }- },- }+ replace_trigger(doc, &pages, &mut scripts, t, new, old, &mut aa, &mut a_entry)?;}doc.update_dict(w.obj, |d| {match &a_entry {