wip: reorganize crates (again)

fossable · Nov 24, 2023 · 02fdbd0 · 02fdbd0
1 parent bfc5acd
commit 02fdbd0
Show file tree

Hide file tree

Showing 87 changed files with 20 additions and 72 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,9 +4,6 @@ strip = true
 [workspace]
 members = [
     "goldboot",
-    "goldboot-foundry",
     "goldboot-image",
-    "goldboot-linux",
     "goldboot-registry",
-    "goldboot-repository",
 ]
diff --git a/goldboot-foundry/Cargo.toml b/goldboot-foundry/Cargo.toml
diff --git a/goldboot-linux/Cargo.toml b/goldboot-linux/Cargo.toml
diff --git a/goldboot-linux/README.md b/goldboot-linux/README.md
diff --git a/goldboot-linux/goldboot.json b/goldboot-linux/goldboot.json
diff --git a/goldboot-repository/Cargo.toml → goldboot-uefi/Cargo.toml b/goldboot-repository/Cargo.toml → goldboot-uefi/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "goldboot-repository"
+name = "goldboot-uefi"
 version = "0.1.0"
 edition = "2021"
 

diff --git a/goldboot-uefi/src/main.rs b/goldboot-uefi/src/main.rs
@@ -0,0 +1,3 @@
+fn main() {
+    println!("Hello, world!");
+}
diff --git a/goldboot/Cargo.toml b/goldboot/Cargo.toml
@@ -10,31 +10,44 @@ homepage = "https://goldboot.org"
 repository = "https://github.com/goldboot/goldboot/"
 
 [dependencies]
+block-utils = "0.11.1"
 chrono = "0.4.31"
 clap = { version = "4.4.7", features = ["derive"] }
 console = "0.15.7"
 dialoguer = "0.11.0"
 env_logger = "0"
 fossable = "0.1.0"
+gdk4 = "0.7.3"
+gdk-pixbuf = "0.18.3"
+glib-macros = "0.18.3"
+goldboot-image = { path="../goldboot-image", version = "0.0.1" }
+gtk4 = "0.7.3"
 hex = "0.4.3"
 indicatif = "0.17.7"
 log = { version = "0.4.20", default-features = false }
+png = "0.17.10"
 rand = "0.8.5"
 regex = "1.10.2"
 reqwest = { version = "0.11.22", features = ["stream", "blocking", "json"] }
-rust-embed = "8.0.0"
+ron = "0.8.1"
 serde = { version = "1.0.190", features = ["derive"] }
 serde_win_unattend = "0.1.0"
 sha1 = "0.10.6"
 sha2 = "0.10.8"
 simple-error = "0.3.0"
+ssh2 = { version = "0.9.4", features = ["vendored-openssl"] }
 strum = { version = "0.25.0", features = ["derive"] }
 tempfile = "3.8.1"
 ubyte = "0.10.4"
 url = { version = "2.4.1", features = ["serde"] }
 validator = { version = "0.16.1", features = ["derive"] }
+vnc = "0.4.0"
 whoami = "1.4.1"
+zstd = "0.13.0"
 
 [dev-dependencies]
 test-env-log = "0"
 env_logger = "0"
+
+[features]
+gui = ["dep:gtk4", "dep:glib-macros", "dep:gdk4", "dep:gdk-pixbuf", "dep:block-utils"]
diff --git a/goldboot/src/cmd/build.rs → goldboot/src/cli/cmd/build.rs b/goldboot/src/cmd/build.rs → goldboot/src/cli/cmd/build.rs
diff --git a/goldboot/src/cmd/image.rs → goldboot/src/cli/cmd/image.rs b/goldboot/src/cmd/image.rs → goldboot/src/cli/cmd/image.rs
diff --git a/goldboot/src/cmd/init.rs → goldboot/src/cli/cmd/init.rs b/goldboot/src/cmd/init.rs → goldboot/src/cli/cmd/init.rs
diff --git a/goldboot/src/cmd/mod.rs → goldboot/src/cli/cmd/mod.rs b/goldboot/src/cmd/mod.rs → goldboot/src/cli/cmd/mod.rs
diff --git a/goldboot/src/cmd/registry.rs → goldboot/src/cli/cmd/registry.rs b/goldboot/src/cmd/registry.rs → goldboot/src/cli/cmd/registry.rs
diff --git a/goldboot/src/cmd/write.rs → goldboot/src/cli/cmd/write.rs b/goldboot/src/cmd/write.rs → goldboot/src/cli/cmd/write.rs
diff --git a/goldboot/src/progress.rs → goldboot/src/cli/progress.rs b/goldboot/src/progress.rs → goldboot/src/cli/progress.rs
diff --git a/goldboot-foundry/src/fabricators/ansible.rs → goldboot/src/foundry/fabricators/ansible.rs b/goldboot-foundry/src/fabricators/ansible.rs → goldboot/src/foundry/fabricators/ansible.rs
diff --git a/goldboot-foundry/src/fabricators/exe.rs → goldboot/src/foundry/fabricators/exe.rs b/goldboot-foundry/src/fabricators/exe.rs → goldboot/src/foundry/fabricators/exe.rs
diff --git a/goldboot-foundry/src/fabricators/mod.rs → goldboot/src/foundry/fabricators/mod.rs b/goldboot-foundry/src/fabricators/mod.rs → goldboot/src/foundry/fabricators/mod.rs
diff --git a/goldboot-foundry/src/fabricators/shell.rs → goldboot/src/foundry/fabricators/shell.rs b/goldboot-foundry/src/fabricators/shell.rs → goldboot/src/foundry/fabricators/shell.rs
diff --git a/goldboot-foundry/src/http.rs → goldboot/src/foundry/http.rs b/goldboot-foundry/src/http.rs → goldboot/src/foundry/http.rs
diff --git a/goldboot-foundry/src/lib.rs → goldboot/src/foundry/lib.rs b/goldboot-foundry/src/lib.rs → goldboot/src/foundry/lib.rs
diff --git a/...y/src/mold/builtins/alpine_linux/icon.png → ...undry/mold/builtins/alpine_linux/icon.png b/...y/src/mold/builtins/alpine_linux/icon.png → ...undry/mold/builtins/alpine_linux/icon.png
diff --git a/...rc/mold/builtins/alpine_linux/[email protected] → ...ry/mold/builtins/alpine_linux/[email protected] b/...rc/mold/builtins/alpine_linux/[email protected] → ...ry/mold/builtins/alpine_linux/[email protected]
diff --git a/...dry/src/mold/builtins/alpine_linux/mod.rs → ...foundry/mold/builtins/alpine_linux/mod.rs b/...dry/src/mold/builtins/alpine_linux/mod.rs → ...foundry/mold/builtins/alpine_linux/mod.rs
diff --git a/...dry/src/mold/builtins/arch_linux/icon.png → ...foundry/mold/builtins/arch_linux/icon.png b/...dry/src/mold/builtins/arch_linux/icon.png → ...foundry/mold/builtins/arch_linux/icon.png
diff --git a/.../src/mold/builtins/arch_linux/[email protected] → ...ndry/mold/builtins/arch_linux/[email protected] b/.../src/mold/builtins/arch_linux/[email protected] → ...ndry/mold/builtins/arch_linux/[email protected]
diff --git a/...y/src/mold/builtins/arch_linux/install.sh → ...undry/mold/builtins/arch_linux/install.sh b/...y/src/mold/builtins/arch_linux/install.sh → ...undry/mold/builtins/arch_linux/install.sh
diff --git a/...undry/src/mold/builtins/arch_linux/mod.rs → ...c/foundry/mold/builtins/arch_linux/mod.rs b/...undry/src/mold/builtins/arch_linux/mod.rs → ...c/foundry/mold/builtins/arch_linux/mod.rs
@@ -27,7 +27,7 @@ impl Default for ArchLinux {
     }
 }
 
-impl super::Cast for ArchLinux {
+impl ImageMold for ArchLinux {
     fn metadata() -> TemplateMetadata {
         TemplateMetadata {
             id: TemplateId::ArchLinux,

diff --git a/...oundry/src/mold/builtins/buildroot/mod.rs → ...rc/foundry/mold/builtins/buildroot/mod.rs b/...oundry/src/mold/builtins/buildroot/mod.rs → ...rc/foundry/mold/builtins/buildroot/mod.rs
diff --git a/...foundry/src/mold/builtins/debian/icon.png → ...src/foundry/mold/builtins/debian/icon.png b/...foundry/src/mold/builtins/debian/icon.png → ...src/foundry/mold/builtins/debian/icon.png
diff --git a/...ndry/src/mold/builtins/debian/[email protected] → .../foundry/mold/builtins/debian/[email protected] b/...ndry/src/mold/builtins/debian/[email protected] → .../foundry/mold/builtins/debian/[email protected]
diff --git a/...t-foundry/src/mold/builtins/debian/mod.rs → ...t/src/foundry/mold/builtins/debian/mod.rs b/...t-foundry/src/mold/builtins/debian/mod.rs → ...t/src/foundry/mold/builtins/debian/mod.rs
diff --git a/...ndry/src/mold/builtins/debian/preseed.cfg → .../foundry/mold/builtins/debian/preseed.cfg b/...ndry/src/mold/builtins/debian/preseed.cfg → .../foundry/mold/builtins/debian/preseed.cfg
diff --git a/...foundry/src/mold/builtins/fedora/icon.png → ...src/foundry/mold/builtins/fedora/icon.png b/...foundry/src/mold/builtins/fedora/icon.png → ...src/foundry/mold/builtins/fedora/icon.png
diff --git a/...ndry/src/mold/builtins/fedora/[email protected] → .../foundry/mold/builtins/fedora/[email protected] b/...ndry/src/mold/builtins/fedora/[email protected] → .../foundry/mold/builtins/fedora/[email protected]
diff --git a/...foundry/src/mold/builtins/goldboot/mod.rs → ...src/foundry/mold/builtins/goldboot/mod.rs b/...foundry/src/mold/builtins/goldboot/mod.rs → ...src/foundry/mold/builtins/goldboot/mod.rs
diff --git a/...ry/src/mold/builtins/goldboot/preseed.cfg → ...oundry/mold/builtins/goldboot/preseed.cfg b/...ry/src/mold/builtins/goldboot/preseed.cfg → ...oundry/mold/builtins/goldboot/preseed.cfg
diff --git a/...dry/src/mold/builtins/linux_mint/icon.png → ...foundry/mold/builtins/linux_mint/icon.png b/...dry/src/mold/builtins/linux_mint/icon.png → ...foundry/mold/builtins/linux_mint/icon.png
diff --git a/.../src/mold/builtins/linux_mint/[email protected] → ...ndry/mold/builtins/linux_mint/[email protected] b/.../src/mold/builtins/linux_mint/[email protected] → ...ndry/mold/builtins/linux_mint/[email protected]
diff --git a/...foundry/src/mold/builtins/mac_os/icon.png → ...src/foundry/mold/builtins/mac_os/icon.png b/...foundry/src/mold/builtins/mac_os/icon.png → ...src/foundry/mold/builtins/mac_os/icon.png
diff --git a/...ndry/src/mold/builtins/mac_os/[email protected] → .../foundry/mold/builtins/mac_os/[email protected] b/...ndry/src/mold/builtins/mac_os/[email protected] → .../foundry/mold/builtins/mac_os/[email protected]
diff --git a/...t-foundry/src/mold/builtins/mac_os/mod.rs → ...t/src/foundry/mold/builtins/mac_os/mod.rs b/...t-foundry/src/mold/builtins/mac_os/mod.rs → ...t/src/foundry/mold/builtins/mac_os/mod.rs
diff --git a/goldboot-foundry/src/mold/builtins/mod.rs → goldboot/src/foundry/mold/builtins/mod.rs b/goldboot-foundry/src/mold/builtins/mod.rs → goldboot/src/foundry/mold/builtins/mod.rs
@@ -24,7 +24,7 @@ pub struct TemplateMetadata {
 ///
 /// This term comes from metallurgy where casting means to pour molten metal into
 /// a mold, producing a solidified object in the shape of the mold.
-pub trait Cast {
+pub trait ImageMold: Default + Serialize + PromptMut {
     /// Cast an image from the mold.
     fn cast(&self, context: &FoundryWorker) -> Result<(), Box<dyn Error>>;
 

diff --git a/...ndry/src/mold/builtins/open_suse/icon.png → .../foundry/mold/builtins/open_suse/icon.png b/...ndry/src/mold/builtins/open_suse/icon.png → .../foundry/mold/builtins/open_suse/icon.png
diff --git a/...y/src/mold/builtins/open_suse/[email protected] → ...undry/mold/builtins/open_suse/[email protected] b/...y/src/mold/builtins/open_suse/[email protected] → ...undry/mold/builtins/open_suse/[email protected]
diff --git a/...t-foundry/src/mold/builtins/pop_os/mod.rs → ...t/src/foundry/mold/builtins/pop_os/mod.rs b/...t-foundry/src/mold/builtins/pop_os/mod.rs → ...t/src/foundry/mold/builtins/pop_os/mod.rs
diff --git a/...ndry/src/mold/builtins/slackware/icon.png → .../foundry/mold/builtins/slackware/icon.png b/...ndry/src/mold/builtins/slackware/icon.png → .../foundry/mold/builtins/slackware/icon.png
diff --git a/...y/src/mold/builtins/slackware/[email protected] → ...undry/mold/builtins/slackware/[email protected] b/...y/src/mold/builtins/slackware/[email protected] → ...undry/mold/builtins/slackware/[email protected]
diff --git a/...undry/src/mold/builtins/steam_deck/mod.rs → ...c/foundry/mold/builtins/steam_deck/mod.rs b/...undry/src/mold/builtins/steam_deck/mod.rs → ...c/foundry/mold/builtins/steam_deck/mod.rs
diff --git a/...foundry/src/mold/builtins/steam_os/mod.rs → ...src/foundry/mold/builtins/steam_os/mod.rs b/...foundry/src/mold/builtins/steam_os/mod.rs → ...src/foundry/mold/builtins/steam_os/mod.rs
diff --git a/...foundry/src/mold/builtins/ubuntu/icon.png → ...src/foundry/mold/builtins/ubuntu/icon.png b/...foundry/src/mold/builtins/ubuntu/icon.png → ...src/foundry/mold/builtins/ubuntu/icon.png
diff --git a/...ndry/src/mold/builtins/ubuntu/[email protected] → .../foundry/mold/builtins/ubuntu/[email protected] b/...ndry/src/mold/builtins/ubuntu/[email protected] → .../foundry/mold/builtins/ubuntu/[email protected]
diff --git a/...t-foundry/src/mold/builtins/ubuntu/mod.rs → ...t/src/foundry/mold/builtins/ubuntu/mod.rs b/...t-foundry/src/mold/builtins/ubuntu/mod.rs → ...t/src/foundry/mold/builtins/ubuntu/mod.rs
diff --git a/...d/builtins/windows_10/configure_winrm.ps1 → ...d/builtins/windows_10/configure_winrm.ps1 b/...d/builtins/windows_10/configure_winrm.ps1 → ...d/builtins/windows_10/configure_winrm.ps1
diff --git a/...dry/src/mold/builtins/windows_10/icon.png → ...foundry/mold/builtins/windows_10/icon.png b/...dry/src/mold/builtins/windows_10/icon.png → ...foundry/mold/builtins/windows_10/icon.png
diff --git a/.../src/mold/builtins/windows_10/[email protected] → ...ndry/mold/builtins/windows_10/[email protected] b/.../src/mold/builtins/windows_10/[email protected] → ...ndry/mold/builtins/windows_10/[email protected]
diff --git a/...undry/src/mold/builtins/windows_10/mod.rs → ...c/foundry/mold/builtins/windows_10/mod.rs b/...undry/src/mold/builtins/windows_10/mod.rs → ...c/foundry/mold/builtins/windows_10/mod.rs
diff --git a/...undry/src/mold/builtins/windows_11/mod.rs → ...c/foundry/mold/builtins/windows_11/mod.rs b/...undry/src/mold/builtins/windows_11/mod.rs → ...c/foundry/mold/builtins/windows_11/mod.rs
diff --git a/...oundry/src/mold/builtins/windows_7/mod.rs → ...rc/foundry/mold/builtins/windows_7/mod.rs b/...oundry/src/mold/builtins/windows_7/mod.rs → ...rc/foundry/mold/builtins/windows_7/mod.rs
diff --git a/goldboot-foundry/src/mold/mod.rs → goldboot/src/foundry/mold/mod.rs b/goldboot-foundry/src/mold/mod.rs → goldboot/src/foundry/mold/mod.rs
diff --git a/...-foundry/src/mold/options/dns_resolver.rs → .../src/foundry/mold/options/dns_resolver.rs b/...-foundry/src/mold/options/dns_resolver.rs → .../src/foundry/mold/options/dns_resolver.rs
diff --git a/...boot-foundry/src/mold/options/hostname.rs → ...boot/src/foundry/mold/options/hostname.rs b/...boot-foundry/src/mold/options/hostname.rs → ...boot/src/foundry/mold/options/hostname.rs
diff --git a/goldboot-foundry/src/mold/options/luks.rs → goldboot/src/foundry/mold/options/luks.rs b/goldboot-foundry/src/mold/options/luks.rs → goldboot/src/foundry/mold/options/luks.rs
diff --git a/...boot-foundry/src/mold/options/timezone.rs → ...boot/src/foundry/mold/options/timezone.rs b/...boot-foundry/src/mold/options/timezone.rs → ...boot/src/foundry/mold/options/timezone.rs
diff --git a/...-foundry/src/mold/options/unix_account.rs → .../src/foundry/mold/options/unix_account.rs b/...-foundry/src/mold/options/unix_account.rs → .../src/foundry/mold/options/unix_account.rs
diff --git a/goldboot-foundry/src/ovmf/aarch64.fd.zst → goldboot/src/foundry/ovmf/aarch64.fd.zst b/goldboot-foundry/src/ovmf/aarch64.fd.zst → goldboot/src/foundry/ovmf/aarch64.fd.zst
diff --git a/goldboot-foundry/src/ovmf/i386.fd.zst → goldboot/src/foundry/ovmf/i386.fd.zst b/goldboot-foundry/src/ovmf/i386.fd.zst → goldboot/src/foundry/ovmf/i386.fd.zst
diff --git a/goldboot-foundry/src/ovmf/mod.rs → goldboot/src/foundry/ovmf/mod.rs b/goldboot-foundry/src/ovmf/mod.rs → goldboot/src/foundry/ovmf/mod.rs
diff --git a/goldboot-foundry/src/ovmf/x86_64.fd.zst → goldboot/src/foundry/ovmf/x86_64.fd.zst b/goldboot-foundry/src/ovmf/x86_64.fd.zst → goldboot/src/foundry/ovmf/x86_64.fd.zst
diff --git a/goldboot-foundry/src/qemu.rs → goldboot/src/foundry/qemu.rs b/goldboot-foundry/src/qemu.rs → goldboot/src/foundry/qemu.rs
diff --git a/goldboot-foundry/src/sources/buildroot.rs → goldboot/src/foundry/sources/buildroot.rs b/goldboot-foundry/src/sources/buildroot.rs → goldboot/src/foundry/sources/buildroot.rs
diff --git a/goldboot-foundry/src/sources/iso.rs → goldboot/src/foundry/sources/iso.rs b/goldboot-foundry/src/sources/iso.rs → goldboot/src/foundry/sources/iso.rs
diff --git a/goldboot-foundry/src/sources/mod.rs → goldboot/src/foundry/sources/mod.rs b/goldboot-foundry/src/sources/mod.rs → goldboot/src/foundry/sources/mod.rs
diff --git a/goldboot-foundry/src/ssh.rs → goldboot/src/foundry/ssh.rs b/goldboot-foundry/src/ssh.rs → goldboot/src/foundry/ssh.rs
diff --git a/goldboot-foundry/src/vnc.rs → goldboot/src/foundry/vnc.rs b/goldboot-foundry/src/vnc.rs → goldboot/src/foundry/vnc.rs
diff --git a/goldboot-linux/src/apply_image.rs → goldboot/src/gui/apply_image.rs b/goldboot-linux/src/apply_image.rs → goldboot/src/gui/apply_image.rs
diff --git a/goldboot-linux/src/confirm.rs → goldboot/src/gui/confirm.rs b/goldboot-linux/src/confirm.rs → goldboot/src/gui/confirm.rs
diff --git a/goldboot-linux/src/main.rs → goldboot/src/gui/main.rs b/goldboot-linux/src/main.rs → goldboot/src/gui/main.rs
diff --git a/goldboot-linux/res/logo-512.png → goldboot/src/gui/resources/logo-512.png b/goldboot-linux/res/logo-512.png → goldboot/src/gui/resources/logo-512.png
diff --git a/goldboot-linux/res/select_device/hdd.png → ...t/src/gui/resources/select_device/hdd.png b/goldboot-linux/res/select_device/hdd.png → ...t/src/gui/resources/select_device/hdd.png
diff --git a/goldboot-linux/res/select_device/nvme.png → .../src/gui/resources/select_device/nvme.png b/goldboot-linux/res/select_device/nvme.png → .../src/gui/resources/select_device/nvme.png
diff --git a/goldboot-linux/res/select_device/ram.png → ...t/src/gui/resources/select_device/ram.png b/goldboot-linux/res/select_device/ram.png → ...t/src/gui/resources/select_device/ram.png
diff --git a/goldboot-linux/res/select_device/ssd.png → ...t/src/gui/resources/select_device/ssd.png b/goldboot-linux/res/select_device/ssd.png → ...t/src/gui/resources/select_device/ssd.png
diff --git a/goldboot-linux/res/style.css → goldboot/src/gui/resources/style.css b/goldboot-linux/res/style.css → goldboot/src/gui/resources/style.css
diff --git a/goldboot-linux/src/select_device.rs → goldboot/src/gui/select_device.rs b/goldboot-linux/src/select_device.rs → goldboot/src/gui/select_device.rs
diff --git a/goldboot-linux/src/select_image.rs → goldboot/src/gui/select_image.rs b/goldboot-linux/src/select_image.rs → goldboot/src/gui/select_image.rs
diff --git a/goldboot-repository/src/lib.rs → goldboot/src/repo/lib.rs b/goldboot-repository/src/lib.rs → goldboot/src/repo/lib.rs