project: performed code clean up with clippy and changed logger to tracing
This commit is contained in:
parent
67b3931b58
commit
080f9e74e0
4 changed files with 10 additions and 7 deletions
|
|
@ -8,11 +8,15 @@ mod transfer_info;
|
||||||
use crate::cli::args::Args;
|
use crate::cli::args::Args;
|
||||||
use dotenv::dotenv;
|
use dotenv::dotenv;
|
||||||
use tracing::error;
|
use tracing::error;
|
||||||
|
use tracing_subscriber::filter::EnvFilter;
|
||||||
|
|
||||||
#[tokio::main]
|
#[tokio::main]
|
||||||
async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
|
async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
|
||||||
dotenv().ok();
|
dotenv().ok();
|
||||||
env_logger::init();
|
tracing_subscriber::fmt()
|
||||||
|
.with_env_filter(EnvFilter::from_default_env())
|
||||||
|
.init();
|
||||||
|
// env_logger::init();
|
||||||
let args = Args::new();
|
let args = Args::new();
|
||||||
if let Err(e) = args.run().await {
|
if let Err(e) = args.run().await {
|
||||||
error!("{e}");
|
error!("{e}");
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@ pub async fn download_info(relay: &str, name: &str) -> Result<TransferInfoReques
|
||||||
Ok(resp) => {
|
Ok(resp) => {
|
||||||
let json = resp.json::<TransferInfoRequest>().await?;
|
let json = resp.json::<TransferInfoRequest>().await?;
|
||||||
debug!("Json Response: {:#?}", json);
|
debug!("Json Response: {:#?}", json);
|
||||||
if json.message == "error".to_string() {
|
if json.message == *"error" {
|
||||||
Err(Box::new(TransferNotFoundError::new(
|
Err(Box::new(TransferNotFoundError::new(
|
||||||
"no transfer with given name found",
|
"no transfer with given name found",
|
||||||
)))
|
)))
|
||||||
|
|
|
||||||
|
|
@ -144,20 +144,20 @@ async fn download_success(
|
||||||
debug!("Found Transfer by name '{name}'");
|
debug!("Found Transfer by name '{name}'");
|
||||||
data.remove(index);
|
data.remove(index);
|
||||||
debug!("Transfer deleted");
|
debug!("Transfer deleted");
|
||||||
return (
|
(
|
||||||
StatusCode::OK,
|
StatusCode::OK,
|
||||||
Json(json!({
|
Json(json!({
|
||||||
"message": "transfer deleted"
|
"message": "transfer deleted"
|
||||||
})),
|
})),
|
||||||
);
|
)
|
||||||
} else {
|
} else {
|
||||||
warn!("couldn't find transfer-name: {}", name);
|
warn!("couldn't find transfer-name: {}", name);
|
||||||
return (
|
(
|
||||||
StatusCode::NOT_FOUND,
|
StatusCode::NOT_FOUND,
|
||||||
Json(json!({
|
Json(json!({
|
||||||
"message": "transfer not found"
|
"message": "transfer not found"
|
||||||
})),
|
})),
|
||||||
);
|
)
|
||||||
}
|
}
|
||||||
// match data.iter().find(|request| request.body.name == name) {
|
// match data.iter().find(|request| request.body.name == name) {
|
||||||
// Some(request) => {
|
// Some(request) => {
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
use crate::transfer_info::transfer_info::{TransferInfoBody, TransferInfoRequest};
|
|
||||||
use axum::{
|
use axum::{
|
||||||
extract::Json,
|
extract::Json,
|
||||||
http::StatusCode,
|
http::StatusCode,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue