fixing line numbers and sys.path import

Author: marcomq

src/error.rs

@@ -43,10 +43,15 @@ impl From<rustpython_vm::PyRef<rustpython_vm::builtins::PyBaseException>> for Er
         if let Some(tb) = error.traceback() {
             println!("Traceback (most recent call last):");
             for trace in tb.iter() {
+                let file = trace.frame.code.source_path.as_str();
+                let original_line = trace.lineno.to_usize();
+                let line = if file == "main.py" {
+                    original_line - 2 // sys.path import has 2 additional lines
+                } else {
+                    original_line
+                };
                 println!(
-                    "  File \"{}\", line {}, in {}",
-                    trace.frame.code.source_path,
-                    trace.lineno.to_usize(),
+                    "  File \"{file}\", line {line}, in {}",
                     trace.frame.code.obj_name
                 );
             }

src/lib.rs

@@ -81,7 +81,7 @@ pub fn init<R: Runtime>() -> TauriPlugin<R> {
 
 fn init_python(code: String, dir: PathBuf) {
     #[allow(unused_mut)]
-    let mut sys_pyth_dir = format!("sys.path.append('{}')", dir.to_str().unwrap());
+    let mut sys_pyth_dir = vec![format!("\"{}\"", dir.to_string_lossy())];
     #[cfg(feature = "venv")]
     {
         let venv_dir = dir.join(".venv").join("lib");
@@ -91,26 +91,23 @@ fn init_python(code: String, dir: PathBuf) {
                     let site_packages = entry.path().join("site-packages");
                     // use first folder with site-packages for venv, ignore venv version
                     if Path::exists(site_packages.as_path()) {
-                        sys_pyth_dir += "\n";
-                        sys_pyth_dir +=
-                            &format!("sys.path.append('{}')", site_packages.to_str().unwrap());
+                        sys_pyth_dir.push(format!("\"{}\"", site_packages.to_string_lossy()));
                         break;
                     }
                 }
             }
         }
     }
     let path_import = format!(
-        r#"
-import sys
+        r#"import sys
+sys.path = sys.path + [{}]
 {}
 "#,
-        sys_pyth_dir
+        sys_pyth_dir.join(", "),
+        code
     );
-    py_lib::run_python_internal(path_import, "<tauri_init>".into())
-        .unwrap_or_else(|e| panic!("Error '{e}' initializing sys_import"));
-    py_lib::run_python_internal(code, "main.py".into())
-        .unwrap_or_else(|e| panic!("Error '{e}' initializing main.py."));
+    py_lib::run_python_internal(path_import, "main.py".into())
+        .unwrap_or_else(|e| panic!("Error '{e}' initializing main.py"));
 }
 
 /// Initializes the plugin.