From fc423c5f9edfa3bc561180ab2d2771c30cef2a19 Mon Sep 17 00:00:00 2001
From: Alex Knauth <alexander@knauth.org>
Date: Sat, 3 Feb 2024 23:53:58 -0500
Subject: [PATCH] Add TimingMethod to legacy XML (#46)

* legacy_xml asr_settings_from_xml_nodes

* legacy_xml asr_list_from_splits

* legacy_xml: remove splits_from_xml_nodes

* Parse TimingMethod in legacy_xml

* Add TimingMethod to legacy XML examples
---
 splits-direct.lss             |  1 +
 src/AutoSplitterSettings.txt  |  1 +
 src/auto_splitter_settings.rs | 19 +++----------------
 src/legacy_xml.rs             | 33 +++++++++++++++++++++++++++------
 src/settings_gui.rs           |  8 +++++---
 5 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/splits-direct.lss b/splits-direct.lss
index fa02e8b9..34ba815a 100644
--- a/splits-direct.lss
+++ b/splits-direct.lss
@@ -178,5 +178,6 @@
       <Split>MaskFragment3</Split>
       <Split>Mask1</Split>
     </Splits>
+    <TimingMethod>LoadRemovedTime</TimingMethod>
   </AutoSplitterSettings>
 </Run>
diff --git a/src/AutoSplitterSettings.txt b/src/AutoSplitterSettings.txt
index 8bd57033..4857704c 100644
--- a/src/AutoSplitterSettings.txt
+++ b/src/AutoSplitterSettings.txt
@@ -16,3 +16,4 @@
       <Split>MaskFragment3</Split>
       <Split>Mask1</Split>
     </Splits>
+    <TimingMethod>LoadRemovedTime</TimingMethod>
diff --git a/src/auto_splitter_settings.rs b/src/auto_splitter_settings.rs
index 5b7efcfe..6512f326 100644
--- a/src/auto_splitter_settings.rs
+++ b/src/auto_splitter_settings.rs
@@ -4,9 +4,7 @@ use asr::future::retry;
 use std::path::Path;
 use xmltree::{Element, XMLNode};
 
-use ugly_widget::radio_button::options_str;
-
-use crate::{file, legacy_xml, splits::Split};
+use crate::{file, legacy_xml};
 
 pub async fn wait_asr_settings_init() -> asr::settings::Map {
     let settings1 = asr::settings::Map::load();
@@ -42,19 +40,8 @@ fn asr_settings_from_xml_string(xml_string: &str) -> Option<asr::settings::Map>
 }
 
 fn asr_settings_from_xml_nodes(xml_nodes: Vec<XMLNode>) -> Option<asr::settings::Map> {
-    let splits = legacy_xml::splits_from_xml_nodes(xml_nodes)?;
-    Some(asr_settings_from_splits(&splits))
-}
-
-fn asr_settings_from_splits(splits: &[Split]) -> asr::settings::Map {
-    // new empty map, which will only include the new splits
-    let settings_map = asr::settings::Map::new();
-    let l = asr::settings::List::new();
-    for split in splits.iter() {
-        l.push(options_str(split));
-    }
-    settings_map.insert("splits", l);
-    settings_map
+    // TODO: deal with either Legacy XML or ASR XML
+    legacy_xml::asr_settings_from_xml_nodes(xml_nodes)
 }
 
 fn file_find_auto_splitter_settings<P: AsRef<Path>>(path: P) -> Option<Vec<XMLNode>> {
diff --git a/src/legacy_xml.rs b/src/legacy_xml.rs
index 020a9431..89785444 100644
--- a/src/legacy_xml.rs
+++ b/src/legacy_xml.rs
@@ -1,7 +1,29 @@
 
+use ugly_widget::radio_button::options_str;
 use xmltree::XMLNode;
 
-use crate::splits::Split;
+use crate::{settings_gui::TimingMethod, splits::Split};
+
+pub fn asr_settings_from_xml_nodes(xml_nodes: Vec<XMLNode>) -> Option<asr::settings::Map> {
+    let xml_settings = XMLSettings::from_xml_nodes(xml_nodes, &[("Splits", "Split")]);
+    let splits = splits_from_settings(&xml_settings)?;
+    // new empty map, which will only include the new splits
+    let settings_map = asr::settings::Map::new();
+    settings_map.insert("splits", asr_list_from_splits(&splits));
+    if let Some(timing_method) = xml_settings.dict_get("TimingMethod") {
+        let tm = timing_method_from_settings_str(timing_method).unwrap_or_default();
+        settings_map.insert("timing_method", options_str(&tm));
+    }
+    Some(settings_map)
+}
+
+fn asr_list_from_splits(splits: &[Split]) -> asr::settings::List {
+    let l = asr::settings::List::new();
+    for split in splits.iter() {
+        l.push(options_str(split));
+    }
+    l
+}
 
 #[derive(Clone, Debug)]
 struct XMLSettings {
@@ -79,11 +101,6 @@ impl XMLSettings {
     }
 }
 
-pub fn splits_from_xml_nodes(xml_nodes: Vec<XMLNode>) -> Option<Vec<Split>> {
-    let xml_settings = XMLSettings::from_xml_nodes(xml_nodes, &[("Splits", "Split")]);
-    splits_from_settings(&xml_settings)
-}
-
 fn splits_from_settings(s: &XMLSettings) -> Option<Vec<Split>> {
     let maybe_ordered = s.dict_get("Ordered");
     let maybe_start = s.dict_get("AutosplitStartRuns");
@@ -120,3 +137,7 @@ fn split_from_settings_split(s: XMLSettings) -> Option<Split> {
 fn split_from_settings_str(s: XMLSettings) -> Option<Split> {
     serde_json::value::from_value(serde_json::Value::String(s.as_string()?)).ok()
 }
+
+fn timing_method_from_settings_str(s: XMLSettings) -> Option<TimingMethod> {
+    serde_json::value::from_value(serde_json::Value::String(s.as_string()?)).ok()
+}
diff --git a/src/settings_gui.rs b/src/settings_gui.rs
index 741ba8e5..3849ab13 100644
--- a/src/settings_gui.rs
+++ b/src/settings_gui.rs
@@ -1,9 +1,11 @@
 use asr::{settings::gui::{FileSelect, Gui, Title, Widget}, watcher::Pair};
 
+use serde::{Deserialize, Serialize};
 use ugly_widget::{
-    ugly_list::{UglyList, UglyListArgs},
-    store::{StoreWidget, StoreGui},
     args::SetHeadingLevel,
+    radio_button::RadioButtonOptions,
+    store::{StoreWidget, StoreGui},
+    ugly_list::{UglyList, UglyListArgs}
 };
 
 use crate::{
@@ -61,7 +63,7 @@ impl SettingsGui {
     }
 }
 
-#[derive(Clone, Copy, Debug, Default, Eq, Gui, PartialEq)]
+#[derive(Clone, Copy, Debug, Default, Deserialize, Eq, Gui, Ord, PartialEq, PartialOrd, RadioButtonOptions, Serialize)]
 pub enum TimingMethod {
     /// Load Removed Time
     #[default]