From 0de47d2c05dada781efe66f427a4c530a00a94d2 Mon Sep 17 00:00:00 2001 From: al Date: Sat, 20 Jan 2024 22:03:26 +0800 Subject: [PATCH] refactor: log --- Cargo.lock | 142 -------------------------------- crates/lcu/Cargo.toml | 3 - crates/lcu/src/builds.rs | 2 +- crates/lcu/src/cmd.rs | 2 +- crates/lcu/src/web.rs | 51 +++++++----- crates/source_gui/Cargo.toml | 4 - crates/source_gui/src/config.rs | 2 +- 7 files changed, 33 insertions(+), 173 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 07b658f4..00e3789b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -745,16 +745,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - [[package]] name = "crossbeam-deque" version = "0.8.3" @@ -1174,15 +1164,6 @@ dependencies = [ "str-buf", ] -[[package]] -name = "euclid" -version = "0.22.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787" -dependencies = [ - "num-traits", -] - [[package]] name = "event-listener" version = "2.5.3" @@ -2000,9 +1981,6 @@ dependencies = [ "serde_with", "tar", "tokio", - "tracing", - "tracing-appender", - "tracing-subscriber", "url", ] @@ -2028,12 +2006,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "libm" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" - [[package]] name = "linux-raw-sys" version = "0.3.7" @@ -2072,37 +2044,6 @@ dependencies = [ "value-bag", ] -[[package]] -name = "lyon_algorithms" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00a0349cd8f0270781bb93a824b63df6178e3b4a27794e7be3ce3763f5a44d6e" -dependencies = [ - "lyon_path", - "num-traits", -] - -[[package]] -name = "lyon_geom" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74df1ff0a0147282eb10699537a03baa7d31972b58984a1d44ce0624043fe8ad" -dependencies = [ - "arrayvec", - "euclid", - "num-traits", -] - -[[package]] -name = "lyon_path" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8358c012e5651e4619cfd0b5b75c0f77866181a01b0909aab4bae14adf660" -dependencies = [ - "lyon_geom", - "num-traits", -] - [[package]] name = "malloc_buf" version = "0.0.6" @@ -2288,16 +2229,6 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi", -] - [[package]] name = "num-integer" version = "0.1.45" @@ -2326,7 +2257,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", - "libm", ] [[package]] @@ -2506,12 +2436,6 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - [[package]] name = "owned_ttf_parser" version = "0.19.0" @@ -3199,15 +3123,6 @@ dependencies = [ "digest", ] -[[package]] -name = "sharded-slab" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" -dependencies = [ - "lazy_static", -] - [[package]] name = "signal-hook" version = "0.3.17" @@ -3344,7 +3259,6 @@ dependencies = [ "kv-log-macro", "lazy_static", "lcu", - "lyon_algorithms", "once_cell", "poll-promise", "rand", @@ -3356,9 +3270,6 @@ dependencies = [ "serde_with", "tokio", "toml 0.7.6", - "tracing", - "tracing-appender", - "tracing-subscriber", "winres", ] @@ -3567,16 +3478,6 @@ dependencies = [ "syn 2.0.48", ] -[[package]] -name = "thread_local" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" -dependencies = [ - "cfg-if", - "once_cell", -] - [[package]] name = "tiff" version = "0.9.0" @@ -3782,17 +3683,6 @@ dependencies = [ "tracing-core", ] -[[package]] -name = "tracing-appender" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e" -dependencies = [ - "crossbeam-channel", - "time", - "tracing-subscriber", -] - [[package]] name = "tracing-attributes" version = "0.1.26" @@ -3811,32 +3701,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" dependencies = [ "once_cell", - "valuable", -] - -[[package]] -name = "tracing-log" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" -dependencies = [ - "lazy_static", - "log", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" -dependencies = [ - "nu-ansi-term", - "sharded-slab", - "smallvec", - "thread_local", - "tracing-core", - "tracing-log", ] [[package]] @@ -3986,12 +3850,6 @@ dependencies = [ "tiny-skia-path", ] -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - [[package]] name = "value-bag" version = "1.6.0" diff --git a/crates/lcu/Cargo.toml b/crates/lcu/Cargo.toml index 345ac619..1d7cc113 100644 --- a/crates/lcu/Cargo.toml +++ b/crates/lcu/Cargo.toml @@ -11,9 +11,6 @@ serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" serde_with = { version = "3.0", features = ["json"] } serde_derive = "1.0" -tracing = "0.1.37" -tracing-subscriber = "0.3.17" -tracing-appender = "0.2.2" regex = "1.8.1" anyhow = "1.0.71" bytes = "*" diff --git a/crates/lcu/src/builds.rs b/crates/lcu/src/builds.rs index 5ac34fed..c6674b08 100644 --- a/crates/lcu/src/builds.rs +++ b/crates/lcu/src/builds.rs @@ -1,5 +1,6 @@ use futures::StreamExt; +use kv_log_macro::info; use serde::{Deserialize, Serialize}; use serde_json::Value; use std::{ @@ -8,7 +9,6 @@ use std::{ path::Path, sync::{Arc, Mutex}, }; -use tracing::info; use crate::web::{self, ChampionsMap, FetchError}; diff --git a/crates/lcu/src/cmd.rs b/crates/lcu/src/cmd.rs index 9bef742b..92379bcf 100644 --- a/crates/lcu/src/cmd.rs +++ b/crates/lcu/src/cmd.rs @@ -4,7 +4,7 @@ use std::str; use std::sync::{Arc, Mutex}; #[allow(unused_imports)] -use tracing::{error, info}; +use kv_log_macro::{error, info}; const APP_PORT_KEY: &str = "--app-port="; const TOKEN_KEY: &str = "--remoting-auth-token="; diff --git a/crates/lcu/src/web.rs b/crates/lcu/src/web.rs index b8289e72..a402b218 100644 --- a/crates/lcu/src/web.rs +++ b/crates/lcu/src/web.rs @@ -1,19 +1,22 @@ -use std::{collections::HashMap, io::{Cursor, self}, path::Path, fs}; +use std::{ + collections::HashMap, + fs, + io::{self, Cursor}, + path::Path, +}; use anyhow::{anyhow, Context}; +use flate2::read::GzDecoder; +use futures::future::join_all; use futures::future::try_join3; +use kv_log_macro::{error, info, warn}; use reqwest::header::USER_AGENT; use serde::{Deserialize, Serialize}; use serde_json::Value; -use tracing::error; -use flate2::read::GzDecoder; use tar::Archive; -use kv_log_macro as log; -use futures::future::join_all; use crate::{ builds::{self, BuildData, ItemBuild}, - constants::VERSION, source::SourceItem, }; @@ -201,7 +204,7 @@ pub async fn fetch_latest_release() -> Result { match client .get("https://api.github.com/repos/cangzhang/champ-r/releases/latest".to_string()) - .header(USER_AGENT, format!("ChampR {VERSION}")) + .header(USER_AGENT, "ChampR_rs") .send() .await { @@ -275,10 +278,10 @@ pub async fn read_local_build_file(file_path: String) -> anyhow::Result { Ok(parsed) } -pub async fn read_from_local_folder(output_dir: &str) -> anyhow::Result>> { - use log::*; - - let paths = std::fs::read_dir(output_dir)? +pub async fn read_from_local_folder( + output_dir: &str, +) -> anyhow::Result>> { + let paths = fs::read_dir(output_dir)? .filter_map(Result::ok) .filter(|entry| { entry.path().is_file() @@ -313,24 +316,28 @@ pub async fn read_from_local_folder(output_dir: &str) -> anyhow::Result, is_tencent: bool) -> anyhow::Result<()> { +pub async fn download_tar_and_apply_for_source( + source: &String, + lol_dir: Option, + is_tencent: bool, +) -> anyhow::Result<()> { let (_version, tar_url) = get_remote_package_data(source).await?; - - log::info!("found download url for {}, {}", &source, &tar_url); + + info!("found download url for {}, {}", &source, &tar_url); let output_dir = format!(".npm/{source}"); let output_path = Path::new(&output_dir); if let Err(err) = fs::create_dir_all(output_path) { - log::error!("create output dir: {:?}", err); + error!("create output dir: {:?}", err); return Err(anyhow!("create output dir: {:?}", err)); } - + download_and_extract_tgz(&tar_url, &output_dir).await?; let dest_folder = format!("{}/package", &output_dir); let files = read_from_local_folder(&dest_folder).await?; - - log::info!("found {} builds for {}", files.len(), source); + + info!("found {} builds for {}", files.len(), source); if lol_dir.is_some() { let dir = lol_dir.unwrap(); @@ -348,13 +355,14 @@ pub async fn download_tar_and_apply_for_source(source: &String, lol_dir: Option< #[cfg(test)] mod tests { use super::*; - + #[tokio::test] async fn apply_builds_for_riot_server() -> anyhow::Result<()> { femme::with_level(femme::LevelFilter::Info); let source = String::from("op.gg"); - download_tar_and_apply_for_source(&source, Some(String::from(".local_builds")), false).await?; + download_tar_and_apply_for_source(&source, Some(String::from(".local_builds")), false) + .await?; Ok(()) } @@ -364,7 +372,8 @@ mod tests { femme::with_level(femme::LevelFilter::Info); let source = String::from("op.gg"); - download_tar_and_apply_for_source(&source, Some(String::from(".local_builds")), true).await?; + download_tar_and_apply_for_source(&source, Some(String::from(".local_builds")), true) + .await?; Ok(()) } diff --git a/crates/source_gui/Cargo.toml b/crates/source_gui/Cargo.toml index 7e5c44ec..2e3b6c16 100644 --- a/crates/source_gui/Cargo.toml +++ b/crates/source_gui/Cargo.toml @@ -22,10 +22,6 @@ image = { version = "0.24.6", default-features = false, features = [ "jpeg", "png", ] } -tracing = "0.1.37" -tracing-subscriber = "0.3.17" -tracing-appender = "0.2.2" -lyon_algorithms = "1" once_cell = "1" toml = "0.7.4" rand = "0.8.5" diff --git a/crates/source_gui/src/config.rs b/crates/source_gui/src/config.rs index 7c1a90bc..c988b49c 100644 --- a/crates/source_gui/src/config.rs +++ b/crates/source_gui/src/config.rs @@ -4,7 +4,7 @@ use std::path::Path; use serde::{Deserialize, Serialize}; use std::fs::File; use std::io::prelude::*; -use tracing::{error, info}; +use kv_log_macro::{error, info}; #[derive(Deserialize, Serialize, Default)] pub struct Config {