diff --git a/Cargo.toml b/Cargo.toml index ebf0cff..d994034 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,6 +9,7 @@ edition = "2021" dioxus = "0.5.0" dioxus-free-icons = { version = "0.8", features = ["material-design-icons-navigation", "ionicons"] } dioxus-sdk = { version = "0.5.0", features = ["utils"] } +dioxus-logger = { version = "0.4.1", features = ["timestamps"] } matrix-sdk = { git = "https://github.com/matrix-org/matrix-rust-sdk.git", branch = "main", default-features = false, features = ["js", "rustls-tls"] } @@ -16,12 +17,10 @@ anyhow = "1.0.75" url = "2.5.0" dirs = "5.0.1" ctrlc-async = "3.2.2" -tracing-subscriber = "0.3.18" thiserror = "1.0.50" turf = "0.7.0" tokio = "1.34.0" log = "0.4.20" -tracing = "0.1.40" futures-util = "0.3.29" futures = "0.3.29" rand = "0.8.5" diff --git a/src/base.rs b/src/base.rs index c05e805..a73a78f 100644 --- a/src/base.rs +++ b/src/base.rs @@ -15,7 +15,7 @@ use matrix_sdk::{ ruma::{OwnedRoomId, OwnedUserId}, }; use tokio::select; -use tracing::{debug, error, warn}; +use log::{debug, error, warn}; use crate::ui::components::chats_window::interface::Interface as ChatsWinInterface; diff --git a/src/infrastructure/messaging/matrix/client.rs b/src/infrastructure/messaging/matrix/client.rs index 7056708..2b29526 100644 --- a/src/infrastructure/messaging/matrix/client.rs +++ b/src/infrastructure/messaging/matrix/client.rs @@ -1,11 +1,11 @@ use std::cell::RefCell; use std::sync::Arc; +use log::{debug, error}; use tokio::sync::broadcast; use tokio::sync::broadcast::Sender; use tokio::sync::mpsc::{unbounded_channel, UnboundedReceiver}; use tokio::task::JoinHandle; -use tracing::{debug, error}; use matrix_sdk::{ config::SyncSettings, diff --git a/src/infrastructure/services/random_svg_generators.rs b/src/infrastructure/services/random_svg_generators.rs index 71e0dbb..e0c1c7a 100644 --- a/src/infrastructure/services/random_svg_generators.rs +++ b/src/infrastructure/services/random_svg_generators.rs @@ -3,10 +3,10 @@ use std::fmt; use std::io::Result as IoResult; use std::sync::OnceLock; +use log::error; use rand::distributions::{Alphanumeric, DistString}; use reqwest::Result as RequestResult; use tokio::fs::read_to_string; -use tracing::error; #[derive(Eq, PartialEq, Hash)] pub enum AvatarFeeling { diff --git a/src/main.rs b/src/main.rs index fea131e..630a94f 100644 --- a/src/main.rs +++ b/src/main.rs @@ -9,7 +9,7 @@ use std::time::Duration; use async_std::task; use dioxus::prelude::*; use tokio::time::{sleep, Duration}; -use tracing::{debug, Level}; +use log::{debug, LevelFilter}; use crate::base::{login, sync_rooms}; use crate::base::{APP_SETTINGS, ROOMS, SESSION}; @@ -111,10 +111,7 @@ fn app() -> Element { } fn main() { - tracing_subscriber::fmt() - // .pretty() - .with_max_level(Level::DEBUG) - .init(); launch(app); + dioxus_logger::init(LevelFilter::Info).expect("failed to init logger"); } diff --git a/src/ui/components/chats_window/conversation.rs b/src/ui/components/chats_window/conversation.rs index e7cfd9a..e3c5f31 100644 --- a/src/ui/components/chats_window/conversation.rs +++ b/src/ui/components/chats_window/conversation.rs @@ -1,6 +1,6 @@ use dioxus::prelude::*; +use log::error; use matrix_sdk::ruma::OwnedRoomId; -use tracing::error; use super::edit_section::EditSection; use crate::base::{sync_messages, ROOMS}; diff --git a/src/ui/components/chats_window/mod.rs b/src/ui/components/chats_window/mod.rs index 8de957d..cda94e5 100644 --- a/src/ui/components/chats_window/mod.rs +++ b/src/ui/components/chats_window/mod.rs @@ -8,9 +8,9 @@ use std::cell::RefCell; use std::collections::{HashMap, HashSet}; use dioxus::prelude::*; +use log::{debug, error}; use matrix_sdk::ruma::OwnedRoomId; use tokio::sync::broadcast::Receiver; -use tracing::{debug, error}; use crate::base::{sync_rooms, Room, ROOMS}; use crate::infrastructure::messaging::matrix::requester::Receivers; diff --git a/src/ui/components/chats_window/navbar.rs b/src/ui/components/chats_window/navbar.rs index 605a153..0e5a687 100644 --- a/src/ui/components/chats_window/navbar.rs +++ b/src/ui/components/chats_window/navbar.rs @@ -1,5 +1,5 @@ use dioxus::prelude::*; -use tracing::debug; +use log::debug; turf::style_sheet!("src/ui/components/chats_window/navbar.scss"); diff --git a/src/ui/components/contacts_window/contacts.rs b/src/ui/components/contacts_window/contacts.rs index 7e949df..af1efca 100644 --- a/src/ui/components/contacts_window/contacts.rs +++ b/src/ui/components/contacts_window/contacts.rs @@ -1,7 +1,7 @@ use std::rc::Rc; use dioxus::prelude::*; -use tracing::debug; +use log::debug; use crate::ui::components::contacts_window::contacts_section::{ filter_people_conversations, filter_room_conversations, ContactsSection, diff --git a/src/ui/components/contacts_window/contacts_section.rs b/src/ui/components/contacts_window/contacts_section.rs index a6f5750..c7fe09e 100644 --- a/src/ui/components/contacts_window/contacts_section.rs +++ b/src/ui/components/contacts_window/contacts_section.rs @@ -4,8 +4,8 @@ use std::rc::Rc; use dioxus::prelude::*; use dioxus_free_icons::icons::io_icons::IoChevronDown; use dioxus_free_icons::Icon; +use log::debug; use matrix_sdk::{ruma::OwnedRoomId, RoomState}; -use tracing::debug; use crate::base::{ByIdRooms, Room, CHATS_WIN_INTERFACE, ROOMS}; use crate::ui::components::chats_window::interface::Interface as ChatsWindowInterface; diff --git a/src/ui/components/contacts_window/mod.rs b/src/ui/components/contacts_window/mod.rs index 678eaef..90cd2d5 100644 --- a/src/ui/components/contacts_window/mod.rs +++ b/src/ui/components/contacts_window/mod.rs @@ -3,7 +3,7 @@ mod contacts_section; mod user_infos; use dioxus::prelude::*; -use tracing::debug; +use log::debug; use crate::ui::components::contacts_window::contacts::Contacts; use crate::ui::components::contacts_window::user_infos::UserInfos; diff --git a/src/ui/components/contacts_window/user_infos.rs b/src/ui/components/contacts_window/user_infos.rs index ef3e11d..6698c63 100644 --- a/src/ui/components/contacts_window/user_infos.rs +++ b/src/ui/components/contacts_window/user_infos.rs @@ -1,5 +1,5 @@ use dioxus::prelude::*; -use tracing::debug; +use log::debug; use crate::ui::components::avatar_selector::AvatarSelector; use crate::ui::components::icons::DownArrowIcon; diff --git a/src/ui/components/loading.rs b/src/ui/components/loading.rs index 67b2d86..3663c8c 100644 --- a/src/ui/components/loading.rs +++ b/src/ui/components/loading.rs @@ -1,5 +1,5 @@ use dioxus::prelude::*; -use tracing::debug; +use log::debug; use super::spinner::Spinner; use super::wallpaper::Wallpaper; diff --git a/src/ui/components/login.rs b/src/ui/components/login.rs index c9cac7b..9f84937 100644 --- a/src/ui/components/login.rs +++ b/src/ui/components/login.rs @@ -5,7 +5,7 @@ use std::rc::Rc; use const_format::formatcp; use dioxus::prelude::*; -use tracing::{debug, error, warn}; +use log::{debug, error, warn}; use validator::{Validate, ValidateArgs, ValidateEmail, ValidationError, ValidationErrors}; use zxcvbn::zxcvbn; diff --git a/src/ui/components/main_window.rs b/src/ui/components/main_window.rs index 08f63ca..14b6df8 100644 --- a/src/ui/components/main_window.rs +++ b/src/ui/components/main_window.rs @@ -1,5 +1,5 @@ use dioxus::prelude::*; -use tracing::debug; +use log::debug; use crate::base::SESSION; use crate::ui::components::contacts_window::ContactsWindow;