trait TimerAutoSplitterSettings

Author: AlexKnauth

src/auto_splitting/mod.rs

@@ -542,7 +542,7 @@
 //! - There is no threading.
 
 use crate::{
-    event::{self, TimerQuery},
+    event::{self, TimerAutoSplitterSettings, TimerQuery},
     platform::Arc,
     timing::TimerPhase,
 };
@@ -599,13 +599,15 @@ impl<T> Drop for Runtime<T> {
     }
 }
 
-impl<T: event::CommandSink + TimerQuery + Send + 'static> Default for Runtime<T> {
+impl<T: event::CommandSink + TimerQuery + TimerAutoSplitterSettings + Send + 'static> Default
+    for Runtime<T>
+{
     fn default() -> Self {
         Self::new()
     }
 }
 
-impl<T: event::CommandSink + TimerQuery + Send + 'static> Runtime<T> {
+impl<T: event::CommandSink + TimerQuery + TimerAutoSplitterSettings + Send + 'static> Runtime<T> {
     /// Starts the runtime. Doesn't actually load an auto splitter until
     /// [`load`][Runtime::load] is called.
     pub fn new() -> Self {
@@ -666,8 +668,9 @@ impl<T: event::CommandSink + TimerQuery + Send + 'static> Runtime<T> {
         compiled_auto_splitter: &CompiledAutoSplitter,
         timer: T,
     ) -> Result<(), Error> {
+        let settings_map = timer.get_auto_splitter_settings();
         let auto_splitter = compiled_auto_splitter
-            .instantiate(Timer(timer), None, None)
+            .instantiate(Timer(timer), Some(settings_map), None)
             .map_err(|e| Error::LoadFailed { source: e })?;
 
         self.auto_splitter

src/event.rs

@@ -285,6 +285,16 @@ pub trait TimerQuery {
     fn get_timer(&self) -> Self::Guard<'_>;
 }
 
+#[cfg(feature = "auto-splitting")]
+/// Getting and setting the settings map for auto splitter settings.
+pub trait TimerAutoSplitterSettings {
+    /// Gets an initial settings map from the auto splitter settings.
+    fn get_auto_splitter_settings(&self) -> livesplit_auto_splitting::settings::Map;
+
+    /// Set the settings map in the parsed auto splitter settings.
+    fn set_auto_splitter_settings(&mut self, settings_map: livesplit_auto_splitting::settings::Map);
+}
+
 #[cfg(feature = "std")]
 impl CommandSink for crate::SharedTimer {
     fn start(&self) -> impl Future<Output = Result> + 'static {
@@ -507,3 +517,44 @@ impl<T: TimerQuery + ?Sized> TimerQuery for Arc<T> {
         TimerQuery::get_timer(&**self)
     }
 }
+
+#[cfg(feature = "auto-splitting")]
+impl TimerAutoSplitterSettings for crate::timing::Timer {
+    fn get_auto_splitter_settings(&self) -> livesplit_auto_splitting::settings::Map {
+        let run = self.run();
+        if let Some(p) = run.parsed_auto_splitter_settings() {
+            return p.custom_settings.clone();
+        }
+        livesplit_auto_splitting::settings::Map::new()
+    }
+
+    fn set_auto_splitter_settings(
+        &mut self,
+        settings_map: livesplit_auto_splitting::settings::Map,
+    ) {
+        if self.run().parsed_auto_splitter_settings().is_none() && settings_map.is_empty() {
+            return;
+        }
+        self.set_run_auto_splitter_settings(settings_map);
+    }
+}
+
+#[cfg(feature = "auto-splitting")]
+impl TimerAutoSplitterSettings for crate::SharedTimer {
+    fn get_auto_splitter_settings(&self) -> livesplit_auto_splitting::settings::Map {
+        let Ok(t) = self.read() else {
+            return livesplit_auto_splitting::settings::Map::new();
+        };
+        t.get_auto_splitter_settings()
+    }
+
+    fn set_auto_splitter_settings(
+        &mut self,
+        settings_map: livesplit_auto_splitting::settings::Map,
+    ) {
+        let Ok(mut t) = self.write() else {
+            return;
+        };
+        t.set_auto_splitter_settings(settings_map);
+    }
+}

src/run/mod.rs

@@ -349,6 +349,25 @@ impl Run {
         &mut self.parsed_auto_splitter_settings
     }
 
+    /// Set the settings map in the parsed auto splitter settings.
+    #[cfg(feature = "auto-splitting")]
+    pub fn set_auto_splitter_settings(
+        &mut self,
+        settings_map: livesplit_auto_splitting::settings::Map,
+    ) {
+        let p = self.parsed_auto_splitter_settings_mut();
+        match p {
+            None => {
+                let mut a = AutoSplitterSettings::default();
+                a.set_custom_settings(settings_map);
+                *p = Some(a);
+            }
+            Some(a) => {
+                a.set_custom_settings(settings_map);
+            }
+        }
+    }
+
     /// Accesses the [`LinkedLayout`] of this `Run`. If a
     /// [`Layout`](crate::Layout) is linked, it is supposed to be loaded to
     /// visualize the `Run`.

src/timing/timer/mod.rs

@@ -168,6 +168,15 @@ impl Timer {
         &self.run
     }
 
+    /// Set the settings map in the parsed auto splitter settings.
+    #[cfg(feature = "auto-splitting")]
+    pub fn set_run_auto_splitter_settings(
+        &mut self,
+        settings_map: livesplit_auto_splitting::settings::Map,
+    ) {
+        self.run.set_auto_splitter_settings(settings_map);
+    }
+
     /// Marks the Run as unmodified, so that it is known that all the changes
     /// have been saved.
     #[inline]