Pass sketch filename to Sketch

Author: catilac

crates/processing_pyo3/src/graphics.rs

@@ -125,13 +125,15 @@ impl Graphics {
         height: u32,
         asset_path: &str,
         sketch_root_path: &str,
+        sketch_file_name: &str,
     ) -> PyResult<Self> {
         let glfw_ctx =
             GlfwContext::new(width, height).map_err(|e| PyRuntimeError::new_err(format!("{e}")))?;
 
         let mut config = Config::new();
         config.set(ConfigKey::AssetRootPath, asset_path.to_string());
         config.set(ConfigKey::SketchRootPath, sketch_root_path.to_string());
+        config.set(ConfigKey::SketchFileName, sketch_file_name.to_string());
         init(config).map_err(|e| PyRuntimeError::new_err(format!("{e}")))?;
 
         let surface = glfw_ctx

crates/processing_pyo3/src/lib.rs

@@ -14,7 +14,6 @@ mod graphics;
 use graphics::{Geometry, Graphics, Image, Topology, get_graphics, get_graphics_mut};
 use pyo3::{
     exceptions::PyRuntimeError,
-    ffi::c_str,
     prelude::*,
     types::{PyDict, PyTuple},
 };
@@ -84,16 +83,30 @@ fn get_sketch_root() -> PyResult<String> {
     })
 }
 
+fn get_sketch_filename() -> PyResult<String> {
+    Python::attach(|py| {
+        let sys = PyModule::import(py, "sys")?;
+        let argv: Vec<String> = sys.getattr("argv")?.extract()?;
+        let filename: &str = argv[0].as_str();
+        let os = PyModule::import(py, "os")?;
+        let path = os.getattr("path")?;
+        let basename = path.getattr("basename")?.call1((filename,))?;
+        Ok(basename.to_string())
+    })
+}
+
 #[pyfunction]
 #[pyo3(pass_module)]
 fn size(module: &Bound<'_, PyModule>, width: u32, height: u32) -> PyResult<()> {
     let asset_path: String = get_asset_root()?;
     let sketch_root_path: String = get_sketch_root()?;
+    let sketch_filename: String = get_sketch_filename()?;
     let graphics = Graphics::new(
         width,
         height,
         asset_path.as_str(),
         sketch_root_path.as_str(),
+        sketch_filename.as_str(),
     )?;
     module.setattr("_graphics", graphics)?;
     Ok(())

crates/processing_render/src/config.rs

@@ -9,6 +9,7 @@ use std::collections::HashMap;
 pub enum ConfigKey {
     AssetRootPath,
     SketchRootPath,
+    SketchFileName,
 }
 
 // TODO: Consider Box<dyn Any> instead of String

crates/processing_render/src/sketch.rs

@@ -9,6 +9,8 @@ use bevy::{
 };
 use std::path::Path;
 
+use crate::config::{Config, ConfigKey};
+
 /// Plugin that registers the Sketch asset type and its loader.
 pub struct LivecodePlugin;
 
@@ -41,8 +43,15 @@ pub fn sketch_update_handler(
     None
 }
 
-fn load_current_sketch(mut commands: Commands, asset_server: Res<AssetServer>) {
-    let path = Path::new("rectangle.py");
+fn load_current_sketch(
+    mut commands: Commands,
+    asset_server: Res<AssetServer>,
+    config: Res<Config>,
+) {
+    let filename = config
+        .get(ConfigKey::SketchFileName)
+        .expect("SketchFileName not set");
+    let path = Path::new(filename);
     let source = AssetSourceId::from("sketch_directory");
     let asset_path = AssetPath::from_path(path).with_source(source);
     let sketch_handle: Handle<Sketch> = asset_server.load(asset_path);