chore: cleanup of lib and toml

src-tauri/Cargo.lock

@@ -56,55 +56,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "anstream"
-version = "0.6.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
-dependencies = [
- "anstyle",
- "anstyle-parse",
- "anstyle-query",
- "anstyle-wincon",
- "colorchoice",
- "is_terminal_polyfill",
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle"
-version = "1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
-
-[[package]]
-name = "anstyle-parse"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
-dependencies = [
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle-query"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
-dependencies = [
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "anstyle-wincon"
-version = "3.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
-dependencies = [
- "anstyle",
- "windows-sys 0.52.0",
-]
-
 [[package]]
 name = "anyhow"
 version = "1.0.89"
@@ -616,12 +567,6 @@ dependencies = [
  "objc",
 ]
 
-[[package]]
-name = "colorchoice"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
-
 [[package]]
 name = "combine"
 version = "4.6.7"
@@ -1004,7 +949,6 @@ name = "drop-app"
 version = "0.1.0"
 dependencies = [
  "directories",
- "env_logger",
  "hex",
  "http",
  "log",
@@ -1119,29 +1063,6 @@ dependencies = [
  "syn 2.0.79",
 ]
 
-[[package]]
-name = "env_filter"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
-dependencies = [
- "log",
- "regex",
-]
-
-[[package]]
-name = "env_logger"
-version = "0.11.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
-dependencies = [
- "anstream",
- "anstyle",
- "env_filter",
- "humantime",
- "log",
-]
-
 [[package]]
 name = "equivalent"
 version = "1.0.1"
@@ -2002,12 +1923,6 @@ dependencies = [
  "once_cell",
 ]
 
-[[package]]
-name = "is_terminal_polyfill"
-version = "1.70.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
-
 [[package]]
 name = "itoa"
 version = "0.4.8"
@@ -4804,12 +4719,6 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
-[[package]]
-name = "utf8parse"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
-
 [[package]]
 name = "uuid"
 version = "1.10.0"

src-tauri/Cargo.toml

@@ -37,18 +37,21 @@ tauri-plugin-deep-link = "2"
 log = "0.4.22"
 hex = "0.4.3"
 tauri-plugin-dialog = "2"
-env_logger = "0.11.5"
 http = "1.1.0"
-tokio = { version = "1.40.0", features = ["rt", "tokio-macros", "signal"] }
 urlencoding = "2.1.3"
 md5 = "0.7.0"
-log4rs = "1.3.0"
+
+[dependencies.tokio]
+version = "1.40.0"
+features = ["rt", "tokio-macros", "signal"]
+
+[dependencies.log4rs]
+version = "1.3.0"
+features = ["console_appender", "file_appender"]
 
 [dependencies.rustix]
 version = "0.38.37"
-features = [
+features = ["fs"]
-    "fs"
-]
 
 [dependencies.uuid]
 version = "1.10.0"
@@ -60,9 +63,7 @@ features = [
 
 [dependencies.openssl]
 version = "0.10.66"
-features = [
+features = ["vendored"]
-    "vendored"
-]
 
 [dependencies.rustbreak]
 version = "2"

src-tauri/src/lib.rs

@@ -13,17 +13,16 @@ use crate::downloads::download_agent::GameDownloadAgent;
 use auth::{auth_initiate, generate_authorization_header, recieve_handshake};
 use db::{add_new_download_dir, DatabaseInterface, DATA_ROOT_DIR};
 use downloads::download_commands::*;
-use env_logger::Env;
 use http::{header::*, response::Builder as ResponseBuilder};
 use library::{fetch_game, fetch_library, Game};
 use log::{info, LevelFilter};
+use log4rs::append::console::ConsoleAppender;
 use log4rs::append::file::FileAppender;
 use log4rs::config::{Appender, Root};
 use log4rs::encode::pattern::PatternEncoder;
 use log4rs::Config;
 use remote::{gen_drop_url, use_remote};
 use serde::{Deserialize, Serialize};
-use std::borrow::Borrow;
 use std::sync::Arc;
 use std::{
     collections::HashMap,
@@ -70,22 +69,27 @@ fn fetch_state(state: tauri::State<'_, Mutex<AppState>>) -> Result<AppState, Str
 }
 
 fn setup() -> AppState {
-
     let logfile = FileAppender::builder()
-    .encoder(Box::new(PatternEncoder::new("{l} - {m}\n")))
+        .encoder(Box::new(PatternEncoder::new("{l} - {m}\n")))
-    .build( DATA_ROOT_DIR.lock().unwrap().join("./drop.log")).unwrap();
+        .build(DATA_ROOT_DIR.lock().unwrap().join("./drop.log"))
+        .unwrap();
+
+    let console = ConsoleAppender::builder()
+        .encoder(Box::new(PatternEncoder::new("{l} - {m}\n")))
+        .build();
 
     let config = Config::builder()
-        .appender(Appender::builder().build("logfile", Box::new(logfile)))
+        .appenders(vec![
-        .build(Root::builder()
+            Appender::builder().build("logfile", Box::new(logfile)),
-               .appender("logfile")
+            Appender::builder().build("console", Box::new(console)),
-               .build(LevelFilter::Info)).unwrap();
+        ])
+        .build(Root::builder().appender("logfile").build(LevelFilter::Info))
+        .unwrap();
 
     log4rs::init_config(config).unwrap();
 
     //env_logger::Builder::from_env(Env::default().default_filter_or("info")).init();
 
-
     let is_set_up = DB.database_is_set_up();
     if !is_set_up {
         return AppState {