diff --git a/Cargo.lock b/Cargo.lock index b2094a1..b5b939f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -38,6 +38,12 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" +[[package]] +name = "bitflags" +version = "2.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394" + [[package]] name = "bumpalo" version = "3.19.0" @@ -52,18 +58,19 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "cc" -version = "1.2.30" +version = "1.2.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deec109607ca693028562ed836a5f1c4b8bd77755c4e132fc5ce11b0b6211ae7" +checksum = "5252b3d2648e5eedbc1a6f501e3c795e07025c1e93bbf8bbdd6eef7f447a6d54" dependencies = [ + "find-msvc-tools", "shlex", ] [[package]] name = "cfg-if" -version = "1.0.1" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268" +checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9" [[package]] name = "chrono" @@ -73,17 +80,15 @@ checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d" dependencies = [ "android-tzdata", "iana-time-zone", - "js-sys", "num-traits", - "wasm-bindgen", - "windows-link", + "windows-link 0.1.3", ] [[package]] name = "clap" -version = "4.5.42" +version = "4.5.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed87a9d530bb41a67537289bafcac159cb3ee28460e0a4571123d2a778a6a882" +checksum = "7eac00902d9d136acd712710d71823fb8ac8004ca445a89e73a41d45aa712931" dependencies = [ "clap_builder", "clap_derive", @@ -91,9 +96,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.42" +version = "4.5.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64f4f3f3c77c94aff3c7e9aac9a2ca1974a5adf392a8bb751e827d6d127ab966" +checksum = "2ad9bbf750e73b5884fb8a211a9424a1906c1e156724260fdae972f31d70e1d6" dependencies = [ "anstyle", "clap_lex", @@ -101,9 +106,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.41" +version = "4.5.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef4f52386a59ca4c860f7393bcf8abd8dfd91ecccc0f774635ff68e92eeef491" +checksum = "bbfd7eae0b0f1a6e63d4b13c9c478de77c2eb546fba158ad50b4203dc24b9f9c" dependencies = [ "heck", "proc-macro2", @@ -124,11 +129,40 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] -name = "fennec-tricks" +name = "dirs" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.61.0", +] + +[[package]] +name = "find-msvc-tools" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fd99930f64d146689264c637b5af2f0233a933bef0d8570e2526bf9e083192d" + +[[package]] +name = "fire-tricks" version = "0.1.0" dependencies = [ "chrono", "clap", + "dirs", + "libmarshm", "minreq", "regashii", "serde", @@ -178,9 +212,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.77" +version = "0.3.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" +checksum = "0c0b063578492ceec17683ef2f8c5e89121fbd0b172cbc280635ab7567db2738" dependencies = [ "once_cell", "wasm-bindgen", @@ -188,15 +222,32 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.174" +version = "0.2.175" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776" +checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543" + +[[package]] +name = "libmarshm" +version = "0.1.0" +dependencies = [ + "dirs", +] + +[[package]] +name = "libredox" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "391290121bad3d37fbddad76d8f5d1c1c314cfc646d143d7e07a3086ddff0ce3" +dependencies = [ + "bitflags", + "libc", +] [[package]] name = "log" -version = "0.4.27" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" +checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" [[package]] name = "memchr" @@ -212,11 +263,10 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "minreq" -version = "2.14.0" +version = "2.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84885312a86831bff4a3cb04a1e54a3f698407e3274c83249313f194d3e0b678" +checksum = "05015102dad0f7d61691ca347e9d9d9006685a64aefb3d79eecf62665de2153d" dependencies = [ - "log", "rustls", "rustls-webpki", "urlencoding", @@ -248,6 +298,12 @@ version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + [[package]] name = "proc-macro2" version = "1.0.95" @@ -266,6 +322,17 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "redox_users" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac" +dependencies = [ + "getrandom", + "libredox", + "thiserror 2.0.16", +] + [[package]] name = "regashii" version = "0.4.0" @@ -274,15 +341,15 @@ checksum = "6e09a62e9c71f2e75cfce6dfdf007c2a40168d5bd762d1f7ef6ed60144f37f67" dependencies = [ "nom", "regex", - "thiserror", + "thiserror 1.0.69", "utf16string", ] [[package]] name = "regex" -version = "1.11.1" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +checksum = "23d7fd106d8c02486a8d64e778353d1cffe08ce79ac2e82f540c86d0facf6912" dependencies = [ "aho-corasick", "memchr", @@ -292,9 +359,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" +checksum = "6b9458fa0bfeeac22b5ca447c63aaf45f28439a709ccd244698632f9aa6394d6" dependencies = [ "aho-corasick", "memchr", @@ -303,9 +370,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" +checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001" [[package]] name = "ring" @@ -318,7 +385,7 @@ dependencies = [ "getrandom", "libc", "untrusted", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -345,9 +412,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.21" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] name = "sct" @@ -411,7 +478,16 @@ version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3467d614147380f2e4e374161426ff399c91084acd2363eaf549172b3d5e60c0" +dependencies = [ + "thiserror-impl 2.0.16", ] [[package]] @@ -425,11 +501,22 @@ dependencies = [ "syn", ] +[[package]] +name = "thiserror-impl" +version = "2.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c5e1be1c48b9172ee610da68fd9cd2770e7a4056cb3fc98710ee6906f0c7960" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "toml" -version = "0.9.2" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed0aee96c12fa71097902e0bb061a5e1ebd766a6636bb605ba401c45c1650eac" +checksum = "75129e1dc5000bfbaa9fee9d1b21f974f9fbad9daec557a521ee6e080825f6e8" dependencies = [ "serde", "serde_spanned", @@ -449,9 +536,9 @@ dependencies = [ [[package]] name = "toml_parser" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97200572db069e74c512a14117b296ba0a80a30123fbbb5aa1f4a348f639ca30" +checksum = "b551886f449aa90d4fe2bdaa9f4a2577ad2dde302c61ecf262d80b116db95c10" dependencies = [ "winnow", ] @@ -491,21 +578,22 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] name = "wasm-bindgen" -version = "0.2.100" +version = "0.2.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" +checksum = "7e14915cadd45b529bb8d1f343c4ed0ac1de926144b746e2710f9cd05df6603b" dependencies = [ "cfg-if", "once_cell", "rustversion", "wasm-bindgen-macro", + "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.100" +version = "0.2.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" +checksum = "e28d1ba982ca7923fd01448d5c30c6864d0a14109560296a162f80f305fb93bb" dependencies = [ "bumpalo", "log", @@ -517,9 +605,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.100" +version = "0.2.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" +checksum = "7c3d463ae3eff775b0c45df9da45d68837702ac35af998361e2c84e7c5ec1b0d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -527,9 +615,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.100" +version = "0.2.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" +checksum = "7bb4ce89b08211f923caf51d527662b75bdc9c9c7aab40f86dcb9fb85ac552aa" dependencies = [ "proc-macro2", "quote", @@ -540,9 +628,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.100" +version = "0.2.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +checksum = "f143854a3b13752c6950862c906306adb27c7e839f7414cec8fea35beab624c1" dependencies = [ "unicode-ident", ] @@ -561,7 +649,7 @@ checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" dependencies = [ "windows-implement", "windows-interface", - "windows-link", + "windows-link 0.1.3", "windows-result", "windows-strings", ] @@ -594,13 +682,19 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" +[[package]] +name = "windows-link" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65" + [[package]] name = "windows-result" version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" dependencies = [ - "windows-link", + "windows-link 0.1.3", ] [[package]] @@ -609,7 +703,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" dependencies = [ - "windows-link", + "windows-link 0.1.3", ] [[package]] @@ -621,6 +715,15 @@ dependencies = [ "windows-targets", ] +[[package]] +name = "windows-sys" +version = "0.61.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e201184e40b2ede64bc2ea34968b28e33622acdbbf37104f0e4a33f7abe657aa" +dependencies = [ + "windows-link 0.2.0", +] + [[package]] name = "windows-targets" version = "0.52.6" @@ -687,6 +790,6 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.7.12" +version = "0.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3edebf492c8125044983378ecb5766203ad3b4c2f7a922bd7dd207f6d443e95" +checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf" diff --git a/Cargo.toml b/Cargo.toml index 820519d..4fb8dfe 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,24 @@ [workspace] resolver = "3" -members = [ - "apps/fennec-tricks" -] +members = ["apps/fire-tricks", "apps/libmarshm"] + + +[workspace.dependencies] +regashii = { version = "0.4.0", default-features = false } +toml = { version = "0.9.2", default-features = false, features = [ + "parse", + "serde", +] } +serde = { version = "1.0.219", default-features = false, features = ["derive"] } +clap = { version = "4.5.42", default-features = false, features = [ + "derive", + "std", + "help", +] } +minreq = { version = "2.14.0", default-features = false, features = [ + "urlencoding", + "https", +] } +chrono = { version = "0.4.41", default-features = false, features = ["clock"] } +dirs = "6.0.0" +libmarshm.path = "apps/libmarshm" diff --git a/apps/fennec-tricks/Cargo.toml b/apps/fennec-tricks/Cargo.toml deleted file mode 100644 index 7268f91..0000000 --- a/apps/fennec-tricks/Cargo.toml +++ /dev/null @@ -1,22 +0,0 @@ -[package] -name = "fennec-tricks" -version = "0.1.0" -edition = "2024" - -[dependencies] -regashii = { version = "0.4.0", default-features = false } -toml = { version = "0.9.2", default-features = false, features = [ - "parse", - "serde", -] } -serde = { version = "1.0.219", default-features = false, features = ["derive"] } -clap = { version = "4.5.42", default-features = false, features = [ - "derive", - "std", - "help", -] } -minreq = { version = "2.14.0", default-features = false, features = [ - "urlencoding", - "https", -] } -chrono = "0.4.41" diff --git a/apps/fire-tricks/Cargo.toml b/apps/fire-tricks/Cargo.toml new file mode 100644 index 0000000..671a6c4 --- /dev/null +++ b/apps/fire-tricks/Cargo.toml @@ -0,0 +1,14 @@ +[package] +name = "fire-tricks" +version = "0.1.0" +edition = "2024" + +[dependencies] +regashii.workspace = true +toml.workspace = true +serde.workspace = true +clap.workspace = true +minreq.workspace = true +dirs.workspace = true +chrono.workspace = true +libmarshm.workspace = true diff --git a/apps/fennec-tricks/src/cli_args.rs b/apps/fire-tricks/src/cli_args.rs similarity index 100% rename from apps/fennec-tricks/src/cli_args.rs rename to apps/fire-tricks/src/cli_args.rs diff --git a/apps/fennec-tricks/src/dll.rs b/apps/fire-tricks/src/dll.rs similarity index 100% rename from apps/fennec-tricks/src/dll.rs rename to apps/fire-tricks/src/dll.rs diff --git a/apps/fennec-tricks/src/main.rs b/apps/fire-tricks/src/main.rs similarity index 97% rename from apps/fennec-tricks/src/main.rs rename to apps/fire-tricks/src/main.rs index 6465440..e1bb264 100644 --- a/apps/fennec-tricks/src/main.rs +++ b/apps/fire-tricks/src/main.rs @@ -1,4 +1,5 @@ use clap::Parser; +// use libmarshm::manager::init; use crate::{ cli_args::{Args, Commands, DllType, SectionType}, diff --git a/apps/fennec-tricks/src/util/download.rs b/apps/fire-tricks/src/util/download.rs similarity index 100% rename from apps/fennec-tricks/src/util/download.rs rename to apps/fire-tricks/src/util/download.rs diff --git a/apps/fennec-tricks/src/util/mod.rs b/apps/fire-tricks/src/util/mod.rs similarity index 100% rename from apps/fennec-tricks/src/util/mod.rs rename to apps/fire-tricks/src/util/mod.rs diff --git a/apps/fennec-tricks/src/values/functionality.rs b/apps/fire-tricks/src/values/functionality.rs similarity index 100% rename from apps/fennec-tricks/src/values/functionality.rs rename to apps/fire-tricks/src/values/functionality.rs diff --git a/apps/fennec-tricks/src/values/mod.rs b/apps/fire-tricks/src/values/mod.rs similarity index 100% rename from apps/fennec-tricks/src/values/mod.rs rename to apps/fire-tricks/src/values/mod.rs diff --git a/apps/fennec-tricks/src/values/serialization.rs b/apps/fire-tricks/src/values/serialization.rs similarity index 100% rename from apps/fennec-tricks/src/values/serialization.rs rename to apps/fire-tricks/src/values/serialization.rs diff --git a/apps/fennec-tricks/values.toml b/apps/fire-tricks/values.toml similarity index 100% rename from apps/fennec-tricks/values.toml rename to apps/fire-tricks/values.toml diff --git a/apps/libmarshm/Cargo.toml b/apps/libmarshm/Cargo.toml new file mode 100644 index 0000000..b5f8b0e --- /dev/null +++ b/apps/libmarshm/Cargo.toml @@ -0,0 +1,7 @@ +[package] +name = "libmarshm" +version = "0.1.0" +edition = "2024" + +[dependencies] +dirs.workspace = true diff --git a/apps/libmarshm/src/config.rs b/apps/libmarshm/src/config.rs new file mode 100644 index 0000000..33f5be1 --- /dev/null +++ b/apps/libmarshm/src/config.rs @@ -0,0 +1,3 @@ +pub struct CampfireConfig { + +} diff --git a/apps/libmarshm/src/lib.rs b/apps/libmarshm/src/lib.rs new file mode 100644 index 0000000..c10573f --- /dev/null +++ b/apps/libmarshm/src/lib.rs @@ -0,0 +1,13 @@ +pub mod config; +pub mod manager; +pub mod structure; + +#[cfg(test)] +mod tests { + use crate::manager::init; + + #[test] + fn init_test() { + init(); + } +} diff --git a/apps/libmarshm/src/manager.rs b/apps/libmarshm/src/manager.rs new file mode 100644 index 0000000..c554c14 --- /dev/null +++ b/apps/libmarshm/src/manager.rs @@ -0,0 +1,44 @@ +use std::{ + fs::create_dir_all, + path::PathBuf, + process::{Command, Stdio}, + sync::LazyLock, +}; + +use crate::structure::Marshmallow; + +pub static MARSHMALLOW_PATH: LazyLock = + LazyLock::new(|| dirs::data_dir().unwrap().join("campire/marshmallows")); + +pub fn init() { + create_paths(&MARSHMALLOW_PATH); + roast(Marshmallow::new("TestMarsh")); +} + +pub fn roast(marshmallow: Marshmallow) { + create_prefix(marshmallow.path, marshmallow.arch); +} + +pub fn create_prefix(path: PathBuf, arch: u32) { + match Command::new("sh") + .arg("-c") + .arg("wineboot -i") + .env("WINEPREFIX", path.to_str().unwrap()) + .env("WINEARCH", format!("win{arch}")) + .stdout(Stdio::inherit()) + .stderr(Stdio::inherit()) + .output() + { + Ok(_) => {} + Err(err) => eprintln!("Failed to create prefix: {err}"), + }; +} + +fn create_paths(root_dir: &PathBuf) { + if !root_dir.exists() { + match create_dir_all(root_dir) { + Ok(_) => {} + Err(err) => eprintln!("Failed to create root directory: {err}"), + }; + } +} diff --git a/apps/libmarshm/src/structure.rs b/apps/libmarshm/src/structure.rs new file mode 100644 index 0000000..1c2d96c --- /dev/null +++ b/apps/libmarshm/src/structure.rs @@ -0,0 +1,21 @@ +use std::path::PathBuf; + +use crate::manager; + +pub struct Marshmallow { + pub id: u32, + pub name: String, + pub arch: u32, + pub path: PathBuf, +} + +impl Marshmallow { + pub fn new(name: &str) -> Self { + Marshmallow { + id: 1, + name: name.to_string(), + arch: 64, + path: manager::MARSHMALLOW_PATH.join(name), + } + } +} diff --git a/flake.nix b/flake.nix index a9b50fb..6154433 100644 --- a/flake.nix +++ b/flake.nix @@ -23,7 +23,7 @@ pkgs.mkShell { packages = with pkgs; [ gcc - wineWow64Packages.full + wineWow64Packages.stagingFull openssl pkg-config ];