This commit is contained in:
vcoppe committed 2026-10-14 08:51:38 +02:00
1 parent ce8398f749
commit 41b9116c6a
60 files changed
+7525 -340

No files matched your search

+107
View File
@@ -0,0 +1,107 @@
//! The state the commands share: the engine, and the settings of the frontend.
//!
//! The engine is not `Send` (it shares its data with `Rc`), so it lives on a thread of its own and
//! the commands send it jobs: they are done one after the other, in the order they were sent.
use std::collections::BTreeMap;
use std::sync::mpsc::{self, Sender};
use std::sync::{Mutex, MutexGuard};
use std::thread;
use gpx_engine::{Action, Engine};
use crate::dto::Outcome;
type Job = Box<dyn FnOnce(&mut Engine) + Send>;
/// What the commands talk to. The engine is the same as in the browser (`gpx-rs`); here it lives in
/// the process of the app, and the frontend reaches it through the commands only.
pub struct AppState {
jobs: Mutex<Sender<Job>>,
/// The settings of the frontend, as JSON strings by key.
settings: Mutex<BTreeMap<String, String>>,
}
impl Default for AppState {
fn default() -> Self {
let (jobs, receiver) = mpsc::channel::<Job>();
thread::Builder::new()
.name("engine".into())
.spawn(move || {
let mut engine = Engine::default();
while let Ok(job) = receiver.recv() {
job(&mut engine);
}
})
.expect("the engine thread could not be started");
Self {
jobs: Mutex::new(jobs),
settings: Mutex::default(),
}
}
}
impl AppState {
/// Runs `f` on the engine and waits for its result.
pub fn run<T: Send + 'static>(&self, f: impl FnOnce(&mut Engine) -> T + Send + 'static) -> T {
let (reply, result) = mpsc::channel();
let job: Job = Box::new(move |engine| {
let _ = reply.send(f(engine));
});
self.jobs
.lock()
.unwrap()
.send(job)
.expect("the engine thread stopped");
result.recv().expect("the engine thread stopped")
}
/// Reads from the engine.
pub fn read<T: Send + 'static>(&self, f: impl FnOnce(&Engine) -> T + Send + 'static) -> T {
self.run(move |engine| f(engine))
}
pub fn settings(&self) -> MutexGuard<'_, BTreeMap<String, String>> {
self.settings.lock().unwrap()
}
}
/// Executes an action and tells what it did, see `Outcome`.
pub fn execute(engine: &mut Engine, action: Action) -> Outcome {
match engine.execute(action) {
Ok(outcome) => Outcome::new(&outcome, None),
Err(error) => Outcome::failed(error.to_string()),
}
}
/// Executes an action on the engine. The values the action uses are moved to the engine thread.
macro_rules! act {
($state:expr, $action:expr) => {
$state.run(move |engine| $crate::state::execute(engine, $action))
};
}
/// Executes a command (the command can borrow what it uses).
macro_rules! edit {
($state:expr, $command:expr) => {
act!($state, ::gpx_engine::Action::Edit($command))
};
}
/// Like `edit!`, but does nothing if the selection is not the one of `revision` anymore (the
/// indices of the routing buffers only mean something for their revision).
macro_rules! edit_at {
($state:expr, $revision:expr, $command:expr) => {{
let revision = $revision;
$state.run(move |engine| {
if engine.routing().revision != revision {
return $crate::dto::Outcome::failed(
"the selection changed since the routing buffers were read",
);
}
$crate::state::execute(engine, ::gpx_engine::Action::Edit($command))
})
}};
}
pub(crate) use {act, edit, edit_at};