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

simplify tar

Browse Source
This commit is contained in:
phiresky 2019-06-07 13:12:44 +02:00
parent b69f903b58
commit 434063907d
1 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/adapters/tar.rs
View File

@ -4,7 +4,6 @@ use ::tar::EntryType::Regular;
use failure::*; use failure::*;
use lazy_static::lazy_static; use lazy_static::lazy_static;
use std::io::BufReader;
use std::path::PathBuf; use std::path::PathBuf;
static EXTENSIONS: &[&str] = &["tar", "tar.gz", "tar.bz2", "tar.xz", "tar.zst"]; static EXTENSIONS: &[&str] = &["tar", "tar.gz", "tar.bz2", "tar.xz", "tar.zst"];
@ -33,39 +32,18 @@ impl GetMetadata for TarAdapter {
} }
} }
// feeling a little stupid here. why is this needed at all fn decompress_any<'a, R>(filename: &Path, inp: &'a mut R) -> Fallible<Box<dyn Read + 'a>>
enum SpecRead<R: Read> {
Gz(flate2::read::MultiGzDecoder<R>),
Bz2(bzip2::read::BzDecoder<R>),
Xz(xz2::read::XzDecoder<R>),
Zst(zstd::stream::read::Decoder<BufReader<R>>),
Passthrough(R),
}
impl<R: Read> Read for SpecRead<R> {
fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
use SpecRead::*;
match self {
Gz(z) => z.read(buf),
Bz2(z) => z.read(buf),
Xz(z) => z.read(buf),
Zst(z) => z.read(buf),
Passthrough(z) => z.read(buf),
}
}
}
// why do I need to wrap the output here in a specific type? is it possible with just a Box<Read> for every type?
fn decompress_any<'a, R>(filename: &Path, inp: &'a mut R) -> Fallible<SpecRead<&'a mut R>>
where where
R: Read, R: Read,
{ {
let extension = filename.extension().map(|e| e.to_string_lossy().to_owned()); let extension = filename.extension().map(|e| e.to_string_lossy().to_owned());
match extension { match extension {
Some(e) => Ok(match e.to_owned().as_ref() { Some(e) => Ok(match e.to_owned().as_ref() {
"gz" => SpecRead::Gz(flate2::read::MultiGzDecoder::new(inp)), "gz" => Box::new(flate2::read::MultiGzDecoder::new(inp)),
"bz2" => SpecRead::Bz2(bzip2::read::BzDecoder::new(inp)), "bz2" => Box::new(bzip2::read::BzDecoder::new(inp)),
"xz" => SpecRead::Xz(xz2::read::XzDecoder::new_multi_decoder(inp)), "xz" => Box::new(xz2::read::XzDecoder::new_multi_decoder(inp)),
"zst" => SpecRead::Zst(zstd::stream::read::Decoder::new(inp)?), "zst" => Box::new(zstd::stream::read::Decoder::new(inp)?),
"tar" => SpecRead::Passthrough(inp), "tar" => Box::new(inp),
ext => Err(format_err!("don't know how to decompress {}", ext))?, ext => Err(format_err!("don't know how to decompress {}", ext))?,
}), }),
None => Err(format_err!("no extension")), None => Err(format_err!("no extension")),