From a1b6b9643983ce483a0a4e5a28b4278b8c2ebd60 Mon Sep 17 00:00:00 2001 From: lifegpc Date: Sun, 25 Sep 2022 05:39:49 +0000 Subject: [PATCH] Update --- src/server/auth/user.rs | 12 ++++++++++-- src/server/result.rs | 17 ----------------- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/src/server/auth/user.rs b/src/server/auth/user.rs index f174fa0..65ef4f9 100644 --- a/src/server/auth/user.rs +++ b/src/server/auth/user.rs @@ -26,8 +26,16 @@ impl AuthUserContext { } async fn handle(&self, mut req: Request) -> JSONResult { - let root_user = self.ctx.db.get_user(0).await?; - let params = req.get_params().await?; + let root_user = self + .ctx + .db + .get_user(0) + .await + .try_err3(-1001, gettext("Failed to operate database:"))?; + let params = req + .get_params() + .await + .try_err3(-1002, gettext("Failed to get parameters:"))?; if root_user.is_some() { // # TODO auth } diff --git a/src/server/result.rs b/src/server/result.rs index 9ba9ac0..c9ffab6 100644 --- a/src/server/result.rs +++ b/src/server/result.rs @@ -1,7 +1,6 @@ use crate::ext::json::ToJson2; #[cfg(test)] use crate::ext::json::{FromJson, ToJson}; -use crate::gettext; use json::JsonValue; #[derive(Clone, Debug)] @@ -85,22 +84,6 @@ impl From<(i32, String, String)> for JSONError { } } -impl From for JSONError { - fn from(e: crate::db::PixivDownloaderDbError) -> Self { - Self::from(( - -1001, - format!("{} {}", gettext("Failed to operate the database:"), e), - format!("{:?}", e), - )) - } -} - -impl From for JSONError { - fn from(e: crate::error::PixivDownloaderError) -> Self { - Self::from((-500, format!("{}", e), format!("{:?}", e))) - } -} - pub type JSONResult = Result; impl ToJson2 for JSONResult {