chore: remove --digest argument and $KEEP_DIGEST environment variable
Co-authored-by: aider (openai/andrew/openrouter/qwen/qwen3-coder) <aider@aider.chat>
This commit is contained in:
@@ -88,9 +88,6 @@ pub struct ItemArgs {
|
|||||||
#[arg(value_parser = clap::value_parser!(KeyValue))]
|
#[arg(value_parser = clap::value_parser!(KeyValue))]
|
||||||
pub meta: Vec<KeyValue>,
|
pub meta: Vec<KeyValue>,
|
||||||
|
|
||||||
#[arg(help_heading("Item Options"), long, env("KEEP_DIGEST"))]
|
|
||||||
#[arg(help("Digest algorithm to use when saving items"))]
|
|
||||||
pub digest: Option<String>,
|
|
||||||
|
|
||||||
#[arg(help_heading("Item Options"), short, long, env("KEEP_COMPRESSION"))]
|
#[arg(help_heading("Item Options"), short, long, env("KEEP_COMPRESSION"))]
|
||||||
#[arg(help("Compression algorithm to use when saving items"))]
|
#[arg(help("Compression algorithm to use when saving items"))]
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ use log::debug;
|
|||||||
use std::io::{Read, Write, IsTerminal};
|
use std::io::{Read, Write, IsTerminal};
|
||||||
|
|
||||||
// Import the missing functions from common module
|
// Import the missing functions from common module
|
||||||
use crate::modes::common::{settings_digest_type, settings_compression_type, settings_meta_plugin_types};
|
use crate::modes::common::{settings_compression_type, settings_meta_plugin_types};
|
||||||
use crate::config;
|
use crate::config;
|
||||||
|
|
||||||
fn validate_save_args(cmd: &mut Command, ids: &Vec<i64>) {
|
fn validate_save_args(cmd: &mut Command, ids: &Vec<i64>) {
|
||||||
@@ -27,32 +27,15 @@ fn setup_compression_and_plugins(
|
|||||||
cmd: &mut Command,
|
cmd: &mut Command,
|
||||||
settings: &config::Settings,
|
settings: &config::Settings,
|
||||||
) -> (crate::compression_engine::CompressionType, Box<dyn crate::compression_engine::CompressionEngine>, Vec<Box<dyn crate::meta_plugin::MetaPlugin>>) {
|
) -> (crate::compression_engine::CompressionType, Box<dyn crate::compression_engine::CompressionEngine>, Vec<Box<dyn crate::meta_plugin::MetaPlugin>>) {
|
||||||
let digest_type = settings_digest_type(cmd, settings);
|
|
||||||
debug!("MAIN: Digest type: {:?}", digest_type);
|
|
||||||
|
|
||||||
let compression_type = settings_compression_type(cmd, settings);
|
let compression_type = settings_compression_type(cmd, settings);
|
||||||
debug!("MAIN: Compression type: {:?}", compression_type);
|
debug!("MAIN: Compression type: {:?}", compression_type);
|
||||||
let compression_engine =
|
let compression_engine =
|
||||||
crate::compression_engine::get_compression_engine(compression_type.clone()).expect("Unable to get compression engine");
|
crate::compression_engine::get_compression_engine(compression_type.clone()).expect("Unable to get compression engine");
|
||||||
|
|
||||||
// Start with meta plugin types from settings
|
// Get meta plugin types from settings
|
||||||
let mut meta_plugin_types: Vec<crate::meta_plugin::MetaPluginType> = settings_meta_plugin_types(cmd, settings);
|
let meta_plugin_types: Vec<crate::meta_plugin::MetaPluginType> = settings_meta_plugin_types(cmd, settings);
|
||||||
debug!("MAIN: Meta plugin types: {:?}", meta_plugin_types);
|
debug!("MAIN: Meta plugin types: {:?}", meta_plugin_types);
|
||||||
|
|
||||||
// Convert digest type to meta plugin type and add to the list if needed
|
|
||||||
let digest_meta_plugin_type = match digest_type {
|
|
||||||
crate::meta_plugin::MetaPluginType::DigestSha256 => Some(crate::meta_plugin::MetaPluginType::DigestSha256),
|
|
||||||
crate::meta_plugin::MetaPluginType::DigestMd5 => Some(crate::meta_plugin::MetaPluginType::DigestMd5),
|
|
||||||
_ => None,
|
|
||||||
};
|
|
||||||
|
|
||||||
// Add digest meta plugin to the list if needed
|
|
||||||
if let Some(digest_plugin_type) = digest_meta_plugin_type {
|
|
||||||
if !meta_plugin_types.contains(&digest_plugin_type) {
|
|
||||||
meta_plugin_types.push(digest_plugin_type);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Initialize meta_plugins with MetaPlugin instances for each MetaPluginType
|
// Initialize meta_plugins with MetaPlugin instances for each MetaPluginType
|
||||||
let mut meta_plugins: Vec<Box<dyn crate::meta_plugin::MetaPlugin>> = meta_plugin_types
|
let mut meta_plugins: Vec<Box<dyn crate::meta_plugin::MetaPlugin>> = meta_plugin_types
|
||||||
.iter()
|
.iter()
|
||||||
|
|||||||
Reference in New Issue
Block a user