Pass sketch file based on python file being executed

Clean up debug statements

Remove unused code

Author: catilac

crates/processing_pyo3/examples/rectangle.py

@@ -7,8 +7,8 @@ def draw():
     background(220)
 
     fill(255, 0, 100)
-    stroke(0)
-    stroke_weight(2)
+    stroke(1)
+    stroke_weight(25)
     rect(100, 100, 200, 150)
 
 # TODO: this should happen implicitly on module load somehow

crates/processing_pyo3/src/graphics.rs

@@ -120,17 +120,18 @@ impl Drop for Graphics {
 #[pymethods]
 impl Graphics {
     #[new]
-    pub fn new(width: u32, height: u32, asset_path: &str) -> PyResult<Self> {
+    pub fn new(
+        width: u32,
+        height: u32,
+        asset_path: &str,
+        sketch_root_path: &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(
-            // TODO: this needs to be handed to us by python
-            ConfigKey::SketchRootPath,
-            "/home/moon/Code/libprocessing/crates/processing_pyo3/examples".to_string(),
-        );
+        config.set(ConfigKey::SketchRootPath, sketch_root_path.to_string());
         init(config).map_err(|e| PyRuntimeError::new_err(format!("{e}")))?;
 
         let surface = glfw_ctx
@@ -160,10 +161,6 @@ impl Graphics {
                 source: "".to_string(),
             }),
         }
-
-        // Ok(Sketch {
-        //     source: sketch.unwrap().source,
-        // })
     }
 
     pub fn background(&self, args: Vec<f32>) -> PyResult<()> {

crates/processing_pyo3/src/lib.rs

@@ -71,11 +71,30 @@ fn get_asset_root() -> PyResult<String> {
     })
 }
 
+fn get_sketch_root() -> 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 dirname = path.getattr("dirname")?.call1((filename,))?;
+        let abspath = path.getattr("abspath")?.call1((dirname,))?;
+        Ok(abspath.to_string())
+    })
+}
+
 #[pyfunction]
 #[pyo3(pass_module)]
 fn size(module: &Bound<'_, PyModule>, width: u32, height: u32) -> PyResult<()> {
     let asset_path: String = get_asset_root()?;
-    let graphics = Graphics::new(width, height, asset_path.as_str())?;
+    let sketch_root_path: String = get_sketch_root()?;
+    let graphics = Graphics::new(
+        width,
+        height,
+        asset_path.as_str(),
+        sketch_root_path.as_str(),
+    )?;
     module.setattr("_graphics", graphics)?;
     Ok(())
 }

crates/processing_render/src/lib.rs

@@ -224,7 +224,6 @@ fn create_app(config: Config) -> App {
     }
 
     if let Some(sketch_path) = config.get(ConfigKey::SketchRootPath) {
-        println!("DEBUG SKETCH PATH = {sketch_path}");
         app.register_asset_source(
             "sketch_directory",
             AssetSourceBuilder::platform_default(sketch_path, None),

crates/processing_render/src/sketch.rs

@@ -9,20 +9,14 @@ use bevy::{
 };
 use std::path::Path;
 
-#[derive(Resource)]
-struct SketchNeedsReload(bool);
-
 /// Plugin that registers the Sketch asset type and its loader.
 pub struct LivecodePlugin;
 
 impl Plugin for LivecodePlugin {
     fn build(&self, app: &mut App) {
         app.init_asset::<Sketch>()
             .init_asset_loader::<SketchLoader>()
-            // TODO: this could be switched to Message
-            .insert_resource(SketchNeedsReload(false))
             .add_systems(PreStartup, load_current_sketch);
-        // .add_systems(Update, sketch_update_handler);
     }
 }
 
@@ -33,35 +27,21 @@ pub fn sketch_update_handler(
 ) -> Option<Sketch> {
     for event in events.read() {
         match event {
-            AssetEvent::Added { id } => {
-                info!("Added: {id}")
-            }
             AssetEvent::Modified { id } => {
                 info!("Modified: {id}");
-                // we want to emit some event to bevy??
-                // needs_reload.0 = true;
                 if let Some(sketch) = sketches.get(*id) {
                     let sketch = sketch.clone();
                     return Some(sketch);
                 }
             }
-            AssetEvent::Removed { id } => {
-                info!("Removed: {id}")
-            }
-            AssetEvent::Unused { id } => {
-                info!("Unused: {id}")
-            }
-            AssetEvent::LoadedWithDependencies { id } => {
-                info!("LoadedWithDependencies: {id}")
-            }
+            _ => (),
         }
     }
 
     None
 }
 
 fn load_current_sketch(mut commands: Commands, asset_server: Res<AssetServer>) {
-    info!("DEBUG: calling load_current_sketch");
     let path = Path::new("rectangle.py");
     let source = AssetSourceId::from("sketch_directory");
     let asset_path = AssetPath::from_path(path).with_source(source);