diff --git a/crates/musicus/src/editors/ensemble.rs b/crates/musicus/src/editors/ensemble.rs index 92e19fe..64379ae 100644 --- a/crates/musicus/src/editors/ensemble.rs +++ b/crates/musicus/src/editors/ensemble.rs @@ -4,8 +4,7 @@ use anyhow::Result; use gettextrs::gettext; use glib::clone; use gtk::prelude::*; -use musicus_backend::generate_id; -use musicus_backend::Ensemble; +use musicus_backend::db::{generate_id, Ensemble}; use std::rc::Rc; /// A dialog for creating or editing a ensemble. diff --git a/crates/musicus/src/editors/instrument.rs b/crates/musicus/src/editors/instrument.rs index 4a76273..589e6ef 100644 --- a/crates/musicus/src/editors/instrument.rs +++ b/crates/musicus/src/editors/instrument.rs @@ -4,8 +4,7 @@ use anyhow::Result; use gettextrs::gettext; use glib::clone; use gtk::prelude::*; -use musicus_backend::generate_id; -use musicus_backend::Instrument; +use musicus_backend::db::{generate_id, Instrument}; use std::rc::Rc; /// A dialog for creating or editing a instrument. diff --git a/crates/musicus/src/editors/performance.rs b/crates/musicus/src/editors/performance.rs index 3919830..78a5c08 100644 --- a/crates/musicus/src/editors/performance.rs +++ b/crates/musicus/src/editors/performance.rs @@ -5,7 +5,7 @@ use gettextrs::gettext; use glib::clone; use gtk::prelude::*; use libadwaita::prelude::*; -use musicus_backend::{Performance, Person, Ensemble, Instrument}; +use musicus_backend::db::{Performance, Person, Ensemble, Instrument}; use std::cell::RefCell; use std::rc::Rc; diff --git a/crates/musicus/src/editors/person.rs b/crates/musicus/src/editors/person.rs index cab2a13..3ffdc43 100644 --- a/crates/musicus/src/editors/person.rs +++ b/crates/musicus/src/editors/person.rs @@ -4,8 +4,7 @@ use anyhow::Result; use gettextrs::gettext; use glib::clone; use gtk::prelude::*; -use musicus_backend::generate_id; -use musicus_backend::Person; +use musicus_backend::db::{generate_id, Person}; use std::rc::Rc; /// A dialog for creating or editing a person. diff --git a/crates/musicus/src/editors/recording.rs b/crates/musicus/src/editors/recording.rs index c50cfc9..7bea155 100644 --- a/crates/musicus/src/editors/recording.rs +++ b/crates/musicus/src/editors/recording.rs @@ -8,8 +8,7 @@ use glib::clone; use gtk::prelude::*; use gtk_macros::get_widget; use libadwaita::prelude::*; -use musicus_backend::generate_id; -use musicus_backend::{Performance, Recording, Work}; +use musicus_backend::db::{generate_id, Performance, Recording, Work}; use std::cell::RefCell; use std::rc::Rc; diff --git a/crates/musicus/src/editors/work.rs b/crates/musicus/src/editors/work.rs index 3068770..ce105f5 100644 --- a/crates/musicus/src/editors/work.rs +++ b/crates/musicus/src/editors/work.rs @@ -9,8 +9,7 @@ use glib::clone; use gtk::prelude::*; use gtk_macros::get_widget; use libadwaita::prelude::*; -use musicus_backend::generate_id; -use musicus_backend::{Instrument, Person, Work, WorkPart, WorkSection}; +use musicus_backend::db::{generate_id, Instrument, Person, Work, WorkPart, WorkSection}; use std::cell::RefCell; use std::convert::TryInto; use std::rc::Rc; diff --git a/crates/musicus/src/editors/work_part.rs b/crates/musicus/src/editors/work_part.rs index 2ae7bac..96e0b2b 100644 --- a/crates/musicus/src/editors/work_part.rs +++ b/crates/musicus/src/editors/work_part.rs @@ -6,7 +6,7 @@ use glib::clone; use gtk::prelude::*; use gtk_macros::get_widget; use libadwaita::prelude::*; -use musicus_backend::{Person, WorkPart}; +use musicus_backend::db::{Person, WorkPart}; use std::cell::RefCell; use std::rc::Rc; diff --git a/crates/musicus/src/editors/work_section.rs b/crates/musicus/src/editors/work_section.rs index dd29a16..5f04762 100644 --- a/crates/musicus/src/editors/work_section.rs +++ b/crates/musicus/src/editors/work_section.rs @@ -3,7 +3,7 @@ use crate::widgets::Widget; use glib::clone; use gtk::prelude::*; use gtk_macros::get_widget; -use musicus_backend::WorkSection; +use musicus_backend::db::WorkSection; use std::rc::Rc; /// A dialog for creating or editing a work section. diff --git a/crates/musicus/src/import/medium_editor.rs b/crates/musicus/src/import/medium_editor.rs index 358b5f6..cef745a 100644 --- a/crates/musicus/src/import/medium_editor.rs +++ b/crates/musicus/src/import/medium_editor.rs @@ -8,8 +8,7 @@ use glib::prelude::*; use gtk::prelude::*; use gtk_macros::get_widget; use libadwaita::prelude::*; -use musicus_backend::generate_id; -use musicus_backend::{Medium, Track, TrackSet}; +use musicus_backend::db::{generate_id, Medium, Track, TrackSet}; use std::cell::RefCell; use std::rc::Rc; diff --git a/crates/musicus/src/import/track_editor.rs b/crates/musicus/src/import/track_editor.rs index c3b63cb..d87fee7 100644 --- a/crates/musicus/src/import/track_editor.rs +++ b/crates/musicus/src/import/track_editor.rs @@ -4,7 +4,7 @@ use glib::clone; use gtk::prelude::*; use gtk_macros::get_widget; use libadwaita::prelude::*; -use musicus_backend::Recording; +use musicus_backend::db::Recording; use std::cell::RefCell; use std::rc::Rc; diff --git a/crates/musicus/src/import/track_set_editor.rs b/crates/musicus/src/import/track_set_editor.rs index 23c6023..3c6396c 100644 --- a/crates/musicus/src/import/track_set_editor.rs +++ b/crates/musicus/src/import/track_set_editor.rs @@ -9,7 +9,7 @@ use glib::clone; use gtk::prelude::*; use gtk_macros::get_widget; use libadwaita::prelude::*; -use musicus_backend::Recording; +use musicus_backend::db::Recording; use std::cell::RefCell; use std::rc::Rc; diff --git a/crates/musicus/src/preferences/login.rs b/crates/musicus/src/preferences/login.rs index 51abe50..27551c9 100644 --- a/crates/musicus/src/preferences/login.rs +++ b/crates/musicus/src/preferences/login.rs @@ -5,7 +5,7 @@ use crate::widgets::Widget; use glib::clone; use gtk::prelude::*; use gtk_macros::get_widget; -use musicus_backend::LoginData; +use musicus_backend::client::LoginData; use std::rc::Rc; /// A dialog for entering login credentials. @@ -53,7 +53,7 @@ impl Screen<(), LoginData> for LoginDialog { }; spawn!(@clone this, async move { - this.handle.backend.set_login_data(data.clone()).await.unwrap(); + this.handle.backend.set_login_data(data.clone()).await; if this.handle.backend.cl().login().await.unwrap() { this.handle.pop(Some(data)); } else { diff --git a/crates/musicus/src/preferences/register.rs b/crates/musicus/src/preferences/register.rs index 889c311..e8d204b 100644 --- a/crates/musicus/src/preferences/register.rs +++ b/crates/musicus/src/preferences/register.rs @@ -4,7 +4,7 @@ use glib::clone; use gtk::prelude::*; use gtk_macros::get_widget; use libadwaita::prelude::*; -use musicus_backend::{LoginData, UserRegistration}; +use musicus_backend::client::{LoginData, UserRegistration}; use std::cell::RefCell; use std::rc::Rc; diff --git a/crates/musicus/src/preferences/server.rs b/crates/musicus/src/preferences/server.rs index 2775b97..be3de36 100644 --- a/crates/musicus/src/preferences/server.rs +++ b/crates/musicus/src/preferences/server.rs @@ -41,7 +41,7 @@ impl ServerDialog { set_button.connect_clicked(clone!(@strong this => move |_| { let url = this.url_entry.get_text().unwrap().to_string(); - this.backend.set_server_url(&url).unwrap(); + this.backend.set_server_url(&url); if let Some(cb) = &*this.selected_cb.borrow() { cb(url); diff --git a/crates/musicus/src/resources.rs b/crates/musicus/src/resources.rs index 9629008..a88b177 100644 --- a/crates/musicus/src/resources.rs +++ b/crates/musicus/src/resources.rs @@ -1,7 +1,7 @@ use anyhow::Result; pub fn init() -> Result<()> { - let bytes = glib::Bytes::from(include_bytes!("/home/johrpan/.var/app/org.gnome.Builder/cache/gnome-builder/projects/musicus/builds/de.johrpan.musicus.json-flatpak-org.gnome.Platform-x86_64-master-error-handling/res/musicus.gresource").as_ref()); + let bytes = glib::Bytes::from(include_bytes!("/home/johrpan/.var/app/org.gnome.Builder/cache/gnome-builder/projects/musicus/builds/de.johrpan.musicus.json-flatpak-org.gnome.Platform-x86_64-master-master/res/musicus.gresource").as_ref()); let resource = gio::Resource::from_data(&bytes)?; gio::resources_register(&resource); diff --git a/crates/musicus/src/screens/ensemble.rs b/crates/musicus/src/screens/ensemble.rs index 7081521..91e05f0 100644 --- a/crates/musicus/src/screens/ensemble.rs +++ b/crates/musicus/src/screens/ensemble.rs @@ -7,7 +7,7 @@ use gettextrs::gettext; use glib::clone; use gtk::prelude::*; use libadwaita::prelude::*; -use musicus_backend::{Ensemble, Recording}; +use musicus_backend::db::{Ensemble, Recording}; use std::cell::RefCell; use std::rc::Rc; diff --git a/crates/musicus/src/screens/person.rs b/crates/musicus/src/screens/person.rs index b563a17..73f78e6 100644 --- a/crates/musicus/src/screens/person.rs +++ b/crates/musicus/src/screens/person.rs @@ -7,7 +7,7 @@ use gettextrs::gettext; use glib::clone; use gtk::prelude::*; use libadwaita::prelude::*; -use musicus_backend::{Person, Recording, Work}; +use musicus_backend::db::{Person, Recording, Work}; use std::cell::RefCell; use std::rc::Rc; diff --git a/crates/musicus/src/screens/recording.rs b/crates/musicus/src/screens/recording.rs index 251e046..c87c8ab 100644 --- a/crates/musicus/src/screens/recording.rs +++ b/crates/musicus/src/screens/recording.rs @@ -6,7 +6,8 @@ use gettextrs::gettext; use glib::clone; use gtk::prelude::*; use libadwaita::prelude::*; -use musicus_backend::{PlaylistItem, Recording, TrackSet}; +use musicus_backend::PlaylistItem; +use musicus_backend::db::{Recording, TrackSet}; use std::cell::RefCell; use std::rc::Rc; diff --git a/crates/musicus/src/screens/work.rs b/crates/musicus/src/screens/work.rs index 2dbc97e..059338d 100644 --- a/crates/musicus/src/screens/work.rs +++ b/crates/musicus/src/screens/work.rs @@ -7,7 +7,7 @@ use gettextrs::gettext; use glib::clone; use gtk::prelude::*; use libadwaita::prelude::*; -use musicus_backend::{Work, Recording}; +use musicus_backend::db::{Work, Recording}; use std::cell::RefCell; use std::rc::Rc; diff --git a/crates/musicus/src/selectors/ensemble.rs b/crates/musicus/src/selectors/ensemble.rs index b45ac3e..cb889c3 100644 --- a/crates/musicus/src/selectors/ensemble.rs +++ b/crates/musicus/src/selectors/ensemble.rs @@ -6,7 +6,7 @@ use gettextrs::gettext; use glib::clone; use gtk::prelude::*; use libadwaita::prelude::*; -use musicus_backend::Ensemble; +use musicus_backend::db::Ensemble; use std::rc::Rc; /// A screen for selecting a ensemble. diff --git a/crates/musicus/src/selectors/instrument.rs b/crates/musicus/src/selectors/instrument.rs index 719d137..bc70c62 100644 --- a/crates/musicus/src/selectors/instrument.rs +++ b/crates/musicus/src/selectors/instrument.rs @@ -6,7 +6,7 @@ use gettextrs::gettext; use glib::clone; use gtk::prelude::*; use libadwaita::prelude::*; -use musicus_backend::Instrument; +use musicus_backend::db::Instrument; use std::rc::Rc; /// A screen for selecting a instrument. diff --git a/crates/musicus/src/selectors/person.rs b/crates/musicus/src/selectors/person.rs index 61514d3..d6adb5a 100644 --- a/crates/musicus/src/selectors/person.rs +++ b/crates/musicus/src/selectors/person.rs @@ -6,7 +6,7 @@ use gettextrs::gettext; use glib::clone; use gtk::prelude::*; use libadwaita::prelude::*; -use musicus_backend::Person; +use musicus_backend::db::Person; use std::rc::Rc; /// A screen for selecting a person. diff --git a/crates/musicus/src/selectors/recording.rs b/crates/musicus/src/selectors/recording.rs index 5a27c91..f32b82a 100644 --- a/crates/musicus/src/selectors/recording.rs +++ b/crates/musicus/src/selectors/recording.rs @@ -6,7 +6,7 @@ use gettextrs::gettext; use glib::clone; use gtk::prelude::*; use libadwaita::prelude::*; -use musicus_backend::{Person, Work, Recording}; +use musicus_backend::db::{Person, Work, Recording}; use std::rc::Rc; /// A screen for selecting a recording. diff --git a/crates/musicus/src/selectors/work.rs b/crates/musicus/src/selectors/work.rs index 17d1b9a..3b3cb75 100644 --- a/crates/musicus/src/selectors/work.rs +++ b/crates/musicus/src/selectors/work.rs @@ -6,7 +6,7 @@ use gettextrs::gettext; use glib::clone; use gtk::prelude::*; use libadwaita::prelude::*; -use musicus_backend::{Person, Work}; +use musicus_backend::db::{Person, Work}; use std::rc::Rc; /// A screen for selecting a work. diff --git a/crates/musicus/src/widgets/poe_list.rs b/crates/musicus/src/widgets/poe_list.rs index a7a0e57..87f760f 100644 --- a/crates/musicus/src/widgets/poe_list.rs +++ b/crates/musicus/src/widgets/poe_list.rs @@ -2,7 +2,8 @@ use super::*; use glib::clone; use gtk_macros::get_widget; use libadwaita::prelude::*; -use musicus_backend::{Backend, Person, Ensemble}; +use musicus_backend::Backend; +use musicus_backend::db::{Person, Ensemble}; use std::cell::RefCell; use std::rc::Rc; diff --git a/crates/musicus_backend/src/lib.rs b/crates/musicus_backend/src/lib.rs index 085dc2d..80d2cc8 100644 --- a/crates/musicus_backend/src/lib.rs +++ b/crates/musicus_backend/src/lib.rs @@ -1,19 +1,18 @@ use futures_channel::mpsc; use gio::prelude::*; use log::warn; +use musicus_client::{Client, LoginData}; +use musicus_database::DbThread; use std::cell::RefCell; use std::path::PathBuf; use std::rc::Rc; -pub use musicus_client::*; -pub use musicus_database::*; +pub use musicus_client as client; +pub use musicus_database as db; pub mod error; pub use error::*; -// Override the identically named types from the other crates. -pub use error::{Error, Result}; - pub mod library; pub use library::*;