arnekeller/ripgrep-all
1
0
Fork 0
mirror of https://github.com/FliegendeWurst/ripgrep-all.git synced 2024-11-24 12:24:56 +00:00
Code Issues Projects Releases Wiki Activity

less duplication

Browse Source
This commit is contained in:
phiresky 2022-11-05 01:01:05 +01:00
parent be0b78a072
commit 937b1a81ac
1 changed files with 46 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/preproc.rs
View File

@ -14,7 +14,7 @@ use async_stream::stream;
use log::*; use log::*;
use path_clean::PathClean; use path_clean::PathClean;
use std::sync::Arc; use std::sync::Arc;
// use postproc::PostprocPrefix; use postproc::PostprocPrefix;
use std::convert::TryInto; use std::convert::TryInto;
use std::io::Cursor; use std::io::Cursor;
use std::path::Path; use std::path::Path;
@ -52,12 +52,11 @@ async fn choose_adapter(
Ok(adapter.map(|e| (e.0, e.1, active_adapters))) Ok(adapter.map(|e| (e.0, e.1, active_adapters)))
} }
async fn buf_choose_adapter( enum Ret {
ai: AdaptInfo, Recurse(AdaptInfo, Arc<dyn FileAdapter>, FileMatcher, ActiveAdapters),
) -> Result<( Passthrough(AdaptInfo),
AdaptInfo, }
Option<(Arc<dyn FileAdapter>, FileMatcher, ActiveAdapters)>, async fn buf_choose_adapter(ai: AdaptInfo) -> Result<Ret> {
)> {
let mut inp = BufReader::with_capacity(1 << 16, ai.inp); let mut inp = BufReader::with_capacity(1 << 16, ai.inp);
let adapter = choose_adapter( let adapter = choose_adapter(
&ai.config, &ai.config,
@ -66,26 +65,21 @@ async fn buf_choose_adapter(
&mut inp, &mut inp,
) )
.await?; .await?;
let ai = AdaptInfo { let (a, b, c) = match adapter {
inp: Box::pin(inp), Some(x) => x,
..ai None => {
};
Ok((ai, adapter))
}
fn handle_no_adapter(ai: AdaptInfo) -> Result<AdaptInfo> {
// allow passthrough if the file is in an archive or accurate matching is enabled // allow passthrough if the file is in an archive or accurate matching is enabled
// otherwise it should have been filtered out by rg pre-glob since rg can handle those better than us // otherwise it should have been filtered out by rg pre-glob since rg can handle those better than us
let allow_cat = !ai.is_real_file || ai.config.accurate; let allow_cat = !ai.is_real_file || ai.config.accurate;
if allow_cat { if allow_cat {
if ai.postprocess { if ai.postprocess {
panic!("not implemented"); (
/* ( Arc::new(PostprocPrefix {}) as Arc<dyn FileAdapter>,
Rc::new(PostprocPrefix {}) as Arc<dyn FileAdapter>, FileMatcher::Fast(FastFileMatcher::FileExtension("default".to_string())),
FileMatcher::Fast(FastFileMatcher::FileExtension("default".to_string())), // todo: separate enum value for this Vec::new(),
)*/ )
} else { } else {
return Ok(ai); return Ok(Ret::Passthrough(ai));
} }
} else { } else {
return Err(format_err!( return Err(format_err!(
@ -95,7 +89,15 @@ fn handle_no_adapter(ai: AdaptInfo) -> Result<AdaptInfo> {
.ok_or_else(|| format_err!("Empty filename"))? .ok_or_else(|| format_err!("Empty filename"))?
)); ));
} }
}
};
let ai = AdaptInfo {
inp: Box::pin(inp),
..ai
};
Ok(Ret::Recurse(ai, a, b, c))
} }
/** /**
* preprocess a file as defined in `ai`. * preprocess a file as defined in `ai`.
* *
@ -111,9 +113,11 @@ pub async fn rga_preproc(ai: AdaptInfo) -> Result<ReadBox> {
// todo: figure out when using a bufreader is a good idea and when it is not // todo: figure out when using a bufreader is a good idea and when it is not
// seems to be good for File::open() reads, but not sure about within archives (tar, zip) // seems to be good for File::open() reads, but not sure about within archives (tar, zip)
let (ai, adapter) = buf_choose_adapter(ai).await?; let (ai, adapter, detection_reason, active_adapters) = match buf_choose_adapter(ai).await? {
let Some((adapter, detection_reason, active_adapters)) = adapter else { Ret::Recurse(ai, a, b, c) => (ai, a, b, c),
return handle_no_adapter(ai).map(|ai| ai.inp); Ret::Passthrough(ai) => {
return Ok(ai.inp);
}
}; };
let path_hint_copy = ai.filepath_hint.clone(); let path_hint_copy = ai.filepath_hint.clone();
adapt_caching(ai, adapter, detection_reason, active_adapters) adapt_caching(ai, adapter, detection_reason, active_adapters)
@ -227,13 +231,15 @@ fn loop_adapt(
let s = stream! { let s = stream! {
for await file in inp { for await file in inp {
let (file, chosen_adapter) = buf_choose_adapter(file).await.expect("todo: handle"); match buf_choose_adapter(file).await.expect("todo: handle") {
if let Some((adapter, detection_reason, active_adapters)) = chosen_adapter { Ret::Recurse(ai, adapter, detection_reason, active_adapters) => {
for await file in loop_adapt(adapter.as_ref(), detection_reason, file).expect("todo: handle") { for await file in loop_adapt(adapter.as_ref(), detection_reason, file).expect("todo: handle") {
yield file; yield file;
} }
} else { }
yield handle_no_adapter(file).expect("todo: handle"); Ret::Passthrough(ai) => {
yield ai;
}
} }
} }
}; };