feat: add default implementations for initialize, update, finalize in MetaPlugin

Co-authored-by: aider (openai/andrew/openrouter/deepseek/deepseek-chat-v3.1) <aider@aider.chat>
This commit is contained in:
Andrew Phillips
2025-08-26 17:05:44 -03:00
parent 56f3c924b3
commit ec428f5fc4
2 changed files with 66 additions and 32 deletions

View File

@@ -1,6 +1,6 @@
use anyhow::Result; use anyhow::Result;
use rusqlite::Connection;
use log::debug; use log::debug;
use serde::{Deserialize, Serialize};
pub mod program; pub mod program;
pub mod digest; pub mod digest;
@@ -14,6 +14,19 @@ use crate::meta_plugin::system::{CwdMetaPlugin, UidMetaPlugin, UserMetaPlugin, G
use crate::meta_plugin::magic::MagicFileMetaPlugin; use crate::meta_plugin::magic::MagicFileMetaPlugin;
use crate::meta_plugin::binary::BinaryMetaPlugin; use crate::meta_plugin::binary::BinaryMetaPlugin;
/// Represents metadata to be stored
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct MetaData {
pub name: String,
pub value: String,
}
/// Response from meta plugin operations
#[derive(Debug, Default, Clone, Serialize, Deserialize)]
pub struct MetaPluginResponse {
pub metadata: Vec<MetaData>,
}
#[derive(Debug, Eq, PartialEq, Clone, strum::EnumIter, strum::Display, strum::EnumString)] #[derive(Debug, Eq, PartialEq, Clone, strum::EnumIter, strum::Display, strum::EnumString)]
#[strum(ascii_case_insensitive)] #[strum(ascii_case_insensitive)]
pub enum MetaPluginType { pub enum MetaPluginType {
@@ -42,36 +55,30 @@ pub enum MetaPluginType {
/// Central function to handle metadata output with name mapping /// Central function to handle metadata output with name mapping
/// outputs: HashMap where key is internal name, value is either custom name or "false" to disable /// outputs: HashMap where key is internal name, value is either custom name or "false" to disable
pub fn output_metadata(conn: &Connection, item_id: i64, internal_name: &str, value: String, outputs: &std::collections::HashMap<String, serde_yaml::Value>) -> Result<()> { pub fn process_metadata_outputs(internal_name: &str, value: String, outputs: &std::collections::HashMap<String, serde_yaml::Value>) -> Option<MetaData> {
// Check if this output is disabled // Check if this output is disabled
if let Some(mapping) = outputs.get(internal_name) { if let Some(mapping) = outputs.get(internal_name) {
if let Some(false_val) = mapping.as_bool() { if let Some(false_val) = mapping.as_bool() {
if !false_val { if !false_val {
debug!("META: Skipping disabled output: {}", internal_name); debug!("META: Skipping disabled output: {}", internal_name);
return Ok(()); return None;
} }
} }
if let Some(custom_name) = mapping.as_str() { if let Some(custom_name) = mapping.as_str() {
debug!("META: Saving metadata: item_id={}, internal_name={}, custom_name={}, value={}", item_id, internal_name, custom_name, value); debug!("META: Processing metadata: internal_name={}, custom_name={}, value={}", internal_name, custom_name, value);
let meta = crate::db::Meta { return Some(MetaData {
id: item_id,
name: custom_name.to_string(), name: custom_name.to_string(),
value, value,
}; });
crate::db::store_meta(conn, meta)?;
return Ok(());
} }
} }
// Default: use internal name as output name // Default: use internal name as output name
debug!("META: Saving metadata: item_id={}, name={}, value={}", item_id, internal_name, value); debug!("META: Processing metadata: name={}, value={}", internal_name, value);
let meta = crate::db::Meta { Some(MetaData {
id: item_id,
name: internal_name.to_string(), name: internal_name.to_string(),
value, value,
}; })
crate::db::store_meta(conn, meta)?;
Ok(())
} }
pub trait MetaPlugin { pub trait MetaPlugin {
@@ -83,10 +90,16 @@ pub trait MetaPlugin {
false false
} }
fn finalize(&mut self, conn: &Connection) -> Result<()>;
// Update the meta plugin with new data // Update the meta plugin with new data
fn update(&mut self, data: &[u8], conn: &Connection); fn update(&mut self, data: &[u8]) -> MetaPluginResponse {
// Default implementation does nothing
MetaPluginResponse::default()
}
fn finalize(&mut self) -> MetaPluginResponse {
// Default implementation does nothing
MetaPluginResponse::default()
}
fn meta_name(&self) -> String; fn meta_name(&self) -> String;
@@ -95,9 +108,10 @@ pub trait MetaPlugin {
None None
} }
// Initialize with database connection // Initialize the plugin
fn initialize(&mut self, _conn: &Connection, _item_id: i64) -> Result<()> { fn initialize(&mut self) -> MetaPluginResponse {
Ok(()) // Default implementation does nothing
MetaPluginResponse::default()
} }
// Access to outputs mapping // Access to outputs mapping
@@ -120,11 +134,6 @@ pub trait MetaPlugin {
std::collections::HashMap::new() std::collections::HashMap::new()
} }
// Save metadata to database using central output handler
fn save_meta(&mut self, conn: &Connection, item_id: i64, internal_name: &str, value: String) -> Result<()> {
output_metadata(conn, item_id, internal_name, value, self.outputs())
}
// Configure plugin with options (excluding outputs) // Configure plugin with options (excluding outputs)
fn configure_options(&mut self, _options: &std::collections::HashMap<String, serde_yaml::Value>) -> Result<()> { fn configure_options(&mut self, _options: &std::collections::HashMap<String, serde_yaml::Value>) -> Result<()> {
// Default implementation does nothing - plugins can override this // Default implementation does nothing - plugins can override this

View File

@@ -112,9 +112,8 @@ impl MetaService {
} }
for meta_plugin in plugins.iter_mut() { for meta_plugin in plugins.iter_mut() {
if let Err(e) = meta_plugin.initialize(conn, item_id) { let response = meta_plugin.initialize();
log::warn!("META_SERVICE: Failed to initialize meta plugin: {}", e); self.process_plugin_response(conn, item_id, meta_plugin, response);
}
} }
} }
@@ -125,14 +124,40 @@ impl MetaService {
conn: &Connection, conn: &Connection,
) { ) {
for meta_plugin in plugins.iter_mut() { for meta_plugin in plugins.iter_mut() {
meta_plugin.update(chunk, conn); let response = meta_plugin.update(chunk);
self.process_plugin_response(conn, item_id, meta_plugin, response);
} }
} }
pub fn finalize_plugins(&self, plugins: &mut [Box<dyn MetaPlugin>], conn: &Connection) { pub fn finalize_plugins(&self, plugins: &mut [Box<dyn MetaPlugin>], conn: &Connection) {
for meta_plugin in plugins.iter_mut() { for meta_plugin in plugins.iter_mut() {
if let Err(e) = meta_plugin.finalize(conn) { let response = meta_plugin.finalize();
log::warn!("META_SERVICE: Failed to finalize meta plugin: {}", e); self.process_plugin_response(conn, item_id, meta_plugin, response);
}
}
fn process_plugin_response(
&self,
conn: &Connection,
item_id: i64,
plugin: &mut Box<dyn MetaPlugin>,
response: crate::meta_plugin::MetaPluginResponse,
) {
for meta_data in response.metadata {
if let Some(processed_meta) = crate::meta_plugin::process_metadata_outputs(
&meta_data.name,
meta_data.value,
plugin.outputs()
) {
// Save to database
let db_meta = crate::db::Meta {
id: item_id,
name: processed_meta.name,
value: processed_meta.value,
};
if let Err(e) = crate::db::store_meta(conn, db_meta) {
log::warn!("META_SERVICE: Failed to store metadata: {}", e);
}
} }
} }
} }