fix: remove unused imports and resolve config module conflicts
Co-authored-by: aider (openai/andrew/openrouter/anthropic/claude-sonnet-4) <aider@aider.chat>
This commit is contained in:
@@ -5,6 +5,7 @@ use std::io::{Read, Write, IsTerminal};
|
||||
|
||||
// Import the missing functions from common module
|
||||
use crate::modes::common::{settings_digest_type, settings_compression_type, settings_meta_plugin_types};
|
||||
use crate::config;
|
||||
|
||||
fn validate_save_args(cmd: &mut Command, ids: &Vec<i64>) {
|
||||
if !ids.is_empty() {
|
||||
@@ -24,7 +25,7 @@ fn initialize_tags(tags: &mut Vec<String>) {
|
||||
|
||||
fn setup_compression_and_plugins(
|
||||
cmd: &mut Command,
|
||||
settings: &crate::config::Settings,
|
||||
settings: &config::Settings,
|
||||
) -> (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);
|
||||
@@ -78,7 +79,7 @@ fn setup_compression_and_plugins(
|
||||
|
||||
fn create_and_log_item(
|
||||
conn: &mut rusqlite::Connection,
|
||||
settings: &crate::config::Settings,
|
||||
settings: &config::Settings,
|
||||
tags: &Vec<String>,
|
||||
compression_type: &crate::compression_engine::CompressionType,
|
||||
) -> Result<crate::db::Item, anyhow::Error> {
|
||||
@@ -121,7 +122,7 @@ fn create_and_log_item(
|
||||
|
||||
fn setup_item_metadata(
|
||||
conn: &mut rusqlite::Connection,
|
||||
_settings: &crate::config::Settings,
|
||||
_settings: &config::Settings,
|
||||
item: &crate::db::Item,
|
||||
tags: &Vec<String>,
|
||||
) -> Result<(), anyhow::Error> {
|
||||
@@ -129,7 +130,7 @@ fn setup_item_metadata(
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn collect_item_meta(settings: &crate::config::Settings) -> std::collections::HashMap<String, String> {
|
||||
fn collect_item_meta(settings: &config::Settings) -> std::collections::HashMap<String, String> {
|
||||
let mut item_meta: std::collections::HashMap<String, String> = crate::modes::common::get_meta_from_env();
|
||||
|
||||
if let Ok(hostname) = gethostname::gethostname().into_string() {
|
||||
@@ -230,8 +231,8 @@ fn finalize_meta_plugins(
|
||||
|
||||
pub fn mode_save(
|
||||
cmd: &mut Command,
|
||||
settings: &crate::config::Settings,
|
||||
_config: &crate::config::Config,
|
||||
settings: &config::Settings,
|
||||
_config: &config::Config,
|
||||
ids: &mut Vec<i64>,
|
||||
tags: &mut Vec<String>,
|
||||
conn: &mut rusqlite::Connection,
|
||||
|
||||
Reference in New Issue
Block a user