Fix poppler test failure

Author: FliegendeWurst

src/adapters/custom.rs

@@ -221,6 +221,7 @@ mod test {
 
     #[test]
     fn poppler() -> Result<()> {
+        let _ = env_logger::try_init();
         let adapter = builtin_spawning_adapters
             .iter()
             .find(|e| e.name == "poppler")
@@ -231,7 +232,7 @@ mod test {
         let filepath = test_data_dir().join("short.pdf");
 
         let (a, d) = simple_adapt_info(&filepath, Box::new(File::open(&filepath)?));
-        let mut r = adapter.adapt(a, &d)?;
+        let r = adapter.adapt(a, &d)?;
         let o = adapted_to_vec(r)?;
         assert_eq!(
             String::from_utf8(o)?,

src/adapters/email.rs

@@ -1,7 +1,7 @@
 use std::{cell::RefCell, io::Cursor};
 
 use super::*;
-use crate::{adapted_iter::AdaptedFilesIter};
+use crate::adapted_iter::AdaptedFilesIter;
 use anyhow::*;
 use lazy_static::lazy_static;
 use log::*;
@@ -14,7 +14,9 @@ lazy_static! {
     static ref METADATA: AdapterMeta = AdapterMeta {
         name: "email".to_owned(),
         version: 1,
-        description: "Reads an email file into a buffer and runs a different extractor on the contents".to_owned(),
+        description:
+            "Reads an email file into a buffer and runs a different extractor on the contents"
+                .to_owned(),
         recurses: true,
         fast_matchers: EXTENSIONS
             .iter()
@@ -89,7 +91,7 @@ impl<'a> AdaptedFilesIter<'a> for EmailAdaptIter<'a> {
                     postprocess,
                     config: self.inp.config.clone(),
                 })
-            }}
+            }};
         }
         if self.buf_parts.is_none() {
             let mut buf = Vec::new();

src/adapters/spawning.rs

@@ -165,7 +165,7 @@ impl FileAdapter for SpawningFileAdapter {
         debug!("executing {:?}", cmd);
         let output = pipe_output(&line_prefix, cmd, &mut inp, self.inner.get_exe(), "")?;
         Ok(Box::new(SingleAdaptedFileAsIter::new(AdaptInfo {
-            filepath_hint,
+            filepath_hint: filepath_hint.join("adapted"), // stop infinite recursion based on extension
             inp: output,
             line_prefix,
             is_real_file: false,

src/preproc.rs

@@ -223,7 +223,7 @@ fn run_adapter<'a>(
             .adapt(
                 AdaptInfo {
                     line_prefix,
-                    filepath_hint: filepath_hint.join("xx"), // FIXME: this is just a hack to make the PDF extractor work
+                    filepath_hint: filepath_hint.clone(),
                     is_real_file,
                     inp,
                     archive_recursion_depth,