Move database to backend module

src/backend/client/ensembles.rs

@@ -1,5 +1,4 @@
-use super::Backend;
+use crate::backend::{Backend, Ensemble};
-use crate::database::Ensemble;
 use anyhow::Result;
 
 impl Backend {

src/backend/client/instruments.rs

@@ -1,5 +1,4 @@
-use super::Backend;
+use crate::backend::{Backend, Instrument};
-use crate::database::Instrument;
 use anyhow::Result;
 
 impl Backend {

src/backend/client/mediums.rs

@@ -1,5 +1,4 @@
-use super::Backend;
+use crate::backend::{Backend, Medium};
-use crate::database::Medium;
 use anyhow::Result;
 
 impl Backend {

src/backend/client/persons.rs

@@ -1,5 +1,4 @@
-use super::Backend;
+use crate::backend::{Backend, Person};
-use crate::database::Person;
 use anyhow::Result;
 
 impl Backend {

src/backend/client/recordings.rs

@@ -1,5 +1,4 @@
-use super::Backend;
+use crate::backend::{Backend, Recording};
-use crate::database::Recording;
 use anyhow::Result;
 
 impl Backend {

src/backend/client/works.rs

@@ -1,5 +1,4 @@
-use super::Backend;
+use crate::backend::{Backend, Work};
-use crate::database::Work;
 use anyhow::Result;
 
 impl Backend {

src/backend/library.rs

@@ -1,5 +1,4 @@
-use super::{Backend, BackendState};
+use super::{Backend, BackendState, DbThread};
-use crate::database::DbThread;
 use crate::player::Player;
 use anyhow::Result;
 use gio::prelude::*;

src/backend/mod.rs

@@ -1,4 +1,3 @@
-use crate::database::DbThread;
 use crate::player::Player;
 use anyhow::Result;
 use futures_channel::mpsc;
@@ -9,6 +8,9 @@ use std::rc::Rc;
 pub mod client;
 pub use client::*;
 
+pub mod database;
+pub use database::*;
+
 pub mod library;
 pub use library::*;
 

src/editors/ensemble.rs

@@ -1,6 +1,5 @@
-use crate::backend::Backend;
+use crate::backend::generate_id;
-use crate::database::generate_id;
+use crate::backend::{Backend, Ensemble};
-use crate::database::Ensemble;
 use crate::navigator::{NavigationHandle, Screen};
 use crate::widgets::{Editor, EntryRow, Section, UploadSection, Widget};
 use anyhow::Result;

src/editors/instrument.rs

@@ -1,6 +1,5 @@
-use crate::backend::Backend;
+use crate::backend::generate_id;
-use crate::database::generate_id;
+use crate::backend::{Backend, Instrument};
-use crate::database::Instrument;
 use crate::navigator::{NavigationHandle, Screen};
 use crate::widgets::{Editor, EntryRow, Section, UploadSection, Widget};
 use anyhow::Result;

src/editors/performance.rs

@@ -1,5 +1,4 @@
-use crate::backend::Backend;
+use crate::backend::{Backend, Performance, Person, Ensemble, Instrument};
-use crate::database::*;
 use crate::navigator::{NavigationHandle, Screen};
 use crate::selectors::{EnsembleSelector, InstrumentSelector, PersonSelector};
 use crate::widgets::{Editor, Section, ButtonRow, Widget};

src/editors/person.rs

@@ -1,6 +1,5 @@
-use crate::backend::Backend;
+use crate::backend::generate_id;
-use crate::database::generate_id;
+use crate::backend::{Backend, Person};
-use crate::database::Person;
 use crate::navigator::{NavigationHandle, Screen};
 use crate::widgets::{Editor, EntryRow, Section, UploadSection, Widget};
 use anyhow::Result;

src/editors/recording.rs

@@ -1,6 +1,6 @@
 use super::performance::PerformanceEditor;
-use crate::backend::Backend;
+use crate::backend::generate_id;
-use crate::database::*;
+use crate::backend::{Backend, Performance, Person, Recording, Work};
 use crate::selectors::{PersonSelector, WorkSelector};
 use crate::widgets::{List, Widget};
 use crate::navigator::{NavigationHandle, Screen};

src/editors/work.rs

@@ -1,6 +1,7 @@
 use super::work_part::WorkPartEditor;
+use crate::backend::generate_id;
+use crate::backend::{Instrument, Person, Work, WorkPart, WorkSection};
 use super::work_section::WorkSectionEditor;
-use crate::database::*;
 use crate::selectors::{InstrumentSelector, PersonSelector};
 use crate::navigator::{NavigationHandle, Screen};
 use crate::widgets::{List, Widget};

src/editors/work_part.rs

@@ -1,4 +1,4 @@
-use crate::database::*;
+use crate::backend::{Person, WorkPart};
 use crate::selectors::PersonSelector;
 use crate::navigator::{NavigationHandle, Screen};
 use crate::widgets::Widget;

src/editors/work_section.rs

@@ -1,4 +1,4 @@
-use crate::database::*;
+use crate::backend::WorkSection;
 use crate::navigator::{NavigationHandle, Screen};
 use crate::widgets::Widget;
 use glib::clone;

src/import/medium_editor.rs

@@ -1,7 +1,7 @@
 use super::source::Source;
 use super::track_set_editor::{TrackSetData, TrackSetEditor};
-use crate::database::{generate_id, Medium, Track, TrackSet};
+use crate::backend::generate_id;
-use crate::backend::Backend;
+use crate::backend::{Backend, Medium, Track, TrackSet};
 use crate::navigator::{NavigationHandle, Screen};
 use crate::widgets::{List, Widget};
 use anyhow::{anyhow, Result};

src/import/track_editor.rs

@@ -1,4 +1,4 @@
-use crate::database::Recording;
+use crate::backend::Recording;
 use crate::navigator::{NavigationHandle, Screen};
 use crate::widgets::Widget;
 use glib::clone;

src/import/track_set_editor.rs

@@ -1,8 +1,7 @@
 use super::source::Source;
 use super::track_editor::TrackEditor;
 use super::track_selector::TrackSelector;
-use crate::backend::Backend;
+use crate::backend::{Backend, Recording};
-use crate::database::Recording;
 use crate::navigator::{NavigationHandle, Screen};
 use crate::selectors::{PersonSelector, RecordingSelector};
 use crate::widgets::{List, Widget};

src/main.rs

@@ -16,7 +16,6 @@ mod macros;
 
 mod backend;
 mod config;
-mod database;
 mod editors;
 mod import;
 mod navigator;

src/meson.build

@@ -41,18 +41,18 @@ sources = files(
   'backend/client/recordings.rs',
   'backend/client/register.rs',
   'backend/client/works.rs',
+  'backend/database/ensembles.rs',
+  'backend/database/instruments.rs',
+  'backend/database/medium.rs',
+  'backend/database/mod.rs',
+  'backend/database/persons.rs',
+  'backend/database/recordings.rs',
+  'backend/database/schema.rs',
+  'backend/database/thread.rs',
+  'backend/database/works.rs',
   'backend/library.rs',
   'backend/mod.rs',
   'backend/secure.rs',
-  'database/ensembles.rs',
-  'database/instruments.rs',
-  'database/medium.rs',
-  'database/mod.rs',
-  'database/persons.rs',
-  'database/recordings.rs',
-  'database/schema.rs',
-  'database/thread.rs',
-  'database/works.rs',
   'editors/ensemble.rs',
   'editors/instrument.rs',
   'editors/mod.rs',

src/player.rs

@@ -1,4 +1,4 @@
-use crate::database::*;
+use crate::backend::TrackSet;
 use anyhow::anyhow;
 use anyhow::Result;
 use gstreamer_player::prelude::*;

src/screens/ensemble.rs

@@ -1,6 +1,5 @@
 use super::RecordingScreen;
-use crate::backend::Backend;
+use crate::backend::{Backend, Ensemble, Recording};
-use crate::database::{Ensemble, Recording};
 use crate::editors::EnsembleEditor;
 use crate::navigator::{NavigatorWindow, NavigationHandle, Screen};
 use crate::widgets;

src/screens/person.rs

@@ -1,6 +1,5 @@
 use super::{WorkScreen, RecordingScreen};
-use crate::backend::Backend;
+use crate::backend::{Backend, Person, Recording, Work};
-use crate::database::{Person, Recording, Work};
 use crate::editors::PersonEditor;
 use crate::navigator::{NavigatorWindow, NavigationHandle, Screen};
 use crate::widgets;

src/screens/recording.rs

@@ -1,5 +1,4 @@
-use crate::backend::Backend;
+use crate::backend::{Backend, Recording, TrackSet};
-use crate::database::{Recording, TrackSet};
 use crate::editors::RecordingEditor;
 use crate::navigator::{NavigatorWindow, NavigationHandle, Screen};
 use crate::player::PlaylistItem;

src/screens/work.rs

@@ -1,6 +1,5 @@
 use super::RecordingScreen;
-use crate::backend::Backend;
+use crate::backend::{Backend, Work, Recording};
-use crate::database::{Work, Recording};
 use crate::editors::WorkEditor;
 use crate::navigator::{NavigatorWindow, NavigationHandle, Screen};
 use crate::widgets;

src/selectors/ensemble.rs

@@ -1,6 +1,5 @@
 use super::selector::Selector;
-use crate::backend::Backend;
+use crate::backend::{Backend, Ensemble};
-use crate::database::Ensemble;
 use crate::editors::EnsembleEditor;
 use crate::navigator::{NavigationHandle, Screen};
 use crate::widgets::Widget;

src/selectors/instrument.rs

@@ -1,6 +1,5 @@
 use super::selector::Selector;
-use crate::backend::Backend;
+use crate::backend::{Backend, Instrument};
-use crate::database::Instrument;
 use crate::editors::InstrumentEditor;
 use crate::navigator::{NavigationHandle, Screen};
 use crate::widgets::Widget;

src/selectors/person.rs

@@ -1,6 +1,5 @@
 use super::selector::Selector;
-use crate::backend::Backend;
+use crate::backend::{Backend, Person};
-use crate::database::Person;
 use crate::editors::PersonEditor;
 use crate::navigator::{NavigationHandle, Screen};
 use crate::widgets::Widget;

src/selectors/recording.rs

@@ -1,6 +1,5 @@
 use super::selector::Selector;
-use crate::backend::Backend;
+use crate::backend::{Backend, Person, Work, Recording};
-use crate::database::{Person, Work, Recording};
 use crate::editors::{PersonEditor, WorkEditor, RecordingEditor};
 use crate::navigator::{NavigationHandle, Screen};
 use crate::widgets::Widget;

src/selectors/work.rs

@@ -1,6 +1,5 @@
 use super::selector::Selector;
-use crate::backend::Backend;
+use crate::backend::{Backend, Person, Work};
-use crate::database::{Person, Work};
 use crate::editors::{PersonEditor, WorkEditor};
 use crate::navigator::{NavigationHandle, Screen};
 use crate::widgets::Widget;

src/widgets/poe_list.rs

@@ -1,6 +1,5 @@
 use super::*;
-use crate::backend::Backend;
+use crate::backend::{Backend, Person, Ensemble};
-use crate::database::*;
 use glib::clone;
 use gtk::prelude::*;
 use gtk_macros::get_widget;