From 4d3a9fd3ac4c84e969b79375a33769b52cc71a86 Mon Sep 17 00:00:00 2001 From: Andrew Phillips Date: Tue, 12 Aug 2025 16:58:29 -0300 Subject: [PATCH] fix: resolve compilation errors by adding missing imports and fixing schema definitions Co-authored-by: aider (openai/andrew/openrouter/qwen/qwen3-coder) --- src/modes/server/api/item.rs | 1 - src/modes/server/api/mod.rs | 7 +------ src/modes/server/api/status.rs | 1 - src/modes/server/common.rs | 5 +++-- src/modes/server/docs.rs | 4 ++++ src/modes/server/pages.rs | 4 ---- 6 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/modes/server/api/item.rs b/src/modes/server/api/item.rs index 507554a..2497319 100644 --- a/src/modes/server/api/item.rs +++ b/src/modes/server/api/item.rs @@ -11,7 +11,6 @@ use std::path::PathBuf; use std::str::FromStr; use std::io::Read; use anyhow::{Result, anyhow}; -use utoipa::ToSchema; use crate::compression_engine::{CompressionType, get_compression_engine}; use crate::db; diff --git a/src/modes/server/api/mod.rs b/src/modes/server/api/mod.rs index 85810cd..c5e0abc 100644 --- a/src/modes/server/api/mod.rs +++ b/src/modes/server/api/mod.rs @@ -26,12 +26,7 @@ use utoipa_swagger_ui::SwaggerUi; ), components( schemas( - crate::modes::server::common::ApiResponse, - crate::modes::server::common::ApiResponse>, - crate::modes::server::common::ApiResponse, - crate::modes::server::common::ApiResponse>, - crate::modes::server::common::ApiResponse<()>, - crate::modes::server::api::status::StatusInfo, + crate::common::status::StatusInfo, crate::modes::server::common::ItemInfo, ) ), diff --git a/src/modes/server/api/status.rs b/src/modes/server/api/status.rs index aa8eaec..a40de4a 100644 --- a/src/modes/server/api/status.rs +++ b/src/modes/server/api/status.rs @@ -5,7 +5,6 @@ use axum::{ }; use log::warn; use std::net::SocketAddr; -use utoipa::ToSchema; use crate::modes::server::common::{AppState, ApiResponse, check_auth}; use crate::common::status::{generate_status_info, StatusInfo}; diff --git a/src/modes/server/common.rs b/src/modes/server/common.rs index 7fd4ca5..03cf5cf 100644 --- a/src/modes/server/common.rs +++ b/src/modes/server/common.rs @@ -8,6 +8,7 @@ use std::str::FromStr; use std::sync::Arc; use std::time::Instant; use tokio::sync::Mutex; +use utoipa::ToSchema; #[derive(Debug, Clone)] pub struct ServerConfig { @@ -33,14 +34,14 @@ pub struct AppState { pub password: Option, } -#[derive(Serialize, Deserialize)] +#[derive(Serialize, Deserialize, ToSchema)] pub struct ApiResponse { pub success: bool, pub data: Option, pub error: Option, } -#[derive(Serialize, Deserialize)] +#[derive(Serialize, Deserialize, ToSchema)] pub struct ItemInfo { pub id: i64, pub ts: String, diff --git a/src/modes/server/docs.rs b/src/modes/server/docs.rs index 725ec55..0354114 100644 --- a/src/modes/server/docs.rs +++ b/src/modes/server/docs.rs @@ -1,3 +1,7 @@ +use axum::response::Html; +use axum::Router; +use axum::routing::get; +use crate::modes::server::AppState; pub async fn handle_swagger_ui() -> Html<&'static str> { let html = r#" diff --git a/src/modes/server/pages.rs b/src/modes/server/pages.rs index 1fac3d7..c2a7c7a 100644 --- a/src/modes/server/pages.rs +++ b/src/modes/server/pages.rs @@ -1,4 +1,3 @@ -use crate::db::{self, Item, Tag, Meta}; use crate::modes::server::AppState; use anyhow::Result; use axum::{ @@ -7,9 +6,6 @@ use axum::{ }; use rusqlite::Connection; use serde::Deserialize; -use std::collections::HashMap; -use std::sync::Arc; -use tokio::sync::Mutex; #[derive(Deserialize)] pub struct ListQueryParams {