diff --git a/src/meta_plugin/mod.rs b/src/meta_plugin/mod.rs index ed5eff0..f04b1bc 100644 --- a/src/meta_plugin/mod.rs +++ b/src/meta_plugin/mod.rs @@ -96,7 +96,7 @@ impl MetaPlugin for BaseMetaPlugin { fn meta_type(&self) -> MetaPluginType { // This is a base implementation, so we need to return something // This might not be used, but we need to satisfy the trait - MetaPluginType::Binary + MetaPluginType::Text } fn outputs(&self) -> &std::collections::HashMap { diff --git a/src/modes/server.rs b/src/modes/server.rs index 449ca4c..afa7fc9 100644 --- a/src/modes/server.rs +++ b/src/modes/server.rs @@ -61,7 +61,8 @@ pub fn mode_server( // Take ownership of the connection and move it into the async runtime let owned_conn = std::mem::replace(conn, rusqlite::Connection::open_in_memory()?); let cmd = cmd.clone(); - rt.block_on(run_server(server_config, owned_conn, data_path, item_service, cmd)) + let settings = settings.clone(); + rt.block_on(run_server(server_config, owned_conn, data_path, item_service, cmd, settings)) } async fn run_server( @@ -70,6 +71,7 @@ async fn run_server( data_dir: PathBuf, item_service: ItemService, cmd: Command, + settings: config::Settings, ) -> Result<()> { // Construct address with port let bind_address = if let Some(port) = config.port { diff --git a/src/modes/server/common.rs b/src/modes/server/common.rs index aad494a..e457616 100644 --- a/src/modes/server/common.rs +++ b/src/modes/server/common.rs @@ -16,7 +16,6 @@ use std::time::Instant; use tokio::sync::Mutex; use utoipa::ToSchema; use crate::services::item_service::ItemService; -use clap::Command; #[derive(Debug, Clone)] pub struct ServerConfig { diff --git a/src/services/item_service.rs b/src/services/item_service.rs index c40f8f5..b04be56 100644 --- a/src/services/item_service.rs +++ b/src/services/item_service.rs @@ -4,7 +4,7 @@ use crate::services::compression_service::CompressionService; use crate::services::error::CoreError; use crate::services::meta_service::MetaService; use crate::services::types::{ItemWithContent, ItemWithMeta}; -use crate::meta_plugin::{MetaPlugin, MetaPluginType}; +use crate::meta_plugin::MetaPluginType; use crate::db::{self, Meta}; use crate::compression_engine::{get_compression_engine, CompressionType}; use crate::modes::common::settings_compression_type;