adding src_python dir to sys.path

Author: marcomq

src/lib.rs

@@ -26,6 +26,7 @@ use py_lib_pyo3 as py_lib;
 
 pub use error::{Error, Result};
 use models::*;
+use std::path::PathBuf;
 
 #[cfg(desktop)]
 use desktop::Python;
@@ -63,21 +64,14 @@ impl<R: Runtime, T: Manager<R>> crate::PythonExt<R> for T {
     }
 }
 
-fn read_main_py_from_resources<R: Runtime>(app: &AppHandle<R>) -> String {
-    let py_file_path = app
-        .path()
-        .resolve("src-python/main.py", BaseDirectory::Resource)
-        .unwrap_or_default();
-    std::fs::read_to_string(&py_file_path).unwrap_or_default()
+fn get_resource_dir<R: Runtime>(app: &AppHandle<R>) -> PathBuf {
+    app.path()
+        .resolve("src-python", BaseDirectory::Resource)
+        .unwrap_or_default()
 }
 
-fn read_main_py_from_current_dir() -> String {
-    let py_file_path = std::env::current_dir()
-        .unwrap()
-        .join("src-python")
-        .join("main.py");
-    std::fs::read_to_string(py_file_path).unwrap_or_default()
-    // include_str!(concat!(env!("PWD"),  "/src-tauri/src-python/main.py"))
+fn get_current_dir() -> PathBuf {
+    std::env::current_dir().unwrap().join("src-python")
 }
 
 /// Initializes the plugin with functions
@@ -101,17 +95,19 @@ pub fn init_and_register<R: Runtime>(python_functions: Vec<&'static str>) -> Tau
             let python = desktop::init(app, api)?;
             app.manage(python);
 
-            let mut code = read_main_py_from_resources(app);
+            let mut dir = get_resource_dir(app);
+            let mut code = std::fs::read_to_string(&dir.join("main.py")).unwrap_or_default();
             if code.is_empty() {
                 println!(
                     "Warning: 'src-tauri/main.py' seems not to be registered in 'tauri.conf.json'"
                 );
-                code = read_main_py_from_current_dir();
+                dir = get_current_dir();
+                code = std::fs::read_to_string(&dir.join("main.py")).unwrap_or_default();
             }
             if code.is_empty() {
                 println!("ERROR: Error reading 'src-tauri/main.py'");
             }
-            py_lib::init_python(code).unwrap();
+            py_lib::init_python(code, dir).unwrap();
             for function_name in python_functions {
                 py_lib::register_function_str(function_name.into(), None).unwrap();
             }

src/py_lib.rs

@@ -3,6 +3,7 @@
 //  Licensed under MIT License, see License file for more details
 //  git clone https://github.com/marcomq/tauri-plugin-python
 
+use std::path::PathBuf;
 use std::sync::atomic::AtomicBool;
 use std::{collections::HashSet, sync::Mutex};
 
@@ -23,16 +24,22 @@ lazy_static! {
     static ref GLOBALS: rustpython_vm::scope::Scope = create_globals();
 }
 
-pub fn init_python(code: String) -> crate::Result<()> {
+pub fn init_python(code: String, dir: PathBuf) -> crate::Result<()> {
     rustpython_vm::Interpreter::without_stdlib(Default::default()).enter(|vm| {
-        let code_obj = vm
-            .compile(
-                &code,
-                rustpython_vm::compiler::Mode::Exec,
-                "<embedded>".to_owned(),
-            )
-            .map_err(|err| vm.new_syntax_error(&err, Some(&code)))?;
-        vm.run_code_obj(code_obj, GLOBALS.clone())
+        vm.import("sys", 0).unwrap();
+        let path_import = format!("sys.path.append('{}')", dir.to_str().unwrap());
+        let exec_python = |code: String| {
+            let code_obj = vm
+                .compile(
+                    &code,
+                    rustpython_vm::compiler::Mode::Exec,
+                    "<embedded>".to_owned(),
+                )
+                .map_err(|err| vm.new_syntax_error(&err, Some(&code)))?;
+            vm.run_code_obj(code_obj, GLOBALS.clone())
+        };
+        exec_python(path_import)?;
+        exec_python(code)
     })?;
     Ok(())
 }

src/py_lib_pyo3.rs

@@ -3,6 +3,7 @@
 //  Licensed under MIT License, see License file for more details
 //  git clone https://github.com/marcomq/tauri-plugin-python
 
+use std::path::PathBuf;
 use std::sync::atomic::AtomicBool;
 use std::{collections::HashMap, ffi::CString, sync::Mutex};
 
@@ -21,18 +22,14 @@ lazy_static! {
         Mutex::new(marker::Python::with_gil(|py| { PyDict::new(py).into() }));
 }
 
-fn get_py_path() -> std::path::PathBuf {
-    std::env::current_dir().unwrap().join("src-python")
-}
-
-pub fn init_python(code: String) -> crate::Result<()> {
+pub fn init_python(code: String, dir: PathBuf) -> crate::Result<()> {
     let c_code = CString::new(code).expect("error creating cstring from code");
     Ok(marker::Python::with_gil(|py| -> PyResult<()> {
         let syspath = py
             .import("sys")?
             .getattr("path")?
             .downcast_into::<PyList>()?;
-        syspath.insert(0, get_py_path().to_str())?;
+        syspath.insert(0, dir.to_str())?;
         let globals = GLOBALS.lock().unwrap().clone_ref(py).into_bound(py);
         py.run(&c_code, Some(&globals), None)
     })?)