diff --git a/Cargo.lock b/Cargo.lock index c30de9a33..0dec63c8b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4381,6 +4381,7 @@ dependencies = [ name = "ruffle_frontend_utils" version = "0.1.0" dependencies = [ + "ruffle_core", "tempfile", "thiserror", "toml_edit 0.22.9", diff --git a/desktop/src/backends.rs b/desktop/src/backends.rs index d81793337..f01e38f34 100644 --- a/desktop/src/backends.rs +++ b/desktop/src/backends.rs @@ -2,12 +2,10 @@ mod audio; mod external_interface; mod fscommand; mod navigator; -mod storage; mod ui; pub use audio::CpalAudioBackend; pub use external_interface::DesktopExternalInterfaceProvider; pub use fscommand::DesktopFSCommandProvider; pub use navigator::ExternalNavigatorBackend; -pub use storage::DiskStorageBackend; pub use ui::DesktopUiBackend; diff --git a/desktop/src/preferences/storage.rs b/desktop/src/preferences/storage.rs index 8119b380c..aa4b8978d 100644 --- a/desktop/src/preferences/storage.rs +++ b/desktop/src/preferences/storage.rs @@ -1,5 +1,6 @@ -use crate::{backends::DiskStorageBackend, player::PlayerOptions}; +use crate::player::PlayerOptions; use ruffle_core::backend::storage::MemoryStorageBackend; +use ruffle_frontend_utils::backends::storage::DiskStorageBackend; use std::str::FromStr; #[derive(clap::ValueEnum, Copy, Clone, PartialEq, Eq, Debug, Default)] diff --git a/frontend-utils/Cargo.toml b/frontend-utils/Cargo.toml index 4b4550591..4941547ff 100644 --- a/frontend-utils/Cargo.toml +++ b/frontend-utils/Cargo.toml @@ -17,6 +17,7 @@ tracing = { workspace = true } thiserror = { workspace = true } zip = "0.6.6" urlencoding = "2.1.3" +ruffle_core = { path = "../core", default-features = false } [dev-dependencies] tempfile = "3" diff --git a/frontend-utils/src/backends.rs b/frontend-utils/src/backends.rs new file mode 100644 index 000000000..30f61eb69 --- /dev/null +++ b/frontend-utils/src/backends.rs @@ -0,0 +1 @@ +pub mod storage; diff --git a/desktop/src/backends/storage.rs b/frontend-utils/src/backends/storage.rs similarity index 100% rename from desktop/src/backends/storage.rs rename to frontend-utils/src/backends/storage.rs diff --git a/frontend-utils/src/lib.rs b/frontend-utils/src/lib.rs index 9b01f304c..f31ba4cd0 100644 --- a/frontend-utils/src/lib.rs +++ b/frontend-utils/src/lib.rs @@ -3,6 +3,8 @@ pub mod bundle; pub mod parse; pub mod write; +pub mod backends; + use std::borrow::Cow; use url::Url;