Move crates to toplevel directory

2025-10-26 11:47:25 +01:00 · 2021-02-07 12:53:25 +01:00 · 2021-02-07 12:53:25 +01:00 · 0ffe68e04f
commit 0ffe68e04f
parent d16961efa8
127 changed files with 15 additions and 13 deletions
--- a/Cargo.toml
+++ b/Cargo.toml
@ -1,2 +1,2 @@
 [workspace]
-members = ["crates/*"]
+members = ["backend", "client", "database", "musicus"]
--- a/crates/musicus_backend/Cargo.toml
+++ b/crates/musicus_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"

--- a/crates/musicus_backend/src/error.rs
+++ b/crates/musicus_backend/src/error.rs
--- a/crates/musicus_backend/src/lib.rs
+++ b/crates/musicus_backend/src/lib.rs
--- a/crates/musicus_backend/src/library.rs
+++ b/crates/musicus_backend/src/library.rs
--- a/crates/musicus_backend/src/player.rs
+++ b/crates/musicus_backend/src/player.rs
--- a/crates/musicus_backend/src/secure.rs
+++ b/crates/musicus_backend/src/secure.rs
--- a/crates/musicus_client/Cargo.toml
+++ b/crates/musicus_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"
--- a/crates/musicus_client/src/ensembles.rs
+++ b/crates/musicus_client/src/ensembles.rs
--- a/crates/musicus_client/src/error.rs
+++ b/crates/musicus_client/src/error.rs
--- a/crates/musicus_client/src/instruments.rs
+++ b/crates/musicus_client/src/instruments.rs
--- a/crates/musicus_client/src/lib.rs
+++ b/crates/musicus_client/src/lib.rs
--- a/crates/musicus_client/src/mediums.rs
+++ b/crates/musicus_client/src/mediums.rs
--- a/crates/musicus_client/src/persons.rs
+++ b/crates/musicus_client/src/persons.rs
--- a/crates/musicus_client/src/recordings.rs
+++ b/crates/musicus_client/src/recordings.rs
--- a/crates/musicus_client/src/register.rs
+++ b/crates/musicus_client/src/register.rs
--- a/crates/musicus_client/src/works.rs
+++ b/crates/musicus_client/src/works.rs
--- a/crates/musicus/src/config.rs
+++ b/crates/musicus/src/config.rs
@ -1,2 +0,0 @@
-pub static VERSION: &str = "0.1.0";
-pub static LOCALEDIR: &str = "/app/share/locale";
--- a/database/.gitignore
+++ b/database/.gitignore
@ -0,0 +1 @@
+test.sqlite
--- a/crates/musicus_database/Cargo.toml
+++ b/crates/musicus_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"] }
--- a/crates/musicus_database/diesel.toml
+++ b/crates/musicus_database/diesel.toml
--- a/crates/musicus_database/migrations/2020-09-27-201047_initial_schema/down.sql
+++ b/crates/musicus_database/migrations/2020-09-27-201047_initial_schema/down.sql
--- a/crates/musicus_database/migrations/2020-09-27-201047_initial_schema/up.sql
+++ b/crates/musicus_database/migrations/2020-09-27-201047_initial_schema/up.sql
--- a/crates/musicus_database/src/ensembles.rs
+++ b/crates/musicus_database/src/ensembles.rs
--- a/crates/musicus_database/src/error.rs
+++ b/crates/musicus_database/src/error.rs
--- a/crates/musicus_database/src/instruments.rs
+++ b/crates/musicus_database/src/instruments.rs
--- a/crates/musicus_database/src/lib.rs
+++ b/crates/musicus_database/src/lib.rs
--- a/crates/musicus_database/src/medium.rs
+++ b/crates/musicus_database/src/medium.rs
--- a/crates/musicus_database/src/persons.rs
+++ b/crates/musicus_database/src/persons.rs
--- a/crates/musicus_database/src/recordings.rs
+++ b/crates/musicus_database/src/recordings.rs
--- a/crates/musicus_database/src/schema.rs
+++ b/crates/musicus_database/src/schema.rs
--- a/crates/musicus_database/src/thread.rs
+++ b/crates/musicus_database/src/thread.rs
--- a/crates/musicus_database/src/works.rs
+++ b/crates/musicus_database/src/works.rs
--- 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')
--- a/musicus/.gitignore
+++ b/musicus/.gitignore
@ -0,0 +1,2 @@
+/src/config.rs
+/src/resources.rs
--- a/crates/musicus/Cargo.toml
+++ b/crates/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"

--- a/crates/musicus/data/de.johrpan.musicus.desktop.in
+++ b/crates/musicus/data/de.johrpan.musicus.desktop.in
--- a/crates/musicus/data/de.johrpan.musicus.gschema.xml
+++ b/crates/musicus/data/de.johrpan.musicus.gschema.xml
--- a/crates/musicus/data/icons/hicolor/scalable/apps/de.johrpan.musicus.svg
+++ b/crates/musicus/data/icons/hicolor/scalable/apps/de.johrpan.musicus.svg
--- a/crates/musicus/data/icons/hicolor/symbolic/apps/de.johrpan.musicus-symbolic.svg
+++ b/crates/musicus/data/icons/hicolor/symbolic/apps/de.johrpan.musicus-symbolic.svg
--- a/crates/musicus/data/meson.build
+++ b/crates/musicus/data/meson.build
--- a/crates/musicus/po/LINGUAS
+++ b/crates/musicus/po/LINGUAS
--- a/crates/musicus/po/POTFILES.in
+++ b/crates/musicus/po/POTFILES.in
--- a/crates/musicus/po/de.po
+++ b/crates/musicus/po/de.po
--- a/crates/musicus/po/meson.build
+++ b/crates/musicus/po/meson.build
--- a/crates/musicus/po/musicus.pot
+++ b/crates/musicus/po/musicus.pot
--- a/crates/musicus/res/meson.build
+++ b/crates/musicus/res/meson.build
--- a/crates/musicus/res/musicus.gresource.xml
+++ b/crates/musicus/res/musicus.gresource.xml
--- a/crates/musicus/res/ui/editor.ui
+++ b/crates/musicus/res/ui/editor.ui
--- a/crates/musicus/res/ui/login_dialog.ui
+++ b/crates/musicus/res/ui/login_dialog.ui
--- a/crates/musicus/res/ui/main_screen.ui
+++ b/crates/musicus/res/ui/main_screen.ui
--- a/crates/musicus/res/ui/medium_editor.ui
+++ b/crates/musicus/res/ui/medium_editor.ui
--- a/crates/musicus/res/ui/performance_editor.ui
+++ b/crates/musicus/res/ui/performance_editor.ui
--- a/crates/musicus/res/ui/player_bar.ui
+++ b/crates/musicus/res/ui/player_bar.ui
--- a/crates/musicus/res/ui/player_screen.ui
+++ b/crates/musicus/res/ui/player_screen.ui
--- a/crates/musicus/res/ui/preferences.ui
+++ b/crates/musicus/res/ui/preferences.ui
--- a/crates/musicus/res/ui/recording_editor.ui
+++ b/crates/musicus/res/ui/recording_editor.ui
--- a/crates/musicus/res/ui/register_dialog.ui
+++ b/crates/musicus/res/ui/register_dialog.ui
--- a/crates/musicus/res/ui/screen.ui
+++ b/crates/musicus/res/ui/screen.ui
--- a/crates/musicus/res/ui/section.ui
+++ b/crates/musicus/res/ui/section.ui
--- a/crates/musicus/res/ui/selector.ui
+++ b/crates/musicus/res/ui/selector.ui
--- a/crates/musicus/res/ui/server_dialog.ui
+++ b/crates/musicus/res/ui/server_dialog.ui
--- a/crates/musicus/res/ui/source_selector.ui
+++ b/crates/musicus/res/ui/source_selector.ui
--- a/crates/musicus/res/ui/track_editor.ui
+++ b/crates/musicus/res/ui/track_editor.ui
--- a/crates/musicus/res/ui/track_selector.ui
+++ b/crates/musicus/res/ui/track_selector.ui
--- a/crates/musicus/res/ui/track_set_editor.ui
+++ b/crates/musicus/res/ui/track_set_editor.ui
--- a/crates/musicus/res/ui/work_editor.ui
+++ b/crates/musicus/res/ui/work_editor.ui
--- a/crates/musicus/res/ui/work_part_editor.ui
+++ b/crates/musicus/res/ui/work_part_editor.ui
--- a/crates/musicus/res/ui/work_section_editor.ui
+++ b/crates/musicus/res/ui/work_section_editor.ui
--- a/musicus/src/config.rs
+++ b/musicus/src/config.rs
@ -0,0 +1,2 @@
+pub static VERSION: &str = "0.1.0";
+pub static LOCALEDIR: &str = "/usr/local/share/locale";
--- a/crates/musicus/src/config.rs.in
+++ b/crates/musicus/src/config.rs.in
--- a/crates/musicus/src/editors/ensemble.rs
+++ b/crates/musicus/src/editors/ensemble.rs
--- a/crates/musicus/src/editors/instrument.rs
+++ b/crates/musicus/src/editors/instrument.rs
--- a/crates/musicus/src/editors/mod.rs
+++ b/crates/musicus/src/editors/mod.rs
--- a/crates/musicus/src/editors/performance.rs
+++ b/crates/musicus/src/editors/performance.rs
--- a/crates/musicus/src/editors/person.rs
+++ b/crates/musicus/src/editors/person.rs
--- a/crates/musicus/src/editors/recording.rs
+++ b/crates/musicus/src/editors/recording.rs
--- a/crates/musicus/src/editors/work.rs
+++ b/crates/musicus/src/editors/work.rs
--- a/crates/musicus/src/editors/work_part.rs
+++ b/crates/musicus/src/editors/work_part.rs
--- a/crates/musicus/src/editors/work_section.rs
+++ b/crates/musicus/src/editors/work_section.rs
--- a/crates/musicus/src/import/disc_source.rs
+++ b/crates/musicus/src/import/disc_source.rs
--- a/crates/musicus/src/import/folder_source.rs
+++ b/crates/musicus/src/import/folder_source.rs
--- a/crates/musicus/src/import/medium_editor.rs
+++ b/crates/musicus/src/import/medium_editor.rs
--- a/crates/musicus/src/import/mod.rs
+++ b/crates/musicus/src/import/mod.rs
--- a/crates/musicus/src/import/source.rs
+++ b/crates/musicus/src/import/source.rs
--- a/crates/musicus/src/import/source_selector.rs
+++ b/crates/musicus/src/import/source_selector.rs
--- a/crates/musicus/src/import/track_editor.rs
+++ b/crates/musicus/src/import/track_editor.rs
--- a/crates/musicus/src/import/track_selector.rs
+++ b/crates/musicus/src/import/track_selector.rs
--- a/crates/musicus/src/import/track_set_editor.rs
+++ b/crates/musicus/src/import/track_set_editor.rs
--- a/crates/musicus/src/macros.rs
+++ b/crates/musicus/src/macros.rs
--- a/crates/musicus/src/main.rs
+++ b/crates/musicus/src/main.rs
--- a/crates/musicus/src/meson.build
+++ b/crates/musicus/src/meson.build
--- a/crates/musicus/src/navigator/mod.rs
+++ b/crates/musicus/src/navigator/mod.rs
--- a/crates/musicus/src/navigator/window.rs
+++ b/crates/musicus/src/navigator/window.rs
--- a/crates/musicus/src/preferences/login.rs
+++ b/crates/musicus/src/preferences/login.rs
--- a/crates/musicus/src/preferences/mod.rs
+++ b/crates/musicus/src/preferences/mod.rs
--- a/crates/musicus/src/preferences/register.rs
+++ b/crates/musicus/src/preferences/register.rs
--- a/crates/musicus/src/preferences/server.rs
+++ b/crates/musicus/src/preferences/server.rs
--- 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-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);

--- a/crates/musicus/src/resources.rs.in
+++ b/crates/musicus/src/resources.rs.in
--- a/Show more
+++ b/Show more