remove serial_hello and add logging

MrPicklePinosaur · MrPicklePinosaur · commit f6af6ffe0442 · 2024-09-10T20:27:23.000-04:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -25,6 +25,8 @@ regex = "1.10.5"
 anyhow = "1.0.86"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
+log = "0.4"
+env_logger = "0.11"
 
 [target.'cfg(target_os = "linux")'.dependencies]
 nix = { version = "0.29", features = ["fs", "process", "signal"] }
diff --git a/drive/carts/launcher.p8 b/drive/carts/launcher.p8
@@ -15,7 +15,6 @@ apps={
 
 select=0
 function _init()
-    serial_hello()
 end
 
 function _update()
diff --git a/drive/carts/main_menu.p8 b/drive/carts/main_menu.p8
@@ -17,8 +17,6 @@ app_menu=menu_new({
 
 function _init()
   app_cursor_y = target_app_cursor_y()
-
-  serial_hello()
 end
 
 function wait(a) for i = 1,a do flip() end end
diff --git a/drive/carts/os.p8 b/drive/carts/os.p8
@@ -101,7 +101,6 @@ carts=ls(cart_dir)
 labels=ls(label_dir)
 
 function _init()
-    serial_hello()
     load_label()
     poke(0x5f34,0x2) -- enabled inverted draw
 end
diff --git a/drive/carts/pexsplore.p8 b/drive/carts/pexsplore.p8
@@ -216,8 +216,6 @@ function _init()
   --for i=0,15 do pal(i,i+128,2) end
   ----memset(0x5f78,0xff,8)
 
-  serial_hello()
-
   carts=menu_new(serial_ls(cart_dir))
   labels=ls(label_dir)
   for cart in all(carts.items) do
diff --git a/drive/carts/pexsplore_home.p8 b/drive/carts/pexsplore_home.p8
@@ -37,8 +37,6 @@ function cam_scroll_tween(v_start, v_end)
 end
 
 function _init()
-  serial_hello()
-
   categories:set_wrap(false)
   categories:add_hook(6, function(self)
     cam_scroll_tween(cam_y, 0)
diff --git a/drive/carts/serial.p8 b/drive/carts/serial.p8
@@ -54,10 +54,16 @@ chan_buf_size=0x1000
 
 -- read init message (host os provides some information)
 -- see https://github.com/nlordell/p8-controller for discussion on caveats with serial read and write
+-- currently unused
 function serial_hello()
-  serial_readline()
-  serial_writeline('hello:')
-  printh('got hello message')
+  hello_msg=serial_readline()
+  -- we are using 'E' as the special placeholder message the os sends
+  if hello_msg != 'E' then
+    printh('got incorrect hello message') 
+  else
+    serial_writeline('hello:')
+    printh('got hello message')
+  end
 end
 
 function serial_ls(dir)
diff --git a/drive/carts/splashscreen.p8 b/drive/carts/splashscreen.p8
@@ -40,7 +40,7 @@ function _init()
   fade = 0
   start_time=time()
 
-  serial_hello()
+  -- serial_hello()
 end
 
 function _update()
diff --git a/drive/config.txt b/drive/config.txt
@@ -30,7 +30,7 @@ foreground_sleep_ms 2 // number of milliseconds to sleep each frame. Try 10 to c
 
 background_sleep_ms 10 // number of milliseconds to sleep each frame when running in the background
 
-sessions 6 // number of times program has been run
+sessions 11 // number of times program has been run
 
 // (scancode) hold this key down and left-click to simulate right-click
 rmb_key 0 // 0 for none  226 for LALT
diff --git a/justfile b/justfile
@@ -2,7 +2,7 @@
 default: picolauncher
 
 picolauncher:
-    cargo run --bin picolauncher
+    RUST_LOG=debug cargo run --bin picolauncher
 
 util:
     cargo run --bin p8util
diff --git a/src/main.rs b/src/main.rs
@@ -2,17 +2,18 @@ mod consts;
 mod hal;
 mod p8util;
 
-use std::process::Child;
+use std::process::Stdio;
 use std::thread; // TODO maybe switch to async
 use std::{
     collections::HashMap,
     fs::{read_dir, read_to_string, File, OpenOptions},
     io::{BufRead, BufReader, Read, Write},
     path::{Path, PathBuf},
-    process::Command,
+    process::{Child, Command},
     ptr,
     time::Duration,
 };
+use log::{debug, error, warn, info};
 
 use anyhow::anyhow;
 use consts::*;
@@ -26,7 +27,7 @@ fn parse_metadata(path: &Path) -> anyhow::Result<String> {
     let content = read_to_string(path)?;
     let table: Map<String, serde_json::Value> = serde_json::from_str(&content)?;
     let serialized = serialize_table(&table);
-    println!("serialized {serialized}");
+    debug!("serialized {serialized}");
     Ok(serialized)
 }
 
@@ -37,7 +38,7 @@ fn screenshot_watcher() {
             Ok(events) => {
                 for event in events.iter() {
                     if event.event.kind == EventKind::Create(CreateKind::File) {
-                        println!("{event:?}");
+                        debug!("{event:?}");
 
                         // TODO should do this for each path?
                         let screenshot_fullpath = event.event.paths.get(0).unwrap();
@@ -72,7 +73,8 @@ fn screenshot_watcher() {
         .watcher()
         .watch(Path::new("drive/screenshots"), RecursiveMode::Recursive)
         .unwrap();
-    println!("screenshot watcher registered");
+
+    info!("screenshot watcher registered");
 
     loop {}
 }
@@ -92,49 +94,57 @@ pub fn launch_pico8_binary(bin_names: Vec<String>) -> anyhow::Result<Child> {
                 "-o",
                 "out_pipe",
             ])
+            // .stdout(Stdio::piped())
             .spawn();
 
         match pico8_process {
             Ok(process) => return Ok(process),
-            Err(e) => eprintln!("failed launching {bin_name}: {e}"),
+            Err(e) => warn!("failed launching {bin_name}: {e}"),
         }
-
     }
     Err(anyhow!("failed to launch pico8"))
 }
 
 fn main() {
 
+    // set up logger
+    env_logger::builder()
+        .format_timestamp(None)
+        .init();
+
+    // set up screenshot watcher process
+    let screenshot_handle = thread::spawn(|| {
+        screenshot_watcher();
+    });
+
+    // launch pico8 binary
     let pico8_bin_override = std::env::var("PICO8_BINARY");
 
     #[cfg(target_os = "linux")]
     let mut pico8_bins: Vec<String> = vec!["pico8".into(), "pico8_64".into(), "pico8_dyn".into()];
 
     #[cfg(target_os = "windows")]
-    let mut pico8_bins = vec!["pico8.exe".into(), "C:\\Program Files (x86)\\PICO-8\\pico8.exe".into()];
+    let mut pico8_bins = vec![
+        "pico8.exe".into(),
+        "C:\\Program Files (x86)\\PICO-8\\pico8.exe".into(),
+    ];
 
     if let Ok(bin_override) = pico8_bin_override {
-        pico8_bins.insert(0, bin_override); 
+        pico8_bins.insert(0, bin_override);
     }
 
     // spawn pico8 process and setup pipes
     // TODO capture stdout of pico8 and log it
     let pico8_process = launch_pico8_binary(pico8_bins).expect("failed to spawn pico8 process");
     //let pico8_pid = Pid::from_raw(pico8_process.id() as i32);
 
-    // send hello message to pico8 process
-    let mut in_pipe = open_in_pipe().expect("failed to open pipe {IN_PIPE}");
-    writeln!(in_pipe, "E").expect("failed to write to pipe {IN_PIPE}");
+    // need to drop the in_pipe (for some reason) for the pico8 process to start up
+    let mut in_pipe = open_in_pipe().expect("failed to open pipe");
     drop(in_pipe);
 
-    let mut out_pipe = open_out_pipe().expect("failed to open pipe {OUT_PIPE}");
+    let mut out_pipe = open_out_pipe().expect("failed to open pipe");
     let mut reader = BufReader::new(out_pipe);
 
-    // set up environment
-    let screenshot_handle = thread::spawn(|| {
-        screenshot_watcher();
-    });
-
     // listen for commands from pico8 process
     loop {
         let mut line = String::new();
@@ -153,7 +163,7 @@ fn main() {
         let mut split = line.splitn(2, ':');
         let cmd = split.next().unwrap_or("");
         let data = split.next().unwrap_or("");
-        println!("received cmd:{cmd} data:{data}");
+        debug!("received cmd:{cmd} data:{data}");
 
         match cmd {
             // TODO disable until we port this to windows and support launching external binaries
@@ -215,17 +225,17 @@ fn main() {
                         let metapath = METADATA_DIR.join(metapath);
                         match parse_metadata(&metapath) {
                             Ok(serialized) => carts.push(serialized),
-                            Err(e) => eprintln!("failed parsing metadata file: {e:?}"),
+                            Err(e) => warn!("failed parsing metadata file: {e:?}"),
                         }
                     }
                 }
                 // TODO check efficiency for lots of files
 
                 // TODO make this pipe writing stuff better (duplicate code)
-                let mut in_pipe = open_in_pipe().expect("failed to open pipe {IN_PIPE}");
+                let mut in_pipe = open_in_pipe().expect("failed to open pipe");
                 let joined_carts = carts.join(",");
-                println!("joined carts {joined_carts}");
-                writeln!(in_pipe, "{}", joined_carts).expect("failed to write to pipe {IN_PIPE}");
+                debug!("joined carts {joined_carts}");
+                writeln!(in_pipe, "{}", joined_carts).expect("failed to write to pipe");
                 drop(in_pipe);
             },
             "label" => {
@@ -247,13 +257,17 @@ fn main() {
             },
             */
             "hello" => {
-                println!("ack hello");
+                info!("hello message acknowledged - connection established to pico8 process");
             },
             "debug" => {
-                println!("debug:{}", data);
+                info!("debug:{}", data);
+            },
+            "sys" => {
+                // Get system information like operating system, etc
+
             },
             _ => {
-                println!("unhandled command");
+                warn!("unhandled command");
             },
         }
 
