Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace println with log #117

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Replace println with log #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ lopdf = {version = "0.34", default-features = false, features = ["nom_parser"]}
postscript = "0.14"
type1-encoding-parser = "0.1.0"
unicode-normalization = "0.1.19"
log = "0.4.22"

[dev-dependencies]
ureq = "2.6.2"
test-log = "0.2.17"
33 changes: 17 additions & 16 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ use std::collections::hash_map::Entry;
use std::rc::Rc;
use std::marker::PhantomData;
use std::result::Result;
use log::{warn, error};
mod core_fonts;
mod glyphnames;
mod zapfglyphnames;
Expand Down Expand Up @@ -458,7 +459,7 @@ impl<'a> PdfSimpleFont<'a> {
Entry::Occupied(e) => {
if e.get() != &String::from_utf16(&be).unwrap() {
let normal_match = e.get().nfkc().eq(String::from_utf16(&be).unwrap().nfkc());
println!("Unicode mismatch {} {} {:?} {:?} {:?}", normal_match, name, e.get(), String::from_utf16(&be), be);
warn!("Unicode mismatch {} {} {:?} {:?} {:?}", normal_match, name, e.get(), String::from_utf16(&be), be);
}
}
}
Expand All @@ -476,7 +477,7 @@ impl<'a> PdfSimpleFont<'a> {
}
}
_ => {
println!("unknown glyph name '{}' for font {}", name, base_name);
warn!("unknown glyph name '{}' for font {}", name, base_name);
}
}
}
Expand Down Expand Up @@ -545,7 +546,7 @@ impl<'a> PdfSimpleFont<'a> {
let name = if is_core_font(&base_name) {
&base_name
} else {
println!("no widths and not core font {:?}", base_name);
warn!("no widths and not core font {:?}", base_name);

// This situation is handled differently by different readers
// but basically we try to substitute the best font that we can.
Expand Down Expand Up @@ -788,12 +789,12 @@ impl<'a> PdfFont for PdfSimpleFont<'a> {
let s = unicode_map.get(&char);
let s = match s {
None => {
println!("missing char {:?} in unicode map {:?} for {:?}", char, unicode_map, self.font);
warn!("missing char {:?} in unicode map {:?} for {:?}", char, unicode_map, self.font);
// some pdf's like http://arxiv.org/pdf/2312.00064v1 are missing entries in their unicode map but do have
// entries in the encoding.
let encoding = self.encoding.as_ref().map(|x| &x[..]).expect("missing unicode map and encoding");
let s = to_utf8(encoding, &slice);
println!("falling back to encoding {} -> {:?}", char, s);
warn!("falling back to encoding {} -> {:?}", char, s);
s
}
Some(s) => { s.clone() }
Expand Down Expand Up @@ -838,12 +839,12 @@ impl<'a> PdfFont for PdfType3Font<'a> {
let s = unicode_map.get(&char);
let s = match s {
None => {
println!("missing char {:?} in unicode map {:?} for {:?}", char, unicode_map, self.font);
warn!("missing char {:?} in unicode map {:?} for {:?}", char, unicode_map, self.font);
// some pdf's like http://arxiv.org/pdf/2312.00577v1 are missing entries in their unicode map but do have
// entries in the encoding.
let encoding = self.encoding.as_ref().map(|x| &x[..]).expect("missing unicode map and encoding");
let s = to_utf8(encoding, &slice);
println!("falling back to encoding {} -> {:?}", char, s);
warn!("falling back to encoding {} -> {:?}", char, s);
s
}
Some(s) => { s.clone() }
Expand Down Expand Up @@ -1175,8 +1176,8 @@ impl Function {
let contents = match obj {
&Object::Stream(ref stream) => {
let contents = get_contents(stream);
println!("unhandled type-4 function");
println!("Stream: {}", String::from_utf8(contents.clone()).unwrap());
warn!("unhandled type-4 function");
warn!("Stream: {}", String::from_utf8(contents.clone()).unwrap());
contents
}
_ => { panic!("type 4 functions should be streams") }
Expand Down Expand Up @@ -1745,7 +1746,7 @@ impl<'a> Processor<'a> {
if let Some(s) = s {
gs = s;
} else {
println!("No state to pop");
warn!("No state to pop");
}
}
"gs" => {
Expand Down Expand Up @@ -1895,7 +1896,7 @@ impl<'a> HTMLOutput<'a> {
// get the length of one sized of the square with the same area with a rectangle of size (x, y)
let transformed_font_size = (transformed_font_size_vec.x * transformed_font_size_vec.y).sqrt();
let (x, y) = (position.m31, position.m32);
println!("flush {} {:?}", self.buf, (x,y));
warn!("flush {} {:?}", self.buf, (x,y));

write!(self.file, "<div style='position: absolute; left: {}px; top: {}px; font-size: {}px'>{}</div>\n",
x, y, transformed_font_size, insert_nbsp(&self.buf))?;
Expand Down Expand Up @@ -1926,10 +1927,10 @@ impl<'a> OutputDev for HTMLOutput<'a> {
let position = trm.post_transform(&self.flip_ctm);
let (x, y) = (position.m31, position.m32);

println!("accum {} {:?}", char, (x,y));
warn!("accum {} {:?}", char, (x,y));
self.buf += char;
} else {
println!("flush {} {:?} {:?} {} {} {}", char, trm, self.last_ctm, width, font_size, spacing);
warn!("flush {} {:?} {:?} {} {} {}", char, trm, self.last_ctm, width, font_size, spacing);
self.flush_string()?;
self.buf = char.to_owned();
self.buf_font_size = font_size;
Expand Down Expand Up @@ -2193,7 +2194,7 @@ fn maybe_decrypt(doc: &mut Document) -> Result<(), OutputError> {

if let Err(e) = doc.decrypt("") {
if let Error::Decryption(DecryptionError::IncorrectPassword) = e {
eprintln!("Encrypted documents must be decrypted with a password using {{extract_text|extract_text_from_mem|output_doc}}_encrypted")
error!("Encrypted documents must be decrypted with a password using {{extract_text|extract_text_from_mem|output_doc}}_encrypted")
}

return Err(OutputError::PdfError(e));
Expand Down Expand Up @@ -2332,7 +2333,7 @@ pub fn output_doc_encrypted<PW: AsRef<[u8]>>(
/// Parse a given document and output it to `output`
pub fn output_doc(doc: &Document, output: &mut dyn OutputDev) -> Result<(), OutputError> {
if doc.is_encrypted() {
eprintln!("Encrypted documents must be decrypted with a password using {{extract_text|extract_text_from_mem|output_doc}}_encrypted");
error!("Encrypted documents must be decrypted with a password using {{extract_text|extract_text_from_mem|output_doc}}_encrypted");
}
let empty_resources = Dictionary::new();
let pages = doc.get_pages();
Expand All @@ -2347,7 +2348,7 @@ pub fn output_doc(doc: &Document, output: &mut dyn OutputDev) -> Result<(), Outp

pub fn output_doc_page(doc: &Document, output: &mut dyn OutputDev, page_num: u32) -> Result<(), OutputError> {
if doc.is_encrypted() {
eprintln!("Encrypted documents must be decrypted with a password using {{extract_text|extract_text_from_mem|output_doc}}_encrypted");
error!("Encrypted documents must be decrypted with a password using {{extract_text|extract_text_from_mem|output_doc}}_encrypted");
}
let empty_resources = Dictionary::new();
let pages = doc.get_pages();
Expand Down
5 changes: 3 additions & 2 deletions tests/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use log::info;
use pdf_extract::extract_text;

use test_log::test;
// Shorthand for creating ExpectedText
// example: expected!("atomic.pdf", "Atomic Data");
macro_rules! expected {
Expand Down Expand Up @@ -71,7 +72,7 @@ impl ExpectedText<'_> {
};
let out = extract_text(file_path)
.unwrap_or_else(|e| panic!("Failed to extract text from {}, {}", filename, e));
println!("{}", out);
info!("{}", out);
assert!(
out.contains(text),
"Text {} does not contain '{}'",
Expand Down