xiaoxue_admin
/
dbx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

style: 恢复 hook 后 Rust 格式化

This commit is contained in:
Illuminated2020 2026-05-10 21:20:59 +08:00
parent 5b62f936d1
commit feff43c459
8 changed files with 52 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
crates/dbx-cli/src/commands.rs
View File

@ -364,9 +364,7 @@ async fn safe_query(args: &[String]) -> CliEnvelope<serde_json::Value> {
};
let database = option_value(args, "--db").or(config.database.as_deref()).unwrap_or("");
match dbx_core::query::execute_sql_statement_with_row_limit(&state, &config.id, database, sql, None, None, limit)
.await
{
match dbx_core::query::execute_sql_statement_with_row_limit(&state, &config.id, database, sql, None, None, limit).await {
Ok(result) => ok(
CliSource::Headless,
serde_json::json!({
@ -595,19 +593,16 @@ mod tests {
async fn create_large_sqlite_fixture(path: &std::path::Path, row_count: usize) {
std::fs::File::create(path).unwrap();
let pool = dbx_core::db::sqlite::connect_path(&path.display().to_string()).await.unwrap();
dbx_core::db::sqlite::execute_query(
&pool,
"CREATE TABLE numbers (id INTEGER PRIMARY KEY, value TEXT NOT NULL)",
)
.await
.unwrap();
dbx_core::db::sqlite::execute_query(&pool, "CREATE TABLE numbers (id INTEGER PRIMARY KEY, value TEXT NOT NULL)")
.await
.unwrap();
for id in 1..=row_count {
dbx_core::db::sqlite::execute_query(
&pool,
&format!("INSERT INTO numbers (id, value) VALUES ({id}, 'value-{id}')"),
)
.await
.unwrap();
.await
.unwrap();
}
pool.close().await;
}

5
crates/dbx-cli/src/main.rs
View File

@ -4,7 +4,10 @@ mod runtime_client;
#[tokio::main]
async fn main() {
if let Err(err) = commands::run(std::env::args().skip(1).collect()).await {
println!("{}", serde_json::to_string_pretty(&err).unwrap_or_else(|_| "{\"ok\":false}".to_string()));
println!(
"{}",
serde_json::to_string_pretty(&err).unwrap_or_else(|_| "{\"ok\":false}".to_string())
);
std::process::exit(1);
}
}

34
crates/dbx-cli/src/runtime_client.rs
View File

@ -17,7 +17,8 @@ pub fn app_data_dir() -> PathBuf {
return PathBuf::from(path);
}
let home = std::env::var(if cfg!(windows) { "APPDATA" } else { "HOME" }).unwrap_or_else(|_| ".".to_string());
let home = std::env::var(if cfg!(windows) { "APPDATA" } else { "HOME" })
.unwrap_or_else(|_| ".".to_string());
if cfg!(target_os = "macos") {
PathBuf::from(home).join("Library/Application Support/com.dbx.app")
@ -42,30 +43,44 @@ pub async fn get_json(path: &str) -> Result<serde_json::Value, String> {
let runtime = load_runtime().ok_or_else(|| "runtime unavailable".to_string())?;
let url = runtime_url(&runtime, path, &[])?;
let response =
reqwest::Client::new().get(url).bearer_auth(runtime.token).send().await.map_err(|err| err.to_string())?;
let response = reqwest::Client::new()
.get(url)
.bearer_auth(runtime.token)
.send()
.await
.map_err(|err| err.to_string())?;
let status = response.status();
if !status.is_success() {
return Err(format!("runtime request failed with status {status}"));
}
response.json().await.map_err(|err| err.to_string())
response
.json()
.await
.map_err(|err| err.to_string())
}
pub async fn get_json_with_query(path: &str, query: &[(&str, String)]) -> Result<serde_json::Value, String> {
let runtime = load_runtime().ok_or_else(|| "runtime unavailable".to_string())?;
let url = runtime_url(&runtime, path, query)?;
let response =
reqwest::Client::new().get(url).bearer_auth(runtime.token).send().await.map_err(|err| err.to_string())?;
let response = reqwest::Client::new()
.get(url)
.bearer_auth(runtime.token)
.send()
.await
.map_err(|err| err.to_string())?;
let status = response.status();
if !status.is_success() {
return Err(format!("runtime request failed with status {status}"));
}
response.json().await.map_err(|err| err.to_string())
response
.json()
.await
.map_err(|err| err.to_string())
}
pub async fn post_json(path: &str, body: serde_json::Value) -> Result<serde_json::Value, String> {
@ -85,7 +100,10 @@ pub async fn post_json(path: &str, body: serde_json::Value) -> Result<serde_json
return Err(format!("runtime request failed with status {status}"));
}
response.json().await.map_err(|err| err.to_string())
response
.json()
.await
.map_err(|err| err.to_string())
}
fn runtime_url(runtime: &RuntimeDiscovery, path: &str, query: &[(&str, String)]) -> Result<reqwest::Url, String> {

8
crates/dbx-core/src/cli.rs
View File

@ -116,12 +116,8 @@ where
let source = source.ok_or_else(|| de::Error::missing_field("source"))?;
match (ok, has_data, has_error) {
(true, true, false) => {
Ok(CliEnvelope::Success { ok, source, data: data.expect("data presence was checked") })
}
(false, false, true) => {
Ok(CliEnvelope::Failure { ok, source, error: error.expect("error presence was checked") })
}
(true, true, false) => Ok(CliEnvelope::Success { ok, source, data: data.expect("data presence was checked") }),
(false, false, true) => Ok(CliEnvelope::Failure { ok, source, error: error.expect("error presence was checked") }),
(true, _, _) => Err(de::Error::custom("ok=true requires data without error")),
(false, _, _) => Err(de::Error::custom("ok=false requires error without data")),
}

6
crates/dbx-core/src/db/sqlite.rs
View File

@ -165,11 +165,7 @@ pub async fn execute_query(pool: &SqlitePool, sql: &str) -> Result<QueryResult,
execute_query_with_row_limit(pool, sql, crate::query::MAX_ROWS).await
}
pub async fn execute_query_with_row_limit(
pool: &SqlitePool,
sql: &str,
row_limit: usize,
) -> Result<QueryResult, String> {
pub async fn execute_query_with_row_limit(pool: &SqlitePool, sql: &str, row_limit: usize) -> Result<QueryResult, String> {
let start = Instant::now();
let row_limit = row_limit.max(1);

15
crates/dbx-core/src/storage.rs
View File

@ -144,11 +144,10 @@ async fn ensure_history_columns(pool: &SqlitePool) -> Result<(), String> {
}
async fn ensure_handoffs_sequence(pool: &SqlitePool) -> Result<(), String> {
let (seq_columns,): (i64,) =
sqlx::query_as("SELECT COUNT(*) FROM pragma_table_info('handoffs') WHERE name = 'seq'")
.fetch_one(pool)
.await
.map_err(|e| e.to_string())?;
let (seq_columns,): (i64,) = sqlx::query_as("SELECT COUNT(*) FROM pragma_table_info('handoffs') WHERE name = 'seq'")
.fetch_one(pool)
.await
.map_err(|e| e.to_string())?;
if seq_columns > 0 {
return Ok(());
@ -1058,8 +1057,10 @@ mod handoff_tests {
async fn handoffs_table_has_stable_autoincrement_sequence() {
let storage = open_temp_storage().await;
let columns: Vec<(String,)> =
sqlx::query_as("SELECT name FROM pragma_table_info('handoffs')").fetch_all(&storage.db).await.unwrap();
let columns: Vec<(String,)> = sqlx::query_as("SELECT name FROM pragma_table_info('handoffs')")
.fetch_all(&storage.db)
.await
.unwrap();
assert!(columns.iter().any(|(name,)| name == "seq"));
}

5
src-tauri/src/commands/agent_runtime.rs
View File

@ -306,7 +306,10 @@ async fn route_request(first_line: &str, body: &str, state: &AgentRuntimeState)
if let Some(limit) = query_limit(first_line) {
truncate_result_rows(&mut body, limit);
}
return RuntimeResponse { status: "200 OK", body };
return RuntimeResponse {
status: "200 OK",
body,
};
}
if first_line.starts_with("POST /handoff ") {

2
src-tauri/src/commands/mod.rs
View File

@ -1,5 +1,5 @@
pub mod agent_runtime;
pub mod ai;
pub mod agent_runtime;
pub mod connection;
#[allow(dead_code, unused_imports)]
mod connection_secrets;