From a203059bb4aebccaa848b18d8b07589b1e783f53 Mon Sep 17 00:00:00 2001 From: Andrew Phillips Date: Mon, 25 Aug 2025 14:21:20 -0300 Subject: [PATCH] refactor: rename core module to services Co-authored-by: aider (openai/andrew/openrouter/google/gemini-2.5-pro) --- src/core/async_item_service.rs | 6 +++--- src/core/compression_service.rs | 2 +- src/core/item_service.rs | 8 ++++---- src/lib.rs | 2 +- src/modes/delete.rs | 4 ++-- src/modes/diff.rs | 4 ++-- src/modes/get.rs | 2 +- src/modes/info.rs | 4 ++-- src/modes/list.rs | 4 ++-- src/modes/save.rs | 2 +- src/modes/server/api/item.rs | 4 ++-- src/modes/server/mcp/tools.rs | 4 ++-- 12 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/core/async_item_service.rs b/src/core/async_item_service.rs index aff15de..c9bbae5 100644 --- a/src/core/async_item_service.rs +++ b/src/core/async_item_service.rs @@ -1,6 +1,6 @@ -use crate::core::error::CoreError; -use crate::core::item_service::ItemService; -use crate::core::types::{ItemWithContent, ItemWithMeta}; +use crate::services::error::CoreError; +use crate::services::item_service::ItemService; +use crate::services::types::{ItemWithContent, ItemWithMeta}; use rusqlite::Connection; use std::collections::HashMap; use std::path::PathBuf; diff --git a/src/core/compression_service.rs b/src/core/compression_service.rs index 49f7e05..ac192db 100644 --- a/src/core/compression_service.rs +++ b/src/core/compression_service.rs @@ -1,5 +1,5 @@ use crate::compression_engine::{get_compression_engine, CompressionType}; -use crate::core::error::CoreError; +use crate::services::error::CoreError; use std::io::Read; use std::path::PathBuf; use std::str::FromStr; diff --git a/src/core/item_service.rs b/src/core/item_service.rs index 2d77902..73a24f8 100644 --- a/src/core/item_service.rs +++ b/src/core/item_service.rs @@ -1,8 +1,8 @@ use crate::config::Settings; -use crate::core::compression_service::CompressionService; -use crate::core::error::CoreError; -use crate::core::meta_service::MetaService; -use crate::core::types::{ItemWithContent, ItemWithMeta}; +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::{get_meta_plugin, MetaPlugin, MetaPluginType}; use crate::db::{self, Meta}; use crate::compression_engine::{get_compression_engine, CompressionType}; diff --git a/src/lib.rs b/src/lib.rs index 3d2b6df..72642f0 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -2,7 +2,7 @@ pub mod common; pub mod compression_engine; pub mod config; -pub mod core; +pub mod services; pub mod db; pub mod meta_plugin; pub mod modes; diff --git a/src/modes/delete.rs b/src/modes/delete.rs index 3b33577..35f5049 100644 --- a/src/modes/delete.rs +++ b/src/modes/delete.rs @@ -2,8 +2,8 @@ use anyhow::{anyhow, Result}; use std::path::PathBuf; use crate::config; -use crate::core::error::CoreError; -use crate::core::item_service::ItemService; +use crate::services::error::CoreError; +use crate::services::item_service::ItemService; use clap::error::ErrorKind; use clap::Command; use log::warn; diff --git a/src/modes/diff.rs b/src/modes/diff.rs index d7bd803..aa470a9 100644 --- a/src/modes/diff.rs +++ b/src/modes/diff.rs @@ -22,8 +22,8 @@ fn validate_diff_args(cmd: &mut Command, ids: &Vec, tags: &Vec) { } } -use crate::core::item_service::ItemService; -use crate::core::types::ItemWithMeta; +use crate::services::item_service::ItemService; +use crate::services::types::ItemWithMeta; fn fetch_and_validate_items( conn: &mut rusqlite::Connection, diff --git a/src/modes/get.rs b/src/modes/get.rs index 8102d7a..a4816a6 100644 --- a/src/modes/get.rs +++ b/src/modes/get.rs @@ -3,7 +3,7 @@ use std::io::{Write}; use crate::common::is_binary::is_binary; use crate::config; -use crate::core::item_service::ItemService; +use crate::services::item_service::ItemService; use clap::Command; use is_terminal::IsTerminal; use std::path::PathBuf; diff --git a/src/modes/info.rs b/src/modes/info.rs index a5689c8..a4b8206 100644 --- a/src/modes/info.rs +++ b/src/modes/info.rs @@ -1,5 +1,5 @@ use crate::config; -use crate::core::types::ItemWithMeta; +use crate::services::types::ItemWithMeta; use crate::modes::common::{format_size, OutputFormat}; use anyhow::{anyhow, Result}; use serde_json; @@ -9,7 +9,7 @@ use clap::Command; use clap::error::ErrorKind; use std::path::PathBuf; -use crate::core::item_service::ItemService; +use crate::services::item_service::ItemService; use crate::modes::common::get_format_box_chars_no_border_line_separator; use chrono::prelude::*; use is_terminal::IsTerminal; diff --git a/src/modes/list.rs b/src/modes/list.rs index 2eb678a..c2c12a7 100644 --- a/src/modes/list.rs +++ b/src/modes/list.rs @@ -1,6 +1,6 @@ use crate::config; -use crate::core::item_service::ItemService; -use crate::core::types::ItemWithMeta; +use crate::services::item_service::ItemService; +use crate::services::types::ItemWithMeta; use crate::modes::common::ColumnType; use crate::modes::common::{size_column, string_column, OutputFormat}; use anyhow::{Result}; diff --git a/src/modes/save.rs b/src/modes/save.rs index 361b979..a2252e9 100644 --- a/src/modes/save.rs +++ b/src/modes/save.rs @@ -3,7 +3,7 @@ use clap::Command; use std::io::{Read, Write}; use crate::config; -use crate::core::item_service::ItemService; +use crate::services::item_service::ItemService; fn validate_save_args(cmd: &mut Command, ids: &Vec) { if !ids.is_empty() { diff --git a/src/modes/server/api/item.rs b/src/modes/server/api/item.rs index 13e157a..e675037 100644 --- a/src/modes/server/api/item.rs +++ b/src/modes/server/api/item.rs @@ -8,8 +8,8 @@ use log::warn; use std::collections::HashMap; use anyhow; -use crate::core::async_item_service::AsyncItemService; -use crate::core::error::CoreError; +use crate::services::async_item_service::AsyncItemService; +use crate::services::error::CoreError; use crate::modes::server::common::{AppState, ApiResponse, ItemInfo, ItemContentInfo, TagsQuery, ListItemsQuery, ItemQuery, ItemInfoListResponse, ItemInfoResponse, ItemContentInfoResponse, MetadataResponse}; use crate::common::is_binary::is_binary; diff --git a/src/modes/server/mcp/tools.rs b/src/modes/server/mcp/tools.rs index fddd4b2..e48d918 100644 --- a/src/modes/server/mcp/tools.rs +++ b/src/modes/server/mcp/tools.rs @@ -4,8 +4,8 @@ use std::collections::HashMap; use log::{debug}; use crate::modes::server::common::AppState; -use crate::core::async_item_service::AsyncItemService; -use crate::core::error::CoreError; +use crate::services::async_item_service::AsyncItemService; +use crate::services::error::CoreError; #[derive(Debug, thiserror::Error)] pub enum ToolError {