From 0ffe68e04f09aadc920dcc030591d1b84ff60341 Mon Sep 17 00:00:00 2001
From: Elias Projahn <johrpan@gmail.com>
Date: Sun, 7 Feb 2021 12:53:25 +0100
Subject: [PATCH] Move crates to toplevel directory

---
 Cargo.toml                                                | 2 +-
 {crates/musicus_backend => backend}/Cargo.toml            | 4 ++--
 {crates/musicus_backend => backend}/src/error.rs          | 0
 {crates/musicus_backend => backend}/src/lib.rs            | 0
 {crates/musicus_backend => backend}/src/library.rs        | 0
 {crates/musicus_backend => backend}/src/player.rs         | 0
 {crates/musicus_backend => backend}/src/secure.rs         | 0
 {crates/musicus_client => client}/Cargo.toml              | 2 +-
 {crates/musicus_client => client}/src/ensembles.rs        | 0
 {crates/musicus_client => client}/src/error.rs            | 0
 {crates/musicus_client => client}/src/instruments.rs      | 0
 {crates/musicus_client => client}/src/lib.rs              | 0
 {crates/musicus_client => client}/src/mediums.rs          | 0
 {crates/musicus_client => client}/src/persons.rs          | 0
 {crates/musicus_client => client}/src/recordings.rs       | 0
 {crates/musicus_client => client}/src/register.rs         | 0
 {crates/musicus_client => client}/src/works.rs            | 0
 crates/musicus/src/config.rs                              | 2 --
 database/.gitignore                                       | 1 +
 {crates/musicus_database => database}/Cargo.toml          | 1 -
 {crates/musicus_database => database}/diesel.toml         | 0
 .../migrations/2020-09-27-201047_initial_schema/down.sql  | 0
 .../migrations/2020-09-27-201047_initial_schema/up.sql    | 0
 {crates/musicus_database => database}/src/ensembles.rs    | 0
 {crates/musicus_database => database}/src/error.rs        | 0
 {crates/musicus_database => database}/src/instruments.rs  | 0
 {crates/musicus_database => database}/src/lib.rs          | 0
 {crates/musicus_database => database}/src/medium.rs       | 0
 {crates/musicus_database => database}/src/persons.rs      | 0
 {crates/musicus_database => database}/src/recordings.rs   | 0
 {crates/musicus_database => database}/src/schema.rs       | 0
 {crates/musicus_database => database}/src/thread.rs       | 0
 {crates/musicus_database => database}/src/works.rs        | 0
 meson.build                                               | 8 ++++----
 musicus/.gitignore                                        | 2 ++
 {crates/musicus => musicus}/Cargo.toml                    | 2 +-
 .../data/de.johrpan.musicus.desktop.in                    | 0
 .../data/de.johrpan.musicus.gschema.xml                   | 0
 .../icons/hicolor/scalable/apps/de.johrpan.musicus.svg    | 0
 .../hicolor/symbolic/apps/de.johrpan.musicus-symbolic.svg | 0
 {crates/musicus => musicus}/data/meson.build              | 0
 {crates/musicus => musicus}/po/LINGUAS                    | 0
 {crates/musicus => musicus}/po/POTFILES.in                | 0
 {crates/musicus => musicus}/po/de.po                      | 0
 {crates/musicus => musicus}/po/meson.build                | 0
 {crates/musicus => musicus}/po/musicus.pot                | 0
 {crates/musicus => musicus}/res/meson.build               | 0
 {crates/musicus => musicus}/res/musicus.gresource.xml     | 0
 {crates/musicus => musicus}/res/ui/editor.ui              | 0
 {crates/musicus => musicus}/res/ui/login_dialog.ui        | 0
 {crates/musicus => musicus}/res/ui/main_screen.ui         | 0
 {crates/musicus => musicus}/res/ui/medium_editor.ui       | 0
 {crates/musicus => musicus}/res/ui/performance_editor.ui  | 0
 {crates/musicus => musicus}/res/ui/player_bar.ui          | 0
 {crates/musicus => musicus}/res/ui/player_screen.ui       | 0
 {crates/musicus => musicus}/res/ui/preferences.ui         | 0
 {crates/musicus => musicus}/res/ui/recording_editor.ui    | 0
 {crates/musicus => musicus}/res/ui/register_dialog.ui     | 0
 {crates/musicus => musicus}/res/ui/screen.ui              | 0
 {crates/musicus => musicus}/res/ui/section.ui             | 0
 {crates/musicus => musicus}/res/ui/selector.ui            | 0
 {crates/musicus => musicus}/res/ui/server_dialog.ui       | 0
 {crates/musicus => musicus}/res/ui/source_selector.ui     | 0
 {crates/musicus => musicus}/res/ui/track_editor.ui        | 0
 {crates/musicus => musicus}/res/ui/track_selector.ui      | 0
 {crates/musicus => musicus}/res/ui/track_set_editor.ui    | 0
 {crates/musicus => musicus}/res/ui/work_editor.ui         | 0
 {crates/musicus => musicus}/res/ui/work_part_editor.ui    | 0
 {crates/musicus => musicus}/res/ui/work_section_editor.ui | 0
 musicus/src/config.rs                                     | 2 ++
 {crates/musicus => musicus}/src/config.rs.in              | 0
 {crates/musicus => musicus}/src/editors/ensemble.rs       | 0
 {crates/musicus => musicus}/src/editors/instrument.rs     | 0
 {crates/musicus => musicus}/src/editors/mod.rs            | 0
 {crates/musicus => musicus}/src/editors/performance.rs    | 0
 {crates/musicus => musicus}/src/editors/person.rs         | 0
 {crates/musicus => musicus}/src/editors/recording.rs      | 0
 {crates/musicus => musicus}/src/editors/work.rs           | 0
 {crates/musicus => musicus}/src/editors/work_part.rs      | 0
 {crates/musicus => musicus}/src/editors/work_section.rs   | 0
 {crates/musicus => musicus}/src/import/disc_source.rs     | 0
 {crates/musicus => musicus}/src/import/folder_source.rs   | 0
 {crates/musicus => musicus}/src/import/medium_editor.rs   | 0
 {crates/musicus => musicus}/src/import/mod.rs             | 0
 {crates/musicus => musicus}/src/import/source.rs          | 0
 {crates/musicus => musicus}/src/import/source_selector.rs | 0
 {crates/musicus => musicus}/src/import/track_editor.rs    | 0
 {crates/musicus => musicus}/src/import/track_selector.rs  | 0
 .../musicus => musicus}/src/import/track_set_editor.rs    | 0
 {crates/musicus => musicus}/src/macros.rs                 | 0
 {crates/musicus => musicus}/src/main.rs                   | 0
 {crates/musicus => musicus}/src/meson.build               | 0
 {crates/musicus => musicus}/src/navigator/mod.rs          | 0
 {crates/musicus => musicus}/src/navigator/window.rs       | 0
 {crates/musicus => musicus}/src/preferences/login.rs      | 0
 {crates/musicus => musicus}/src/preferences/mod.rs        | 0
 {crates/musicus => musicus}/src/preferences/register.rs   | 0
 {crates/musicus => musicus}/src/preferences/server.rs     | 0
 {crates/musicus => musicus}/src/resources.rs              | 2 +-
 {crates/musicus => musicus}/src/resources.rs.in           | 0
 {crates/musicus => musicus}/src/screens/ensemble.rs       | 0
 {crates/musicus => musicus}/src/screens/main.rs           | 0
 {crates/musicus => musicus}/src/screens/medium.rs         | 0
 {crates/musicus => musicus}/src/screens/mod.rs            | 0
 {crates/musicus => musicus}/src/screens/person.rs         | 0
 {crates/musicus => musicus}/src/screens/player.rs         | 0
 {crates/musicus => musicus}/src/screens/recording.rs      | 0
 {crates/musicus => musicus}/src/screens/welcome.rs        | 0
 {crates/musicus => musicus}/src/screens/work.rs           | 0
 {crates/musicus => musicus}/src/selectors/ensemble.rs     | 0
 {crates/musicus => musicus}/src/selectors/instrument.rs   | 0
 {crates/musicus => musicus}/src/selectors/mod.rs          | 0
 {crates/musicus => musicus}/src/selectors/person.rs       | 0
 {crates/musicus => musicus}/src/selectors/recording.rs    | 0
 {crates/musicus => musicus}/src/selectors/selector.rs     | 0
 {crates/musicus => musicus}/src/selectors/work.rs         | 0
 {crates/musicus => musicus}/src/widgets/button_row.rs     | 0
 {crates/musicus => musicus}/src/widgets/editor.rs         | 0
 {crates/musicus => musicus}/src/widgets/entry_row.rs      | 0
 .../musicus => musicus}/src/widgets/indexed_list_model.rs | 0
 {crates/musicus => musicus}/src/widgets/list.rs           | 0
 {crates/musicus => musicus}/src/widgets/mod.rs            | 0
 {crates/musicus => musicus}/src/widgets/player_bar.rs     | 0
 {crates/musicus => musicus}/src/widgets/screen.rs         | 0
 {crates/musicus => musicus}/src/widgets/section.rs        | 0
 {crates/musicus => musicus}/src/widgets/upload_section.rs | 0
 {crates/musicus => musicus}/src/window.rs                 | 0
 127 files changed, 15 insertions(+), 13 deletions(-)
 rename {crates/musicus_backend => backend}/Cargo.toml (69%)
 rename {crates/musicus_backend => backend}/src/error.rs (100%)
 rename {crates/musicus_backend => backend}/src/lib.rs (100%)
 rename {crates/musicus_backend => backend}/src/library.rs (100%)
 rename {crates/musicus_backend => backend}/src/player.rs (100%)
 rename {crates/musicus_backend => backend}/src/secure.rs (100%)
 rename {crates/musicus_client => client}/Cargo.toml (73%)
 rename {crates/musicus_client => client}/src/ensembles.rs (100%)
 rename {crates/musicus_client => client}/src/error.rs (100%)
 rename {crates/musicus_client => client}/src/instruments.rs (100%)
 rename {crates/musicus_client => client}/src/lib.rs (100%)
 rename {crates/musicus_client => client}/src/mediums.rs (100%)
 rename {crates/musicus_client => client}/src/persons.rs (100%)
 rename {crates/musicus_client => client}/src/recordings.rs (100%)
 rename {crates/musicus_client => client}/src/register.rs (100%)
 rename {crates/musicus_client => client}/src/works.rs (100%)
 delete mode 100644 crates/musicus/src/config.rs
 create mode 100644 database/.gitignore
 rename {crates/musicus_database => database}/Cargo.toml (94%)
 rename {crates/musicus_database => database}/diesel.toml (100%)
 rename {crates/musicus_database => database}/migrations/2020-09-27-201047_initial_schema/down.sql (100%)
 rename {crates/musicus_database => database}/migrations/2020-09-27-201047_initial_schema/up.sql (100%)
 rename {crates/musicus_database => database}/src/ensembles.rs (100%)
 rename {crates/musicus_database => database}/src/error.rs (100%)
 rename {crates/musicus_database => database}/src/instruments.rs (100%)
 rename {crates/musicus_database => database}/src/lib.rs (100%)
 rename {crates/musicus_database => database}/src/medium.rs (100%)
 rename {crates/musicus_database => database}/src/persons.rs (100%)
 rename {crates/musicus_database => database}/src/recordings.rs (100%)
 rename {crates/musicus_database => database}/src/schema.rs (100%)
 rename {crates/musicus_database => database}/src/thread.rs (100%)
 rename {crates/musicus_database => database}/src/works.rs (100%)
 create mode 100644 musicus/.gitignore
 rename {crates/musicus => musicus}/Cargo.toml (91%)
 rename {crates/musicus => musicus}/data/de.johrpan.musicus.desktop.in (100%)
 rename {crates/musicus => musicus}/data/de.johrpan.musicus.gschema.xml (100%)
 rename {crates/musicus => musicus}/data/icons/hicolor/scalable/apps/de.johrpan.musicus.svg (100%)
 rename {crates/musicus => musicus}/data/icons/hicolor/symbolic/apps/de.johrpan.musicus-symbolic.svg (100%)
 rename {crates/musicus => musicus}/data/meson.build (100%)
 rename {crates/musicus => musicus}/po/LINGUAS (100%)
 rename {crates/musicus => musicus}/po/POTFILES.in (100%)
 rename {crates/musicus => musicus}/po/de.po (100%)
 rename {crates/musicus => musicus}/po/meson.build (100%)
 rename {crates/musicus => musicus}/po/musicus.pot (100%)
 rename {crates/musicus => musicus}/res/meson.build (100%)
 rename {crates/musicus => musicus}/res/musicus.gresource.xml (100%)
 rename {crates/musicus => musicus}/res/ui/editor.ui (100%)
 rename {crates/musicus => musicus}/res/ui/login_dialog.ui (100%)
 rename {crates/musicus => musicus}/res/ui/main_screen.ui (100%)
 rename {crates/musicus => musicus}/res/ui/medium_editor.ui (100%)
 rename {crates/musicus => musicus}/res/ui/performance_editor.ui (100%)
 rename {crates/musicus => musicus}/res/ui/player_bar.ui (100%)
 rename {crates/musicus => musicus}/res/ui/player_screen.ui (100%)
 rename {crates/musicus => musicus}/res/ui/preferences.ui (100%)
 rename {crates/musicus => musicus}/res/ui/recording_editor.ui (100%)
 rename {crates/musicus => musicus}/res/ui/register_dialog.ui (100%)
 rename {crates/musicus => musicus}/res/ui/screen.ui (100%)
 rename {crates/musicus => musicus}/res/ui/section.ui (100%)
 rename {crates/musicus => musicus}/res/ui/selector.ui (100%)
 rename {crates/musicus => musicus}/res/ui/server_dialog.ui (100%)
 rename {crates/musicus => musicus}/res/ui/source_selector.ui (100%)
 rename {crates/musicus => musicus}/res/ui/track_editor.ui (100%)
 rename {crates/musicus => musicus}/res/ui/track_selector.ui (100%)
 rename {crates/musicus => musicus}/res/ui/track_set_editor.ui (100%)
 rename {crates/musicus => musicus}/res/ui/work_editor.ui (100%)
 rename {crates/musicus => musicus}/res/ui/work_part_editor.ui (100%)
 rename {crates/musicus => musicus}/res/ui/work_section_editor.ui (100%)
 create mode 100644 musicus/src/config.rs
 rename {crates/musicus => musicus}/src/config.rs.in (100%)
 rename {crates/musicus => musicus}/src/editors/ensemble.rs (100%)
 rename {crates/musicus => musicus}/src/editors/instrument.rs (100%)
 rename {crates/musicus => musicus}/src/editors/mod.rs (100%)
 rename {crates/musicus => musicus}/src/editors/performance.rs (100%)
 rename {crates/musicus => musicus}/src/editors/person.rs (100%)
 rename {crates/musicus => musicus}/src/editors/recording.rs (100%)
 rename {crates/musicus => musicus}/src/editors/work.rs (100%)
 rename {crates/musicus => musicus}/src/editors/work_part.rs (100%)
 rename {crates/musicus => musicus}/src/editors/work_section.rs (100%)
 rename {crates/musicus => musicus}/src/import/disc_source.rs (100%)
 rename {crates/musicus => musicus}/src/import/folder_source.rs (100%)
 rename {crates/musicus => musicus}/src/import/medium_editor.rs (100%)
 rename {crates/musicus => musicus}/src/import/mod.rs (100%)
 rename {crates/musicus => musicus}/src/import/source.rs (100%)
 rename {crates/musicus => musicus}/src/import/source_selector.rs (100%)
 rename {crates/musicus => musicus}/src/import/track_editor.rs (100%)
 rename {crates/musicus => musicus}/src/import/track_selector.rs (100%)
 rename {crates/musicus => musicus}/src/import/track_set_editor.rs (100%)
 rename {crates/musicus => musicus}/src/macros.rs (100%)
 rename {crates/musicus => musicus}/src/main.rs (100%)
 rename {crates/musicus => musicus}/src/meson.build (100%)
 rename {crates/musicus => musicus}/src/navigator/mod.rs (100%)
 rename {crates/musicus => musicus}/src/navigator/window.rs (100%)
 rename {crates/musicus => musicus}/src/preferences/login.rs (100%)
 rename {crates/musicus => musicus}/src/preferences/mod.rs (100%)
 rename {crates/musicus => musicus}/src/preferences/register.rs (100%)
 rename {crates/musicus => musicus}/src/preferences/server.rs (100%)
 rename {crates/musicus => musicus}/src/resources.rs (53%)
 rename {crates/musicus => musicus}/src/resources.rs.in (100%)
 rename {crates/musicus => musicus}/src/screens/ensemble.rs (100%)
 rename {crates/musicus => musicus}/src/screens/main.rs (100%)
 rename {crates/musicus => musicus}/src/screens/medium.rs (100%)
 rename {crates/musicus => musicus}/src/screens/mod.rs (100%)
 rename {crates/musicus => musicus}/src/screens/person.rs (100%)
 rename {crates/musicus => musicus}/src/screens/player.rs (100%)
 rename {crates/musicus => musicus}/src/screens/recording.rs (100%)
 rename {crates/musicus => musicus}/src/screens/welcome.rs (100%)
 rename {crates/musicus => musicus}/src/screens/work.rs (100%)
 rename {crates/musicus => musicus}/src/selectors/ensemble.rs (100%)
 rename {crates/musicus => musicus}/src/selectors/instrument.rs (100%)
 rename {crates/musicus => musicus}/src/selectors/mod.rs (100%)
 rename {crates/musicus => musicus}/src/selectors/person.rs (100%)
 rename {crates/musicus => musicus}/src/selectors/recording.rs (100%)
 rename {crates/musicus => musicus}/src/selectors/selector.rs (100%)
 rename {crates/musicus => musicus}/src/selectors/work.rs (100%)
 rename {crates/musicus => musicus}/src/widgets/button_row.rs (100%)
 rename {crates/musicus => musicus}/src/widgets/editor.rs (100%)
 rename {crates/musicus => musicus}/src/widgets/entry_row.rs (100%)
 rename {crates/musicus => musicus}/src/widgets/indexed_list_model.rs (100%)
 rename {crates/musicus => musicus}/src/widgets/list.rs (100%)
 rename {crates/musicus => musicus}/src/widgets/mod.rs (100%)
 rename {crates/musicus => musicus}/src/widgets/player_bar.rs (100%)
 rename {crates/musicus => musicus}/src/widgets/screen.rs (100%)
 rename {crates/musicus => musicus}/src/widgets/section.rs (100%)
 rename {crates/musicus => musicus}/src/widgets/upload_section.rs (100%)
 rename {crates/musicus => musicus}/src/window.rs (100%)

diff --git a/Cargo.toml b/Cargo.toml
index c66a4d7..fe476d4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,2 +1,2 @@
 [workspace]
-members = ["crates/*"]
+members = ["backend", "client", "database", "musicus"]
diff --git a/crates/musicus_backend/Cargo.toml b/backend/Cargo.toml
similarity index 69%
rename from crates/musicus_backend/Cargo.toml
rename to backend/Cargo.toml
index 4f24d8c..30fca64 100644
--- a/crates/musicus_backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -13,8 +13,8 @@ gstreamer = "0.16.4"
 gstreamer-player = "0.16.3"
 log = "0.4.14"
 mpris-player = "0.6.0"
-musicus_client = { version = "0.1.0", path = "../musicus_client" }
-musicus_database = { version = "0.1.0", path = "../musicus_database" }
+musicus_client = { version = "0.1.0", path = "../client" }
+musicus_database = { version = "0.1.0", path = "../database" }
 secret-service = "2.0.1"
 thiserror = "1.0.23"
 
diff --git a/crates/musicus_backend/src/error.rs b/backend/src/error.rs
similarity index 100%
rename from crates/musicus_backend/src/error.rs
rename to backend/src/error.rs
diff --git a/crates/musicus_backend/src/lib.rs b/backend/src/lib.rs
similarity index 100%
rename from crates/musicus_backend/src/lib.rs
rename to backend/src/lib.rs
diff --git a/crates/musicus_backend/src/library.rs b/backend/src/library.rs
similarity index 100%
rename from crates/musicus_backend/src/library.rs
rename to backend/src/library.rs
diff --git a/crates/musicus_backend/src/player.rs b/backend/src/player.rs
similarity index 100%
rename from crates/musicus_backend/src/player.rs
rename to backend/src/player.rs
diff --git a/crates/musicus_backend/src/secure.rs b/backend/src/secure.rs
similarity index 100%
rename from crates/musicus_backend/src/secure.rs
rename to backend/src/secure.rs
diff --git a/crates/musicus_client/Cargo.toml b/client/Cargo.toml
similarity index 73%
rename from crates/musicus_client/Cargo.toml
rename to client/Cargo.toml
index 62a2521..bb552db 100644
--- a/crates/musicus_client/Cargo.toml
+++ b/client/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2018"
 
 [dependencies]
 isahc = "1.1.0"
-musicus_database = { version = "0.1.0", path = "../musicus_database" }
+musicus_database = { version = "0.1.0", path = "../database" }
 serde = { version = "1.0.117", features = ["derive"] }
 serde_json = "1.0.59"
 thiserror = "1.0.23"
diff --git a/crates/musicus_client/src/ensembles.rs b/client/src/ensembles.rs
similarity index 100%
rename from crates/musicus_client/src/ensembles.rs
rename to client/src/ensembles.rs
diff --git a/crates/musicus_client/src/error.rs b/client/src/error.rs
similarity index 100%
rename from crates/musicus_client/src/error.rs
rename to client/src/error.rs
diff --git a/crates/musicus_client/src/instruments.rs b/client/src/instruments.rs
similarity index 100%
rename from crates/musicus_client/src/instruments.rs
rename to client/src/instruments.rs
diff --git a/crates/musicus_client/src/lib.rs b/client/src/lib.rs
similarity index 100%
rename from crates/musicus_client/src/lib.rs
rename to client/src/lib.rs
diff --git a/crates/musicus_client/src/mediums.rs b/client/src/mediums.rs
similarity index 100%
rename from crates/musicus_client/src/mediums.rs
rename to client/src/mediums.rs
diff --git a/crates/musicus_client/src/persons.rs b/client/src/persons.rs
similarity index 100%
rename from crates/musicus_client/src/persons.rs
rename to client/src/persons.rs
diff --git a/crates/musicus_client/src/recordings.rs b/client/src/recordings.rs
similarity index 100%
rename from crates/musicus_client/src/recordings.rs
rename to client/src/recordings.rs
diff --git a/crates/musicus_client/src/register.rs b/client/src/register.rs
similarity index 100%
rename from crates/musicus_client/src/register.rs
rename to client/src/register.rs
diff --git a/crates/musicus_client/src/works.rs b/client/src/works.rs
similarity index 100%
rename from crates/musicus_client/src/works.rs
rename to client/src/works.rs
diff --git a/crates/musicus/src/config.rs b/crates/musicus/src/config.rs
deleted file mode 100644
index 3c866b8..0000000
--- a/crates/musicus/src/config.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub static VERSION: &str = "0.1.0";
-pub static LOCALEDIR: &str = "/app/share/locale";
\ No newline at end of file
diff --git a/database/.gitignore b/database/.gitignore
new file mode 100644
index 0000000..141236d
--- /dev/null
+++ b/database/.gitignore
@@ -0,0 +1 @@
+test.sqlite
diff --git a/crates/musicus_database/Cargo.toml b/database/Cargo.toml
similarity index 94%
rename from crates/musicus_database/Cargo.toml
rename to database/Cargo.toml
index 7a246a4..dc68abb 100644
--- a/crates/musicus_database/Cargo.toml
+++ b/database/Cargo.toml
@@ -2,7 +2,6 @@
 name = "musicus_database"
 version = "0.1.0"
 edition = "2018"
-workspace = "../.."
 
 [dependencies]
 diesel = { version = "1.4.5", features = ["sqlite"] }
diff --git a/crates/musicus_database/diesel.toml b/database/diesel.toml
similarity index 100%
rename from crates/musicus_database/diesel.toml
rename to database/diesel.toml
diff --git a/crates/musicus_database/migrations/2020-09-27-201047_initial_schema/down.sql b/database/migrations/2020-09-27-201047_initial_schema/down.sql
similarity index 100%
rename from crates/musicus_database/migrations/2020-09-27-201047_initial_schema/down.sql
rename to database/migrations/2020-09-27-201047_initial_schema/down.sql
diff --git a/crates/musicus_database/migrations/2020-09-27-201047_initial_schema/up.sql b/database/migrations/2020-09-27-201047_initial_schema/up.sql
similarity index 100%
rename from crates/musicus_database/migrations/2020-09-27-201047_initial_schema/up.sql
rename to database/migrations/2020-09-27-201047_initial_schema/up.sql
diff --git a/crates/musicus_database/src/ensembles.rs b/database/src/ensembles.rs
similarity index 100%
rename from crates/musicus_database/src/ensembles.rs
rename to database/src/ensembles.rs
diff --git a/crates/musicus_database/src/error.rs b/database/src/error.rs
similarity index 100%
rename from crates/musicus_database/src/error.rs
rename to database/src/error.rs
diff --git a/crates/musicus_database/src/instruments.rs b/database/src/instruments.rs
similarity index 100%
rename from crates/musicus_database/src/instruments.rs
rename to database/src/instruments.rs
diff --git a/crates/musicus_database/src/lib.rs b/database/src/lib.rs
similarity index 100%
rename from crates/musicus_database/src/lib.rs
rename to database/src/lib.rs
diff --git a/crates/musicus_database/src/medium.rs b/database/src/medium.rs
similarity index 100%
rename from crates/musicus_database/src/medium.rs
rename to database/src/medium.rs
diff --git a/crates/musicus_database/src/persons.rs b/database/src/persons.rs
similarity index 100%
rename from crates/musicus_database/src/persons.rs
rename to database/src/persons.rs
diff --git a/crates/musicus_database/src/recordings.rs b/database/src/recordings.rs
similarity index 100%
rename from crates/musicus_database/src/recordings.rs
rename to database/src/recordings.rs
diff --git a/crates/musicus_database/src/schema.rs b/database/src/schema.rs
similarity index 100%
rename from crates/musicus_database/src/schema.rs
rename to database/src/schema.rs
diff --git a/crates/musicus_database/src/thread.rs b/database/src/thread.rs
similarity index 100%
rename from crates/musicus_database/src/thread.rs
rename to database/src/thread.rs
diff --git a/crates/musicus_database/src/works.rs b/database/src/works.rs
similarity index 100%
rename from crates/musicus_database/src/works.rs
rename to database/src/works.rs
diff --git a/meson.build b/meson.build
index baf3618..29956d2 100644
--- a/meson.build
+++ b/meson.build
@@ -16,9 +16,9 @@ dependency('sqlite3', version: '>= 3.20')
 
 i18n = import('i18n')
 
-subdir('crates/musicus/data')
-subdir('crates/musicus/po')
-subdir('crates/musicus/res')
-subdir('crates/musicus/src')
+subdir('musicus/data')
+subdir('musicus/po')
+subdir('musicus/res')
+subdir('musicus/src')
 
 meson.add_install_script('build-aux/postinstall.py')
diff --git a/musicus/.gitignore b/musicus/.gitignore
new file mode 100644
index 0000000..bbc2957
--- /dev/null
+++ b/musicus/.gitignore
@@ -0,0 +1,2 @@
+/src/config.rs
+/src/resources.rs
diff --git a/crates/musicus/Cargo.toml b/musicus/Cargo.toml
similarity index 91%
rename from crates/musicus/Cargo.toml
rename to musicus/Cargo.toml
index 36df77e..29583c5 100644
--- a/crates/musicus/Cargo.toml
+++ b/musicus/Cargo.toml
@@ -11,7 +11,7 @@ futures-channel = "0.3.5"
 gettext-rs = "0.5.0"
 gstreamer = "0.16.4"
 gtk-macros = "0.2.0"
-musicus_backend = { version = "0.1.0", path = "../musicus_backend" }
+musicus_backend = { version = "0.1.0", path = "../backend" }
 once_cell = "1.5.2"
 rand = "0.7.3"
 
diff --git a/crates/musicus/data/de.johrpan.musicus.desktop.in b/musicus/data/de.johrpan.musicus.desktop.in
similarity index 100%
rename from crates/musicus/data/de.johrpan.musicus.desktop.in
rename to musicus/data/de.johrpan.musicus.desktop.in
diff --git a/crates/musicus/data/de.johrpan.musicus.gschema.xml b/musicus/data/de.johrpan.musicus.gschema.xml
similarity index 100%
rename from crates/musicus/data/de.johrpan.musicus.gschema.xml
rename to musicus/data/de.johrpan.musicus.gschema.xml
diff --git a/crates/musicus/data/icons/hicolor/scalable/apps/de.johrpan.musicus.svg b/musicus/data/icons/hicolor/scalable/apps/de.johrpan.musicus.svg
similarity index 100%
rename from crates/musicus/data/icons/hicolor/scalable/apps/de.johrpan.musicus.svg
rename to musicus/data/icons/hicolor/scalable/apps/de.johrpan.musicus.svg
diff --git a/crates/musicus/data/icons/hicolor/symbolic/apps/de.johrpan.musicus-symbolic.svg b/musicus/data/icons/hicolor/symbolic/apps/de.johrpan.musicus-symbolic.svg
similarity index 100%
rename from crates/musicus/data/icons/hicolor/symbolic/apps/de.johrpan.musicus-symbolic.svg
rename to musicus/data/icons/hicolor/symbolic/apps/de.johrpan.musicus-symbolic.svg
diff --git a/crates/musicus/data/meson.build b/musicus/data/meson.build
similarity index 100%
rename from crates/musicus/data/meson.build
rename to musicus/data/meson.build
diff --git a/crates/musicus/po/LINGUAS b/musicus/po/LINGUAS
similarity index 100%
rename from crates/musicus/po/LINGUAS
rename to musicus/po/LINGUAS
diff --git a/crates/musicus/po/POTFILES.in b/musicus/po/POTFILES.in
similarity index 100%
rename from crates/musicus/po/POTFILES.in
rename to musicus/po/POTFILES.in
diff --git a/crates/musicus/po/de.po b/musicus/po/de.po
similarity index 100%
rename from crates/musicus/po/de.po
rename to musicus/po/de.po
diff --git a/crates/musicus/po/meson.build b/musicus/po/meson.build
similarity index 100%
rename from crates/musicus/po/meson.build
rename to musicus/po/meson.build
diff --git a/crates/musicus/po/musicus.pot b/musicus/po/musicus.pot
similarity index 100%
rename from crates/musicus/po/musicus.pot
rename to musicus/po/musicus.pot
diff --git a/crates/musicus/res/meson.build b/musicus/res/meson.build
similarity index 100%
rename from crates/musicus/res/meson.build
rename to musicus/res/meson.build
diff --git a/crates/musicus/res/musicus.gresource.xml b/musicus/res/musicus.gresource.xml
similarity index 100%
rename from crates/musicus/res/musicus.gresource.xml
rename to musicus/res/musicus.gresource.xml
diff --git a/crates/musicus/res/ui/editor.ui b/musicus/res/ui/editor.ui
similarity index 100%
rename from crates/musicus/res/ui/editor.ui
rename to musicus/res/ui/editor.ui
diff --git a/crates/musicus/res/ui/login_dialog.ui b/musicus/res/ui/login_dialog.ui
similarity index 100%
rename from crates/musicus/res/ui/login_dialog.ui
rename to musicus/res/ui/login_dialog.ui
diff --git a/crates/musicus/res/ui/main_screen.ui b/musicus/res/ui/main_screen.ui
similarity index 100%
rename from crates/musicus/res/ui/main_screen.ui
rename to musicus/res/ui/main_screen.ui
diff --git a/crates/musicus/res/ui/medium_editor.ui b/musicus/res/ui/medium_editor.ui
similarity index 100%
rename from crates/musicus/res/ui/medium_editor.ui
rename to musicus/res/ui/medium_editor.ui
diff --git a/crates/musicus/res/ui/performance_editor.ui b/musicus/res/ui/performance_editor.ui
similarity index 100%
rename from crates/musicus/res/ui/performance_editor.ui
rename to musicus/res/ui/performance_editor.ui
diff --git a/crates/musicus/res/ui/player_bar.ui b/musicus/res/ui/player_bar.ui
similarity index 100%
rename from crates/musicus/res/ui/player_bar.ui
rename to musicus/res/ui/player_bar.ui
diff --git a/crates/musicus/res/ui/player_screen.ui b/musicus/res/ui/player_screen.ui
similarity index 100%
rename from crates/musicus/res/ui/player_screen.ui
rename to musicus/res/ui/player_screen.ui
diff --git a/crates/musicus/res/ui/preferences.ui b/musicus/res/ui/preferences.ui
similarity index 100%
rename from crates/musicus/res/ui/preferences.ui
rename to musicus/res/ui/preferences.ui
diff --git a/crates/musicus/res/ui/recording_editor.ui b/musicus/res/ui/recording_editor.ui
similarity index 100%
rename from crates/musicus/res/ui/recording_editor.ui
rename to musicus/res/ui/recording_editor.ui
diff --git a/crates/musicus/res/ui/register_dialog.ui b/musicus/res/ui/register_dialog.ui
similarity index 100%
rename from crates/musicus/res/ui/register_dialog.ui
rename to musicus/res/ui/register_dialog.ui
diff --git a/crates/musicus/res/ui/screen.ui b/musicus/res/ui/screen.ui
similarity index 100%
rename from crates/musicus/res/ui/screen.ui
rename to musicus/res/ui/screen.ui
diff --git a/crates/musicus/res/ui/section.ui b/musicus/res/ui/section.ui
similarity index 100%
rename from crates/musicus/res/ui/section.ui
rename to musicus/res/ui/section.ui
diff --git a/crates/musicus/res/ui/selector.ui b/musicus/res/ui/selector.ui
similarity index 100%
rename from crates/musicus/res/ui/selector.ui
rename to musicus/res/ui/selector.ui
diff --git a/crates/musicus/res/ui/server_dialog.ui b/musicus/res/ui/server_dialog.ui
similarity index 100%
rename from crates/musicus/res/ui/server_dialog.ui
rename to musicus/res/ui/server_dialog.ui
diff --git a/crates/musicus/res/ui/source_selector.ui b/musicus/res/ui/source_selector.ui
similarity index 100%
rename from crates/musicus/res/ui/source_selector.ui
rename to musicus/res/ui/source_selector.ui
diff --git a/crates/musicus/res/ui/track_editor.ui b/musicus/res/ui/track_editor.ui
similarity index 100%
rename from crates/musicus/res/ui/track_editor.ui
rename to musicus/res/ui/track_editor.ui
diff --git a/crates/musicus/res/ui/track_selector.ui b/musicus/res/ui/track_selector.ui
similarity index 100%
rename from crates/musicus/res/ui/track_selector.ui
rename to musicus/res/ui/track_selector.ui
diff --git a/crates/musicus/res/ui/track_set_editor.ui b/musicus/res/ui/track_set_editor.ui
similarity index 100%
rename from crates/musicus/res/ui/track_set_editor.ui
rename to musicus/res/ui/track_set_editor.ui
diff --git a/crates/musicus/res/ui/work_editor.ui b/musicus/res/ui/work_editor.ui
similarity index 100%
rename from crates/musicus/res/ui/work_editor.ui
rename to musicus/res/ui/work_editor.ui
diff --git a/crates/musicus/res/ui/work_part_editor.ui b/musicus/res/ui/work_part_editor.ui
similarity index 100%
rename from crates/musicus/res/ui/work_part_editor.ui
rename to musicus/res/ui/work_part_editor.ui
diff --git a/crates/musicus/res/ui/work_section_editor.ui b/musicus/res/ui/work_section_editor.ui
similarity index 100%
rename from crates/musicus/res/ui/work_section_editor.ui
rename to musicus/res/ui/work_section_editor.ui
diff --git a/musicus/src/config.rs b/musicus/src/config.rs
new file mode 100644
index 0000000..02d37e4
--- /dev/null
+++ b/musicus/src/config.rs
@@ -0,0 +1,2 @@
+pub static VERSION: &str = "0.1.0";
+pub static LOCALEDIR: &str = "/usr/local/share/locale";
\ No newline at end of file
diff --git a/crates/musicus/src/config.rs.in b/musicus/src/config.rs.in
similarity index 100%
rename from crates/musicus/src/config.rs.in
rename to musicus/src/config.rs.in
diff --git a/crates/musicus/src/editors/ensemble.rs b/musicus/src/editors/ensemble.rs
similarity index 100%
rename from crates/musicus/src/editors/ensemble.rs
rename to musicus/src/editors/ensemble.rs
diff --git a/crates/musicus/src/editors/instrument.rs b/musicus/src/editors/instrument.rs
similarity index 100%
rename from crates/musicus/src/editors/instrument.rs
rename to musicus/src/editors/instrument.rs
diff --git a/crates/musicus/src/editors/mod.rs b/musicus/src/editors/mod.rs
similarity index 100%
rename from crates/musicus/src/editors/mod.rs
rename to musicus/src/editors/mod.rs
diff --git a/crates/musicus/src/editors/performance.rs b/musicus/src/editors/performance.rs
similarity index 100%
rename from crates/musicus/src/editors/performance.rs
rename to musicus/src/editors/performance.rs
diff --git a/crates/musicus/src/editors/person.rs b/musicus/src/editors/person.rs
similarity index 100%
rename from crates/musicus/src/editors/person.rs
rename to musicus/src/editors/person.rs
diff --git a/crates/musicus/src/editors/recording.rs b/musicus/src/editors/recording.rs
similarity index 100%
rename from crates/musicus/src/editors/recording.rs
rename to musicus/src/editors/recording.rs
diff --git a/crates/musicus/src/editors/work.rs b/musicus/src/editors/work.rs
similarity index 100%
rename from crates/musicus/src/editors/work.rs
rename to musicus/src/editors/work.rs
diff --git a/crates/musicus/src/editors/work_part.rs b/musicus/src/editors/work_part.rs
similarity index 100%
rename from crates/musicus/src/editors/work_part.rs
rename to musicus/src/editors/work_part.rs
diff --git a/crates/musicus/src/editors/work_section.rs b/musicus/src/editors/work_section.rs
similarity index 100%
rename from crates/musicus/src/editors/work_section.rs
rename to musicus/src/editors/work_section.rs
diff --git a/crates/musicus/src/import/disc_source.rs b/musicus/src/import/disc_source.rs
similarity index 100%
rename from crates/musicus/src/import/disc_source.rs
rename to musicus/src/import/disc_source.rs
diff --git a/crates/musicus/src/import/folder_source.rs b/musicus/src/import/folder_source.rs
similarity index 100%
rename from crates/musicus/src/import/folder_source.rs
rename to musicus/src/import/folder_source.rs
diff --git a/crates/musicus/src/import/medium_editor.rs b/musicus/src/import/medium_editor.rs
similarity index 100%
rename from crates/musicus/src/import/medium_editor.rs
rename to musicus/src/import/medium_editor.rs
diff --git a/crates/musicus/src/import/mod.rs b/musicus/src/import/mod.rs
similarity index 100%
rename from crates/musicus/src/import/mod.rs
rename to musicus/src/import/mod.rs
diff --git a/crates/musicus/src/import/source.rs b/musicus/src/import/source.rs
similarity index 100%
rename from crates/musicus/src/import/source.rs
rename to musicus/src/import/source.rs
diff --git a/crates/musicus/src/import/source_selector.rs b/musicus/src/import/source_selector.rs
similarity index 100%
rename from crates/musicus/src/import/source_selector.rs
rename to musicus/src/import/source_selector.rs
diff --git a/crates/musicus/src/import/track_editor.rs b/musicus/src/import/track_editor.rs
similarity index 100%
rename from crates/musicus/src/import/track_editor.rs
rename to musicus/src/import/track_editor.rs
diff --git a/crates/musicus/src/import/track_selector.rs b/musicus/src/import/track_selector.rs
similarity index 100%
rename from crates/musicus/src/import/track_selector.rs
rename to musicus/src/import/track_selector.rs
diff --git a/crates/musicus/src/import/track_set_editor.rs b/musicus/src/import/track_set_editor.rs
similarity index 100%
rename from crates/musicus/src/import/track_set_editor.rs
rename to musicus/src/import/track_set_editor.rs
diff --git a/crates/musicus/src/macros.rs b/musicus/src/macros.rs
similarity index 100%
rename from crates/musicus/src/macros.rs
rename to musicus/src/macros.rs
diff --git a/crates/musicus/src/main.rs b/musicus/src/main.rs
similarity index 100%
rename from crates/musicus/src/main.rs
rename to musicus/src/main.rs
diff --git a/crates/musicus/src/meson.build b/musicus/src/meson.build
similarity index 100%
rename from crates/musicus/src/meson.build
rename to musicus/src/meson.build
diff --git a/crates/musicus/src/navigator/mod.rs b/musicus/src/navigator/mod.rs
similarity index 100%
rename from crates/musicus/src/navigator/mod.rs
rename to musicus/src/navigator/mod.rs
diff --git a/crates/musicus/src/navigator/window.rs b/musicus/src/navigator/window.rs
similarity index 100%
rename from crates/musicus/src/navigator/window.rs
rename to musicus/src/navigator/window.rs
diff --git a/crates/musicus/src/preferences/login.rs b/musicus/src/preferences/login.rs
similarity index 100%
rename from crates/musicus/src/preferences/login.rs
rename to musicus/src/preferences/login.rs
diff --git a/crates/musicus/src/preferences/mod.rs b/musicus/src/preferences/mod.rs
similarity index 100%
rename from crates/musicus/src/preferences/mod.rs
rename to musicus/src/preferences/mod.rs
diff --git a/crates/musicus/src/preferences/register.rs b/musicus/src/preferences/register.rs
similarity index 100%
rename from crates/musicus/src/preferences/register.rs
rename to musicus/src/preferences/register.rs
diff --git a/crates/musicus/src/preferences/server.rs b/musicus/src/preferences/server.rs
similarity index 100%
rename from crates/musicus/src/preferences/server.rs
rename to musicus/src/preferences/server.rs
diff --git a/crates/musicus/src/resources.rs b/musicus/src/resources.rs
similarity index 53%
rename from crates/musicus/src/resources.rs
rename to musicus/src/resources.rs
index 4ded19d..8183bde 100644
--- a/crates/musicus/src/resources.rs
+++ b/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-master/crates/musicus/res/musicus.gresource").as_ref());
+    let bytes = glib::Bytes::from(include_bytes!("/home/johrpan/Entwicklung/musicus/build/musicus/res/musicus.gresource").as_ref());
     let resource = gio::Resource::from_data(&bytes)?;
     gio::resources_register(&resource);
 
diff --git a/crates/musicus/src/resources.rs.in b/musicus/src/resources.rs.in
similarity index 100%
rename from crates/musicus/src/resources.rs.in
rename to musicus/src/resources.rs.in
diff --git a/crates/musicus/src/screens/ensemble.rs b/musicus/src/screens/ensemble.rs
similarity index 100%
rename from crates/musicus/src/screens/ensemble.rs
rename to musicus/src/screens/ensemble.rs
diff --git a/crates/musicus/src/screens/main.rs b/musicus/src/screens/main.rs
similarity index 100%
rename from crates/musicus/src/screens/main.rs
rename to musicus/src/screens/main.rs
diff --git a/crates/musicus/src/screens/medium.rs b/musicus/src/screens/medium.rs
similarity index 100%
rename from crates/musicus/src/screens/medium.rs
rename to musicus/src/screens/medium.rs
diff --git a/crates/musicus/src/screens/mod.rs b/musicus/src/screens/mod.rs
similarity index 100%
rename from crates/musicus/src/screens/mod.rs
rename to musicus/src/screens/mod.rs
diff --git a/crates/musicus/src/screens/person.rs b/musicus/src/screens/person.rs
similarity index 100%
rename from crates/musicus/src/screens/person.rs
rename to musicus/src/screens/person.rs
diff --git a/crates/musicus/src/screens/player.rs b/musicus/src/screens/player.rs
similarity index 100%
rename from crates/musicus/src/screens/player.rs
rename to musicus/src/screens/player.rs
diff --git a/crates/musicus/src/screens/recording.rs b/musicus/src/screens/recording.rs
similarity index 100%
rename from crates/musicus/src/screens/recording.rs
rename to musicus/src/screens/recording.rs
diff --git a/crates/musicus/src/screens/welcome.rs b/musicus/src/screens/welcome.rs
similarity index 100%
rename from crates/musicus/src/screens/welcome.rs
rename to musicus/src/screens/welcome.rs
diff --git a/crates/musicus/src/screens/work.rs b/musicus/src/screens/work.rs
similarity index 100%
rename from crates/musicus/src/screens/work.rs
rename to musicus/src/screens/work.rs
diff --git a/crates/musicus/src/selectors/ensemble.rs b/musicus/src/selectors/ensemble.rs
similarity index 100%
rename from crates/musicus/src/selectors/ensemble.rs
rename to musicus/src/selectors/ensemble.rs
diff --git a/crates/musicus/src/selectors/instrument.rs b/musicus/src/selectors/instrument.rs
similarity index 100%
rename from crates/musicus/src/selectors/instrument.rs
rename to musicus/src/selectors/instrument.rs
diff --git a/crates/musicus/src/selectors/mod.rs b/musicus/src/selectors/mod.rs
similarity index 100%
rename from crates/musicus/src/selectors/mod.rs
rename to musicus/src/selectors/mod.rs
diff --git a/crates/musicus/src/selectors/person.rs b/musicus/src/selectors/person.rs
similarity index 100%
rename from crates/musicus/src/selectors/person.rs
rename to musicus/src/selectors/person.rs
diff --git a/crates/musicus/src/selectors/recording.rs b/musicus/src/selectors/recording.rs
similarity index 100%
rename from crates/musicus/src/selectors/recording.rs
rename to musicus/src/selectors/recording.rs
diff --git a/crates/musicus/src/selectors/selector.rs b/musicus/src/selectors/selector.rs
similarity index 100%
rename from crates/musicus/src/selectors/selector.rs
rename to musicus/src/selectors/selector.rs
diff --git a/crates/musicus/src/selectors/work.rs b/musicus/src/selectors/work.rs
similarity index 100%
rename from crates/musicus/src/selectors/work.rs
rename to musicus/src/selectors/work.rs
diff --git a/crates/musicus/src/widgets/button_row.rs b/musicus/src/widgets/button_row.rs
similarity index 100%
rename from crates/musicus/src/widgets/button_row.rs
rename to musicus/src/widgets/button_row.rs
diff --git a/crates/musicus/src/widgets/editor.rs b/musicus/src/widgets/editor.rs
similarity index 100%
rename from crates/musicus/src/widgets/editor.rs
rename to musicus/src/widgets/editor.rs
diff --git a/crates/musicus/src/widgets/entry_row.rs b/musicus/src/widgets/entry_row.rs
similarity index 100%
rename from crates/musicus/src/widgets/entry_row.rs
rename to musicus/src/widgets/entry_row.rs
diff --git a/crates/musicus/src/widgets/indexed_list_model.rs b/musicus/src/widgets/indexed_list_model.rs
similarity index 100%
rename from crates/musicus/src/widgets/indexed_list_model.rs
rename to musicus/src/widgets/indexed_list_model.rs
diff --git a/crates/musicus/src/widgets/list.rs b/musicus/src/widgets/list.rs
similarity index 100%
rename from crates/musicus/src/widgets/list.rs
rename to musicus/src/widgets/list.rs
diff --git a/crates/musicus/src/widgets/mod.rs b/musicus/src/widgets/mod.rs
similarity index 100%
rename from crates/musicus/src/widgets/mod.rs
rename to musicus/src/widgets/mod.rs
diff --git a/crates/musicus/src/widgets/player_bar.rs b/musicus/src/widgets/player_bar.rs
similarity index 100%
rename from crates/musicus/src/widgets/player_bar.rs
rename to musicus/src/widgets/player_bar.rs
diff --git a/crates/musicus/src/widgets/screen.rs b/musicus/src/widgets/screen.rs
similarity index 100%
rename from crates/musicus/src/widgets/screen.rs
rename to musicus/src/widgets/screen.rs
diff --git a/crates/musicus/src/widgets/section.rs b/musicus/src/widgets/section.rs
similarity index 100%
rename from crates/musicus/src/widgets/section.rs
rename to musicus/src/widgets/section.rs
diff --git a/crates/musicus/src/widgets/upload_section.rs b/musicus/src/widgets/upload_section.rs
similarity index 100%
rename from crates/musicus/src/widgets/upload_section.rs
rename to musicus/src/widgets/upload_section.rs
diff --git a/crates/musicus/src/window.rs b/musicus/src/window.rs
similarity index 100%
rename from crates/musicus/src/window.rs
rename to musicus/src/window.rs