chore: yet more rust code cleanups

- move the run module under interpreter::run
- improved handling of optional paths to gui open window
- rename gui::setup to gui::new_window

Signed-off-by: Nick Mitchell <[email protected]>

Author: starpit

pdl-live-react/src-tauri/src/cli/setup.rs renamed to pdl-live-react/src-tauri/src/cli.rs

@@ -3,12 +3,12 @@ use ::std::path::Path;
 use tauri_plugin_cli::CliExt;
 use urlencoding::encode;
 
-use crate::cli::run;
 use crate::compile;
-use crate::gui::setup as gui_setup;
+use crate::gui::new_window;
+use crate::interpreter::run::run_pdl_program;
 
 #[cfg(desktop)]
-pub fn cli(app: &mut tauri::App) -> Result<bool, Box<dyn ::std::error::Error>> {
+pub fn setup(app: &mut tauri::App) -> Result<bool, Box<dyn ::std::error::Error>> {
     app.handle().plugin(tauri_plugin_cli::init())?;
 
     // `matches` here is a Struct with { args, subcommand }.
@@ -49,7 +49,7 @@ pub fn cli(app: &mut tauri::App) -> Result<bool, Box<dyn ::std::error::Error>> {
                 _ => Err(Box::from("Unsupported compile command")),
             }
         }
-        "run" => run::run_pdl_program(
+        "run" => run_pdl_program(
             subcommand_args
                 .get("source")
                 .and_then(|a| a.value.as_str())
@@ -59,19 +59,14 @@ pub fn cli(app: &mut tauri::App) -> Result<bool, Box<dyn ::std::error::Error>> {
             subcommand_args.get("stream").and_then(|a| a.value.as_str()),
         )
         .and_then(|()| Ok(true)),
-        "view" => gui_setup(
+        "view" => new_window(
             app.handle().clone(),
-            subcommand_args
-                .get("trace")
-                .and_then(|a| {
-                    Some(
-                        Path::new("#/local")
-                            .join(encode(&a.value.as_str().expect("trace arg is string")).as_ref())
-                            .display()
-                            .to_string(),
-                    )
-                })
-                .expect("valid positional trace arg"),
+            subcommand_args.get("trace").and_then(|a| {
+                Some(
+                    Path::new("#/local")
+                        .join(encode(&a.value.as_str().expect("trace arg is string")).as_ref()),
+                )
+            }),
         )
         .and_then(|()| Ok(false)),
         _ => Err(Box::from("Unsupported command")),

pdl-live-react/src-tauri/src/cli/mod.rs

@@ -1,10 +1,18 @@
+use ::std::path::PathBuf;
 use tauri::WebviewWindowBuilder;
 
-pub fn setup(app: tauri::AppHandle, path: String) -> Result<(), Box<dyn ::std::error::Error>> {
-    WebviewWindowBuilder::new(&app, "main", tauri::WebviewUrl::App(path.into()))
-        .title("Prompt Declaration Language")
-        .zoom_hotkeys_enabled(true)
-        .inner_size(1400.0, 1050.0)
-        .build()?;
+pub fn new_window(
+    app: tauri::AppHandle,
+    path: Option<PathBuf>,
+) -> Result<(), Box<dyn ::std::error::Error>> {
+    WebviewWindowBuilder::new(
+        &app,
+        "main",
+        tauri::WebviewUrl::App(path.unwrap_or("".into())),
+    )
+    .title("Prompt Declaration Language")
+    .zoom_hotkeys_enabled(true)
+    .inner_size(1400.0, 1050.0)
+    .build()?;
     Ok(())
 }

pdl-live-react/src-tauri/src/gui.rs

@@ -3,4 +3,5 @@ pub mod extract;
 pub mod pip;
 pub mod pull;
 pub mod requirements;
+pub mod run;
 pub mod shasum;

pdl-live-react/src-tauri/src/interpreter/mod.rs

@@ -13,9 +13,9 @@ pub fn run() {
         .setup(|app| {
             // Default to GUI if the app was opened with no CLI args.
             if args_os().count() <= 1 {
-                gui::setup(app.handle().clone(), "".to_owned())
+                gui::new_window(app.handle().clone(), None)
             } else {
-                match cli::setup::cli(app) {
+                match cli::setup(app) {
                     Ok(true) => ::std::process::exit(0), // success with CLI
                     Ok(false) => Ok(()), // instead, open GUI (fallthrough to the logic below)
                     Err(s) => {