v0.13.0 cli and web

Author: sameer

Cargo.lock

@@ -1,15 +1,19 @@
 [package]
 name = "svg2gcode-cli"
-version = "0.0.12"
+version = "0.0.13"
 authors = ["Sameer Puri <crates@purisa.me>"]
 edition = "2021"
 description = "Command line interface for svg2gcode"
 repository = "https://github.com/sameer/svg2gcode"
 license = "MIT"
 
 [dependencies]
-svg2gcode = { version = "0.2.3", features = ["serde"]}
-env_logger = { version = "0", default-features = false, features = ["atty", "termcolor", "humantime"] }
+svg2gcode = { version = "0.3.0", features = ["serde"] }
+env_logger = { version = "0", default-features = false, features = [
+    "atty",
+    "termcolor",
+    "humantime",
+] }
 log = "0"
 g-code = "0.4.2"
 codespan-reporting = "0.11"

cli/Cargo.toml

@@ -2,7 +2,7 @@ use g_code::{
     emit::{format_gcode_io, FormatOptions},
     parse::snippet_parser,
 };
-use log::info;
+use log::{error, info};
 use roxmltree::ParsingOptions;
 use std::{
     env,
@@ -13,7 +13,9 @@ use std::{
 use structopt::StructOpt;
 use svgtypes::LengthListParser;
 
-use svg2gcode::{svg2program, ConversionOptions, Machine, Settings, SupportedFunctionality};
+use svg2gcode::{
+    svg2program, ConversionOptions, Machine, Settings, SupportedFunctionality, Version,
+};
 
 #[derive(Debug, StructOpt)]
 #[structopt(name = "svg2gcode", author, about)]
@@ -158,6 +160,25 @@ fn main() -> io::Result<()> {
             settings.postprocess.newline_before_comment = newline_before_comment;
         }
 
+        if let Version::Unknown(ref unknown) = settings.version {
+            error!(
+                "Your settings use an unknown version. Your version: {unknown}, latest: {}. See {} to download the latest CLI version.",
+                Version::latest(),
+                env!("CARGO_PKG_REPOSITORY"),
+            );
+            std::process::exit(1);
+        }
+
+        let old_version = settings.version.clone();
+        if let Err(()) = settings.try_upgrade() {
+            error!(
+                "Your settings are out of date and require manual intervention. Your version: {old_version}, latest: {}. See {} for instructions.",
+                Version::latest(),
+                env!("CARGO_PKG_REPOSITORY"),
+            );
+            std::process::exit(1);
+        }
+
         settings
     };
 

cli/src/main.rs

@@ -1,6 +1,6 @@
 [package]
 name = "svg2gcode-web"
-version = "0.0.12"
+version = "0.0.13"
 authors = ["Sameer Puri <crates@purisa.me>"]
 edition = "2021"
 description = "Convert vector graphics to g-code for pen plotters, laser engravers, and other CNC machines"
@@ -10,7 +10,7 @@ license = "MIT"
 
 [dependencies]
 wasm-bindgen = "0.2"
-svg2gcode = { version = "0.2.3", features = ["serde"] }
+svg2gcode = { version = "0.3.0", features = ["serde"] }
 roxmltree = "0.19"
 g-code = "0.4.2"
 codespan-reporting = "0.11"

web/Cargo.toml

@@ -5,7 +5,7 @@ use gloo_file::{
 use js_sys::TypeError;
 use roxmltree::{Document, ParsingOptions};
 use std::{convert::TryInto, path::Path};
-use svg2gcode::Settings;
+use svg2gcode::{Settings, Version};
 use wasm_bindgen::JsCast;
 use wasm_bindgen_futures::JsFuture;
 use web_sys::{window, Event, FileList, HtmlElement, HtmlInputElement, Response};
@@ -267,8 +267,31 @@ pub fn import_export_modal() -> Html {
                         });
 
                     match res {
-                        Ok(settings) => {
-                            import_state.set(Some(Ok(settings)));
+                        Ok(Settings { version: Version::Unknown(unknown), .. }) => {
+                            import_state.set(Some(Err(
+                                format!(
+                                    "Your settings use an unknown version. \
+                                    Your version: {unknown}, latest: {}. \
+                                    Try refreshing this page to get the latest version of the tool.",
+                                    Version::latest(),
+                                )
+                            )));
+                        }
+                        Ok(mut settings) => {
+                            let old_version = settings.version.clone();
+                            import_state.set(Some(
+                                if let Err(()) = settings.try_upgrade() {
+                                    Err(format!(
+                                        "Your imported settings are out of date and require manual intervention. \
+                                        Your version: {old_version}, latest: {}. \
+                                        See {} for instructions.",
+                                            Version::latest(),
+                                            env!("CARGO_PKG_REPOSITORY")
+                                    ))
+                                } else {
+                                    Ok(settings)
+                                })
+                            );
                         }
                         Err(err) => {
                             import_state.set(Some(Err(err)));
@@ -284,7 +307,7 @@ pub fn import_export_modal() -> Html {
         let import_state = import_state.clone();
         let close_ref = close_ref.clone();
         app_dispatch.reduce_mut_callback(move |app| {
-            if let Some(Ok(ref settings)) = *import_state {
+            if let Some(Ok(settings)) = import_state.as_ref() {
                 app.settings = settings.clone();
                 // App only hydrates the form on start now, so need to do it again here
                 form_dispatch.reduce_mut(|form| *form = (&app.settings).into());

web/src/forms/mod.rs

@@ -38,11 +38,16 @@ fn app() -> Html {
     // Having separate stores is somewhat of an anti-pattern in Redux,
     // but there's no easy way to do hydration after the app state is
     // restored from local storage.
-    let hydrated_form = use_state(|| false);
-    if !*hydrated_form {
-        let hydrated_form_state = FormState::from(&app_store.settings);
-        form_dispatch.reduce_mut(|state| *state = hydrated_form_state);
-        hydrated_form.set(true);
+    let upgraded_settings_and_hydrated_form = use_state(|| false);
+    if !*upgraded_settings_and_hydrated_form {
+        app_dispatch.reduce_mut(|app| {
+            if let Err(_) = app.settings.try_upgrade() {
+                unreachable!("No breaking upgrades yet!")
+            }
+            let hydrated_form_state = FormState::from(&app_store.settings);
+            form_dispatch.reduce_mut(|state| *state = hydrated_form_state);
+        });
+        upgraded_settings_and_hydrated_form.set(true);
     }
 
     let generate_disabled = *generating || app_store.svgs.is_empty();

web/src/main.rs

@@ -1,7 +1,7 @@
 use serde::{Deserialize, Serialize};
 use std::{convert::TryInto, num::ParseFloatError};
 use svg2gcode::{
-    ConversionConfig, MachineConfig, PostprocessConfig, Settings, SupportedFunctionality,
+    ConversionConfig, MachineConfig, PostprocessConfig, Settings, SupportedFunctionality, Version,
 };
 use svgtypes::Length;
 use thiserror::Error;
@@ -83,6 +83,7 @@ impl<'a> TryInto<Settings> for &'a FormState {
                 line_numbers: self.line_numbers,
                 newline_before_comment: self.newline_before_comment,
             },
+            version: Version::latest(),
         })
     }
 }

web/src/state.rs

@@ -1,5 +1,5 @@
 use std::fmt::Display;
-use web_sys::{Event, FileList, HtmlInputElement, InputEvent, MouseEvent};
+use web_sys::{Event, FileList, HtmlInputElement, InputEvent, InputEventInit, MouseEvent};
 use yew::{
     classes, function_component, html, use_force_update, use_node_ref, use_state,
     virtual_dom::{VChild, VNode},
@@ -93,12 +93,15 @@ where
         trigger.force_update();
     }
 
-    if let (false, Some(default), Some(input_element)) = (
-        *applied_default_value,
-        props.default.as_ref(),
-        node_ref.cast::<HtmlInputElement>(),
-    ) {
-        input_element.set_value(&default.to_string());
+    if let (false, Some(input_element)) =
+        (*applied_default_value, node_ref.cast::<HtmlInputElement>())
+    {
+        if let Some(d) = props.default.as_ref() {
+            input_element.set_value(&d.to_string());
+            input_element
+                .dispatch_event(&InputEvent::new("input").unwrap())
+                .unwrap();
+        }
         applied_default_value.set(true);
     }
 
@@ -346,30 +349,46 @@ where
     // so the noderef becomes valid.
     let first_render = use_state(|| true);
     let trigger = use_force_update();
-    let applied_default_value = use_state(|| false);
     let node_ref = use_node_ref();
 
     if *first_render {
         first_render.set(false);
         trigger.force_update();
     }
 
-    if let (false, Some(default), Some(input_element)) = (
-        *applied_default_value,
-        props.default.as_ref(),
-        node_ref.cast::<HtmlInputElement>(),
-    ) {
-        input_element.set_value(default.as_ref());
-        applied_default_value.set(true);
+    let user_edited = use_state(|| false);
+    let last_default_value = use_state(|| None);
+    if let Some(input_element) = node_ref.cast::<HtmlInputElement>() {
+        if !*user_edited && props.default != *last_default_value {
+            if let Some(d) = props.default.as_ref() {
+                input_element.set_value(d);
+            } else {
+                input_element.set_value("");
+            }
+            let mut init = InputEventInit::new();
+            init.data(Some("ignore"));
+            input_element
+                .dispatch_event(&InputEvent::new_with_event_init_dict("input", &init).unwrap())
+                .unwrap();
+            last_default_value.set(props.default.clone());
+        }
     }
 
+    let prop_oninput = props.oninput.clone();
+    let oninput = Callback::from(move |event: InputEvent| {
+        if !event.data().map_or(false, |d| d == "ignore") {
+            prop_oninput.emit(event);
+            user_edited.set(true);
+        }
+    });
+
     html! {
         <>
             <label class="form-label" for={id.clone()}>
                 { props.label }
             </label>
             <div class={classes!(if success || error { Some("has-icon-right") } else { None })}>
-                <textarea class="form-input" id={id} oninput={props.oninput.clone()}
+                <textarea class="form-input" id={id} oninput={oninput}
                     ref={node_ref}
                     placeholder={props.placeholder.as_ref().cloned()}
                     rows={props.rows.as_ref().map(ToString::to_string)}