johrpan/musicus
1
0
Fork 0
mirror of https://github.com/johrpan/musicus.git synced 2025-10-26 11:47:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Properly reexport backend modules

Browse source
This commit is contained in:
Elias Projahn 2021-02-05 10:56:42 +01:00
parent 54b9fae657
commit 15d78a8b0f
26 changed files with 32 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

3
crates/musicus/src/editors/ensemble.rs
View file

@ -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.

3
crates/musicus/src/editors/instrument.rs
View file

@ -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.

2
crates/musicus/src/editors/performance.rs
View file

@ -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;

3
crates/musicus/src/editors/person.rs
View file

@ -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.

3
crates/musicus/src/editors/recording.rs
View file

@ -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;

3
crates/musicus/src/editors/work.rs
View file

@ -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;

2
crates/musicus/src/editors/work_part.rs
View file

@ -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;

2
crates/musicus/src/editors/work_section.rs
View file

@ -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.

3
crates/musicus/src/import/medium_editor.rs
View file

@ -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;

2
crates/musicus/src/import/track_editor.rs
View file

@ -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;

2
crates/musicus/src/import/track_set_editor.rs
View file

@ -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;

4
crates/musicus/src/preferences/login.rs
View file

@ -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 {

2
crates/musicus/src/preferences/register.rs
View file

@ -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;

2
crates/musicus/src/preferences/server.rs
View file

@ -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);

2
crates/musicus/src/resources.rs
View file

@ -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);

2
crates/musicus/src/screens/ensemble.rs
View file

@ -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;

2
crates/musicus/src/screens/person.rs
View file

@ -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;

3
crates/musicus/src/screens/recording.rs
View file

@ -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;

2
crates/musicus/src/screens/work.rs
View file

@ -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;

2
crates/musicus/src/selectors/ensemble.rs
View file

@ -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.

2
crates/musicus/src/selectors/instrument.rs
View file

@ -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.

2
crates/musicus/src/selectors/person.rs
View file

@ -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.

2
crates/musicus/src/selectors/recording.rs
View file

@ -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.

2
crates/musicus/src/selectors/work.rs
View file

@ -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.

3
crates/musicus/src/widgets/poe_list.rs
View file

@ -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;

9
crates/musicus_backend/src/lib.rs
View file

@ -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::*;