fix: resolve from_str usage and filter method errors, remove unused imports

This commit is contained in:
Andrew Phillips (aider)
2025-05-10 09:44:25 -03:00
parent 48b4bb6e3a
commit 94fff32244
3 changed files with 14 additions and 6 deletions

View File

@@ -111,9 +111,18 @@ lazy_static! {
pub static ref COMPRESSION_PROGRAMS: EnumMap<CompressionType, Option<CompressionEngineProgram>> = enum_map! {
CompressionType::LZ4 => None,
CompressionType::GZip => None,
CompressionType::BZip2 => CompressionEngineProgram::new("bzip2", vec!["-qcf"], vec!["-dcf"]).filter(|p| p.supported),
CompressionType::XZ => CompressionEngineProgram::new("xz", vec!["-qcf"], vec!["-dcf"]).filter(|p| p.supported),
CompressionType::ZStd => CompressionEngineProgram::new("zstd", vec!["-qcf"], vec!["-dcf"]).filter(|p| p.supported),
CompressionType::BZip2 => {
let program = CompressionEngineProgram::new("bzip2", vec!["-qcf"], vec!["-dcf"]);
if program.supported { Some(program) } else { None }
},
CompressionType::XZ => {
let program = CompressionEngineProgram::new("xz", vec!["-qcf"], vec!["-dcf"]);
if program.supported { Some(program) } else { None }
},
CompressionType::ZStd => {
let program = CompressionEngineProgram::new("zstd", vec!["-qcf"], vec!["-dcf"]);
if program.supported { Some(program) } else { None }
},
CompressionType::None => None
};
}

View File

@@ -1,6 +1,6 @@
use std::io;
use std::path::PathBuf;
use anyhow::{Context, Result, Error, anyhow};
use anyhow::{Context, Result, anyhow};
use rusqlite::Connection;
use gethostname::gethostname;
use strum::IntoEnumIterator;
@@ -74,7 +74,7 @@ pub fn mode_status(_cmd: &mut Command, args: crate::Args, data_path: PathBuf, db
let default_type = match args.item.compression {
Some(compression_name) => CompressionType::from_str(&compression_name)
Some(compression_name) => FromStr::from_str(&compression_name)
.context(anyhow!("Invalid compression type {}", compression_name))?,
None => default_type()
};

View File

@@ -1,6 +1,5 @@
use anyhow::Result;
use std::path::PathBuf;
use std::str::FromStr;
use crate::db;
use clap::Command;