From 8f5ec6381f2b85f6523f41134194f80d006d2466 Mon Sep 17 00:00:00 2001 From: Andrew Phillips Date: Tue, 26 Aug 2025 23:47:18 -0300 Subject: [PATCH] fix: update md5 usage and remove unused imports Co-authored-by: aider (openai/andrew/openrouter/deepseek/deepseek-chat-v3.1) --- src/meta_plugin/digest.rs | 10 +++++----- src/services/item_service.rs | 2 +- src/services/meta_service.rs | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/meta_plugin/digest.rs b/src/meta_plugin/digest.rs index 4b086be..98e40d7 100644 --- a/src/meta_plugin/digest.rs +++ b/src/meta_plugin/digest.rs @@ -1,10 +1,10 @@ use sha2::{Digest, Sha256, Sha512}; -use md5::Md5; -use crate::meta_plugin::{MetaPlugin, process_metadata_outputs}; +use md5; +use crate::meta_plugin::MetaPlugin; #[derive(Debug, Clone)] enum Hasher { - Md5(Md5), + Md5(md5::Context), Sha256(Sha256), Sha512(Sha512), } @@ -21,7 +21,7 @@ impl Hasher { fn finalize(&mut self) -> String { match self { Hasher::Md5(hasher) => { - let result = std::mem::replace(hasher, Md5::new()).finalize(); + let result = hasher.clone().compute(); format!("{:x}", result) } Hasher::Sha256(hasher) => { @@ -100,7 +100,7 @@ impl DigestMetaPlugin { if let Some(method_value) = plugin.options.get("method") { if let Some(method_str) = method_value.as_str() { plugin.hasher = match method_str { - "md5" => Some(Hasher::Md5(Md5::new())), + "md5" => Some(Hasher::Md5(md5::Context::new())), "sha256" => Some(Hasher::Sha256(Sha256::new())), "sha512" => Some(Hasher::Sha512(Sha512::new())), _ => None, diff --git a/src/services/item_service.rs b/src/services/item_service.rs index f0b1288..36aafa6 100644 --- a/src/services/item_service.rs +++ b/src/services/item_service.rs @@ -346,7 +346,7 @@ impl ItemService { MetaPluginType::Binary, MetaPluginType::LineCount, MetaPluginType::WordCount, - MetaPluginType::DigestSha256, + MetaPluginType::Digest, MetaPluginType::User, MetaPluginType::Hostname, ]; diff --git a/src/services/meta_service.rs b/src/services/meta_service.rs index 5962d41..097e5d9 100644 --- a/src/services/meta_service.rs +++ b/src/services/meta_service.rs @@ -1,6 +1,6 @@ use crate::config::Settings; use crate::meta_plugin::{get_meta_plugin, MetaPlugin, MetaPluginType}; -use crate::modes::common::{settings_digest_type, settings_meta_plugin_types}; +use crate::modes::common::settings_meta_plugin_types; use clap::Command; use log::debug; use rusqlite::Connection;