diff options
Diffstat (limited to 'src/main.rs')
| -rw-r--r-- | src/main.rs | 160 |
1 files changed, 150 insertions, 10 deletions
diff --git a/src/main.rs b/src/main.rs index 558c608..27314ae 100644 --- a/src/main.rs +++ b/src/main.rs @@ -2,6 +2,8 @@ use std::borrow::Cow; use std::collections::{HashMap, HashSet}; use std::fmt::Debug; use std::ops::{Deref, DerefMut}; +use std::path::PathBuf; +use std::str::FromStr; use std::sync::Arc; use iced::futures::{SinkExt, Stream, StreamExt}; @@ -30,14 +32,20 @@ use uuid::Uuid; mod login_modal; -#[derive(Serialize, Deserialize)] +#[derive(Serialize, Deserialize, Clone)] pub struct Config { auto_connect: bool, + storage_dir: Option<String>, + dburl: Option<String>, } impl Default for Config { fn default() -> Self { - Self { auto_connect: true } + Self { + auto_connect: true, + storage_dir: None, + dburl: None, + } } } @@ -109,6 +117,42 @@ impl Deref for Client { } } +async fn luz(jid: &JID, creds: &Creds, cfg: &Config) -> (LuzHandle, mpsc::Receiver<UpdateMessage>) { + let luz; + if let Some(ref dburl) = cfg.dburl { + // TODO: have some sort of crash popup for this stuff + let db_path = dburl.strip_prefix("sqlite://").unwrap_or(&dburl); + let db_path = PathBuf::from_str(db_path).expect("invalid database path"); + let db = luz::db::Db::create_connect_and_migrate(db_path) + .await + .unwrap(); + luz = LuzHandle::new(jid.clone(), creds.password.to_string(), db); + } else if let Some(ref dir) = cfg.storage_dir { + let mut data_dir = PathBuf::from_str(&dir).expect("invalid storage directory path"); + data_dir.push(creds.jid.clone()); + data_dir.push(creds.jid.clone()); + data_dir.set_extension("db"); + let db = luz::db::Db::create_connect_and_migrate(data_dir) + .await + .unwrap(); + luz = LuzHandle::new(jid.clone(), creds.password.to_string(), db); + } else { + let mut data_dir = dirs::data_dir() + .expect("operating system does not support retreiving determining default data dir"); + data_dir.push("macaw"); + data_dir.push(creds.jid.clone()); + data_dir.push(creds.jid.clone()); + // TODO: better lol + data_dir.set_extension("db"); + info!("db_path: {:?}", data_dir); + let db = luz::db::Db::create_connect_and_migrate(data_dir) + .await + .unwrap(); + luz = LuzHandle::new(jid.clone(), creds.password.to_string(), db); + } + luz +} + #[tokio::main] async fn main() -> iced::Result { tracing_subscriber::fmt::init(); @@ -154,11 +198,8 @@ async fn main() -> iced::Result { let jid = creds.jid.parse::<JID>(); match jid { Ok(jid) => { - let luz = LuzHandle::new(jid.clone(), creds.password.to_string(), "macaw.db").await; - match luz { - Ok((handle, recv)) => client = Some((jid.as_bare(), handle, recv)), - Err(e) => client_creation_error = Some(Error::ClientCreation(e)), - } + let (handle, updates) = luz(&jid, &creds, &cfg).await; + client = Some((jid, handle, updates)); } Err(e) => client_creation_error = Some(Error::CredentialsLoad(e.into())), } @@ -168,10 +209,43 @@ async fn main() -> iced::Result { let stream = ReceiverStream::new(update_recv); let stream = stream.map(|message| Message::Luz(message)); let task = { + let luz_handle1 = luz_handle.clone(); + let luz_handle2 = luz_handle.clone(); if cfg.auto_connect { - Task::batch([Task::stream(stream), Task::done(Message::Connect)]) + Task::batch([ + Task::perform(async move { luz_handle1.get_roster().await }, |result| { + let roster = result.unwrap(); + let mut macaw_roster = HashMap::new(); + for contact in roster { + macaw_roster.insert(contact.user_jid.clone(), contact); + } + Message::Roster(macaw_roster) + }), + Task::perform(async move { luz_handle2.get_chats().await }, |chats| { + let chats = chats.unwrap(); + info!("got chats: {:?}", chats); + Message::GotChats(chats) + }), + Task::stream(stream), + Task::done(Message::Connect), + ]) } else { - Task::stream(stream) + Task::batch([ + Task::perform(async move { luz_handle1.get_roster().await }, |result| { + let roster = result.unwrap(); + let mut macaw_roster = HashMap::new(); + for contact in roster { + macaw_roster.insert(contact.user_jid.clone(), contact); + } + Message::Roster(macaw_roster) + }), + Task::perform(async move { luz_handle2.get_chats().await }, |chats| { + let chats = chats.unwrap(); + info!("got chats: {:?}", chats); + Message::GotChats(chats) + }), + Task::stream(stream), + ]) } }; iced::application("Macaw", Macaw::update, Macaw::view).run_with(|| { @@ -185,7 +259,6 @@ async fn main() -> iced::Result { }), cfg, ), - // TODO: autoconnect config task, ) }) @@ -345,6 +418,7 @@ impl Macaw { // .into_iter() // .map(|chat| (chat.correspondent.clone(), (chat, IndexMap::new()))) // .collect(); + info!("got chats: {:?}", chats); Message::GotChats(chats) }), Task::done(Message::Connect), @@ -365,6 +439,7 @@ impl Macaw { // .into_iter() // .map(|chat| (chat.correspondent.clone(), (chat, IndexMap::new()))) // .collect(); + info!("got chats: {:?}", chats); Message::GotChats(chats) }), ]) @@ -409,6 +484,71 @@ impl Macaw { let action = login_modal.update(login_modal_message); match action { login_modal::Action::None => Task::none(), + login_modal::Action::CreateClient(jid, password, remember_me) => { + let creds = Creds { jid, password }; + let jid = creds.jid.parse::<JID>(); + let config = self.config.clone(); + match jid { + Ok(jid) => { + Task::perform(async move { + let (jid, creds, config) = (jid, creds, config); + let (handle, recv) = luz(&jid, &creds, &config).await; + (handle, recv, jid, creds, config) + }, move |(handle, recv, jid, creds, config)| { + let creds = creds; + let mut tasks = Vec::new(); + tasks.push(Task::done(crate::Message::ClientCreated( + Client { + client: handle, + jid, + connection_status: Presence::Offline( + Offline::default(), + ), + }, + ))); + let stream = ReceiverStream::new(recv); + let stream = + stream.map(|message| crate::Message::Luz(message)); + tasks.push(Task::stream(stream)); + + if remember_me { + let entry = Entry::new("macaw", "macaw"); + match entry { + Ok(e) => { + let creds = toml::to_string(&creds); + match creds { + Ok(c) => { + let result = e.set_password(&c); + if let Err(e) = result { + tasks.push(Task::done(crate::Message::Error( + crate::Error::CredentialsSave(e.into()), + ))); + } + } + Err(e) => tasks.push(Task::done( + crate::Message::Error( + crate::Error::CredentialsSave( + e.into(), + ), + ), + )), + } + } + Err(e) => { + tasks.push(Task::done(crate::Message::Error( + crate::Error::CredentialsSave(e.into()), + ))) + } + } + } + tasks + }).then(|tasks| Task::batch(tasks)) + } + Err(e) => Task::done(Message::LoginModal( + login_modal::Message::Error(login_modal::Error::InvalidJID), + )), + } + } login_modal::Action::ClientCreated(task) => task, } } |