fix: correct mutable reference handling and remove unused variables
Co-authored-by: aider (openai/andrew/openrouter/qwen/qwen3-coder) <aider@aider.chat>
This commit is contained in:
@@ -7,7 +7,6 @@ use std::io::{Read, Write};
|
|||||||
use std::os::unix::fs::PermissionsExt;
|
use std::os::unix::fs::PermissionsExt;
|
||||||
use std::path::PathBuf;
|
use std::path::PathBuf;
|
||||||
use std::process::{Child, Command, Stdio};
|
use std::process::{Child, Command, Stdio};
|
||||||
use std::sync::Arc;
|
|
||||||
|
|
||||||
use crate::compression_engine::CompressionEngine;
|
use crate::compression_engine::CompressionEngine;
|
||||||
|
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ fn initialize_tags(tags: &mut Vec<String>) {
|
|||||||
|
|
||||||
fn setup_compression_and_plugins(
|
fn setup_compression_and_plugins(
|
||||||
cmd: &mut Command,
|
cmd: &mut Command,
|
||||||
_args: &crate::Args,
|
args: &crate::Args,
|
||||||
) -> (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 = cmd_args_digest_type(cmd, &_args);
|
let digest_type = cmd_args_digest_type(cmd, &_args);
|
||||||
debug!("MAIN: Digest type: {:?}", digest_type);
|
debug!("MAIN: Digest type: {:?}", digest_type);
|
||||||
@@ -120,8 +120,8 @@ fn create_and_log_item(
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn setup_item_metadata(
|
fn setup_item_metadata(
|
||||||
conn: &mut rusqlite::Connection, // Changed to mutable reference
|
conn: &mut rusqlite::Connection,
|
||||||
args: &crate::Args,
|
_args: &crate::Args,
|
||||||
item: &crate::db::Item,
|
item: &crate::db::Item,
|
||||||
tags: &Vec<String>,
|
tags: &Vec<String>,
|
||||||
) -> Result<(), anyhow::Error> {
|
) -> Result<(), anyhow::Error> {
|
||||||
@@ -202,7 +202,7 @@ fn process_input_stream(
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn finalize_meta_plugins(
|
fn finalize_meta_plugins(
|
||||||
conn: &rusqlite::Connection,
|
conn: &mut rusqlite::Connection,
|
||||||
meta_plugins: &mut Vec<Box<dyn crate::meta_plugin::MetaPlugin>>,
|
meta_plugins: &mut Vec<Box<dyn crate::meta_plugin::MetaPlugin>>,
|
||||||
item: &crate::db::Item,
|
item: &crate::db::Item,
|
||||||
) -> Result<(), anyhow::Error> {
|
) -> Result<(), anyhow::Error> {
|
||||||
@@ -240,7 +240,7 @@ pub fn mode_save(
|
|||||||
setup_item_metadata(conn, args, &item, tags)?; // Pass mutable reference
|
setup_item_metadata(conn, args, &item, tags)?; // Pass mutable reference
|
||||||
|
|
||||||
// Use a transaction for database operations to ensure atomicity
|
// Use a transaction for database operations to ensure atomicity
|
||||||
let mut tx = conn.transaction()?;
|
let tx = conn.transaction()?;
|
||||||
|
|
||||||
let item_meta = collect_item_meta(args);
|
let item_meta = collect_item_meta(args);
|
||||||
let item_id = item.id.ok_or_else(|| anyhow!("Item missing ID"))?;
|
let item_id = item.id.ok_or_else(|| anyhow!("Item missing ID"))?;
|
||||||
@@ -264,8 +264,8 @@ pub fn mode_save(
|
|||||||
item.size = processed_item.size;
|
item.size = processed_item.size;
|
||||||
item.compression = compression_type.to_string();
|
item.compression = compression_type.to_string();
|
||||||
|
|
||||||
// Pass the transaction directly (not as mutable reference)
|
// Pass the transaction as mutable reference
|
||||||
finalize_meta_plugins(&tx, &mut meta_plugins, &item)?;
|
finalize_meta_plugins(&mut tx, &mut meta_plugins, &item)?;
|
||||||
crate::db::update_item(&tx, item.clone())?;
|
crate::db::update_item(&tx, item.clone())?;
|
||||||
|
|
||||||
// Commit the transaction
|
// Commit the transaction
|
||||||
|
|||||||
@@ -100,8 +100,8 @@ pub fn mode_update(
|
|||||||
debug!("DIGEST: {}", digest_value);
|
debug!("DIGEST: {}", digest_value);
|
||||||
|
|
||||||
// Save digest to meta using the common function
|
// Save digest to meta using the common function
|
||||||
// Pass the transaction directly instead of calling into_inner()
|
// Pass the transaction as mutable reference
|
||||||
store_item_digest_value(&tx, item.clone(), digest_type, digest_value)?;
|
store_item_digest_value(&mut tx, item.clone(), digest_type, digest_value)?;
|
||||||
} else {
|
} else {
|
||||||
debug!(
|
debug!(
|
||||||
"MAIN: Unable to update digest of item due to missing file {:?}",
|
"MAIN: Unable to update digest of item due to missing file {:?}",
|
||||||
|
|||||||
Reference in New Issue
Block a user