add --quiet option to pdf-tag-dump.raku; also use :quiet in for testing

pdf-raku · Nov 7, 2023 · 621e6ee · 621e6ee
1 parent 08295f1
commit 621e6ee
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 8 deletions.
diff --git a/bin/pdf-tag-dump.raku b/bin/pdf-tag-dump.raku
@@ -20,6 +20,7 @@ sub MAIN(Str $infile,               #= Input PDF
          Bool    :$marks,           #= Descend into marked content
          Bool    :$fields = True,   #= Include referenced field data
          Bool    :$strict = True,   #= Warn about unknown tags, etc
+         Bool    :$quiet,           #= avoid printing any messages to stderr
          Bool    :$style = True,    #= Include stylesheet header
          Str     :$dtd,             #= Extern DtD to use
          Bool    :$valid = !$marks && !$roles, #= include external DtD declaration
@@ -36,7 +37,7 @@ sub MAIN(Str $infile,               #= Input PDF
     my %o = :$dtd with $dtd;
 
     my PDF::Class $pdf .= open( $input, :$password );
-    my PDF::Tags::Reader $dom .= read: :$pdf, :$strict, :$marks;
+    my PDF::Tags::Reader $dom .= read: :$pdf, :$strict, :$marks, :$quiet;
     my PDF::Tags::XML-Writer $xml .= new: :$max-depth, :$atts, :$debug, :$omit, :$style, :$root-tag, :$marks, :$valid, :$roles, |%o;
 
     my PDF::Tags::Node @nodes = do with $select {
@@ -79,6 +80,7 @@ Options:
    --valid           add external DtD declaration
    --/atts           omit attributes in tags
    --/strict         suppress warnings
+   --quiet           avoid printing messages
    --/style          omit root stylesheet link
 
 =head1 DESCRIPTION

diff --git a/lib/PDF/Tags/Reader.rakumod b/lib/PDF/Tags/Reader.rakumod
@@ -42,7 +42,7 @@ sub build-tag-index(%tags, PDF::Content::Tag $tag) {
 
 method canvas-tags($canvas --> Hash) {
     %!canvas-tags{$canvas} //= do {
-        $*ERR.print: '.';
+        $*ERR.print: '.' unless $!quiet;
         my &callback = TextDecoder.new(:$!lock, :$!quiet).callback;
         my PDF::Content $gfx = $canvas.gfx: :&callback, :$!strict;
         $canvas.render;

diff --git a/t/02xpath-basic.t b/t/02xpath-basic.t
@@ -11,7 +11,7 @@ sub tags(@elems) {
 
 my PDF::Class $pdf .= open("t/pdf/tagged.pdf");
 
-my PDF::Tags::Reader $dom .= read: :$pdf;
+my PDF::Tags::Reader $dom .= read: :$pdf, :quiet;
 
 for $dom.find('Document') -> $elem {
     isa-ok($elem, PDF::Tags::Elem);

diff --git a/t/04xpath-node-test.t b/t/04xpath-node-test.t
@@ -12,7 +12,7 @@ sub names(@elems) {
 
 my PDF::Class $pdf .= open("t/pdf/tagged.pdf");
 
-my PDF::Tags::Reader $dom .= read: :$pdf;
+my PDF::Tags::Reader $dom .= read: :$pdf, :quiet;
 
 is names($dom.find('Document/H1/*[1]')), 'Span Span Span Span Span';
 is names($dom.find('Document/H1[1]/node()')), 'Span';

diff --git a/t/05xpath-axis.t b/t/05xpath-axis.t
@@ -3,15 +3,15 @@ use PDF::Tags::Reader;
 use PDF::Tags::Elem;
 use PDF::Class;
 
-plan 19;
+plan 20;
 
 sub names(@elems) {
     @elems>>.name.join(' ');
 }
 
 my PDF::Class $pdf .= open("t/pdf/tagged.pdf");
 
-my PDF::Tags::Reader $dom .= read: :$pdf;
+my PDF::Tags::Reader $dom .= read: :$pdf, :quiet;
 
 is names($dom.find('Document/L')), ['L', 'L'], "child, repeated";
 is names($dom.find('Document/L[1]/LI[1]/LBody/ancestor::*')), 'Document L LI', 'ancestor';
@@ -30,6 +30,7 @@ my $lbody = $li.first('LBody');
 is names($lbl.find('following-sibling::*')), 'LBody', 'following-sibling';
 is names($lbody.find('/Document/L[1]/LI[1]/LBody/preceding::*')), 'Lbl', 'preceding';
 is names($lbody.find('preceding-sibling::*')), ['Lbl'], 'preceding-sibling';
+is names($lbody.find('preceding-sibling::Lbl')), ['Lbl'], 'preceding-sibling';
 is names($lbody.find('self::*')), ['LBody'], 'self';
 is names($lbody.find('.')), ['LBody'], 'self (abbreviated)';
 is names($lbody.find('parent::*')), ['LI'], 'parent';

diff --git a/t/06xml.t b/t/06xml.t
@@ -6,7 +6,7 @@ use PDF::Tags::XML-Writer;
 plan 3;
 
 my PDF::Class $pdf .= open: "t/pdf/tagged.pdf";
-my PDF::Tags::Reader $dom .= read: :$pdf;
+my PDF::Tags::Reader $dom .= read: :$pdf, :quiet;
 
 is-deeply $dom.root[0].xml.lines.head(3), (
     '<Document>',

diff --git a/t/10-reversed-chars.t b/t/10-reversed-chars.t
@@ -45,7 +45,7 @@ $pdf.id =  $*PROGRAM-NAME.fmt('%-16.16s');
 $pdf.save-as: "t/10-reversed-chars.pdf", :!info;
 
 $pdf .= open: "t/10-reversed-chars.pdf";
-$tags = PDF::Tags::Reader.read: :$pdf;
+$tags = PDF::Tags::Reader.read: :$pdf, :quiet;
 
 is $tags[0].xml, $xml, 'XML, round-tripped';