refactoring

Author: marcomq

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-python"
-version = "0.2.0"
+version = "0.2.1"
 authors = [ "Marco Mengelkoch" ]
 description = ""
 edition = "2021"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tauri-plugin-python-api",
-  "version": "0.1.0",
+  "version": "0.2.1",
   "author": "Marco Mengelkoch",
   "description": "",
   "type": "module",

src/desktop.rs

@@ -6,37 +6,14 @@
 use serde::de::DeserializeOwned;
 use tauri::{plugin::PluginApi, AppHandle, Runtime};
 
-use crate::models::*;
 use crate::py_lib;
 
 /// Access to the python plugin APIs.
-pub struct Python<R: Runtime>(AppHandle<R>);
 
 pub fn init<R: Runtime, C: DeserializeOwned>(
     app: &AppHandle<R>,
     _api: PluginApi<R, C>,
-) -> crate::Result<Python<R>> {
+) -> crate::Result<crate::Python<R>> {
     py_lib::init_python()?;
-    Ok(Python(app.clone()))
-}
-
-impl<R: Runtime> Python<R> {
-    pub fn run_python(&self, payload: StringRequest) -> crate::Result<StringResponse> {
-        py_lib::run_python(payload)?;
-        Ok(StringResponse { value: "Ok".into() })
-    }
-    pub fn register_function(&self, payload: RegisterRequest) -> crate::Result<StringResponse> {
-        py_lib::register_function(payload)?;
-        Ok(StringResponse { value: "Ok".into() })
-    }
-    pub fn call_function(&self, payload: RunRequest) -> crate::Result<StringResponse> {
-        let py_res = py_lib::call_function(payload)?;
-        Ok(StringResponse {
-            value: py_res.to_string(),
-        })
-    }
-    pub fn read_variable(&self, payload: StringRequest) -> crate::Result<StringResponse> {
-        let py_res = py_lib::read_variable(payload)?;
-        Ok(StringResponse { value: py_res })
-    }
+    Ok(crate::Python(app.clone()))
 }

src/lib.rs

@@ -4,8 +4,7 @@
 //  git clone https://github.com/marcomq/tauri-plugin-python
 
 use tauri::{
-    plugin::{Builder, TauriPlugin},
-    Manager, Runtime,
+    plugin::{Builder, TauriPlugin}, AppHandle, Manager, Runtime
 };
 
 pub use models::*;
@@ -22,10 +21,7 @@ mod py_lib;
 
 pub use error::{Error, Result};
 
-#[cfg(desktop)]
-use desktop::Python;
-#[cfg(mobile)]
-use mobile::Python;
+pub struct Python<R: Runtime>(AppHandle<R>);
 
 /// Extensions to [`tauri::App`], [`tauri::AppHandle`] and [`tauri::Window`] to access the python APIs.
 pub trait PythonExt<R: Runtime> {
@@ -60,3 +56,24 @@ pub fn init<R: Runtime>(python_functions: Vec<&'static str>) -> TauriPlugin<R> {
         })
         .build()
 }
+
+impl<R: Runtime> Python<R> {
+    pub fn run_python(&self, payload: StringRequest) -> crate::Result<StringResponse> {
+        py_lib::run_python(payload)?;
+        Ok(StringResponse { value: "Ok".into() })
+    }
+    pub fn register_function(&self, payload: RegisterRequest) -> crate::Result<StringResponse> {
+        py_lib::register_function(payload)?;
+        Ok(StringResponse { value: "Ok".into() })
+    }
+    pub fn call_function(&self, payload: RunRequest) -> crate::Result<StringResponse> {
+        let py_res = py_lib::call_function(payload)?;
+        Ok(StringResponse {
+            value: py_res.to_string(),
+        })
+    }
+    pub fn read_variable(&self, payload: StringRequest) -> crate::Result<StringResponse> {
+        let py_res = py_lib::read_variable(payload)?;
+        Ok(StringResponse { value: py_res })
+    }
+}

src/mobile.rs

@@ -15,39 +15,15 @@ use crate::py_lib;
 #[cfg(target_os = "ios")]
 tauri::ios_plugin_binding!(init_plugin_python);
 
-/// Access to the python plugin APIs.
-pub struct Python<R: Runtime>(PluginHandle<R>);
-
 // initializes the Kotlin or Swift plugin classes
 pub fn init<R: Runtime, C: DeserializeOwned>(
     _app: &AppHandle<R>,
     api: PluginApi<R, C>,
-) -> crate::Result<Python<R>> {
+) -> crate::Result<crate::Python<R>> {
     #[cfg(target_os = "android")]
     let handle = api.register_android_plugin("com.plugin.python.application", "ExamplePlugin")?;
     #[cfg(target_os = "ios")]
     let handle = api.register_ios_plugin(init_plugin_python)?;
     py_lib::init_python()?;
-    Ok(Python(handle))
-}
-
-impl<R: Runtime> Python<R> {
-    pub fn run_python(&self, payload: StringRequest) -> crate::Result<StringResponse> {
-        py_lib::run_python(payload)?;
-        Ok(StringResponse { value: "Ok".into() })
-    }
-    pub fn register_function(&self, payload: RegisterRequest) -> crate::Result<StringResponse> {
-        py_lib::register_function(payload)?;
-        Ok(StringResponse { value: "Ok".into() })
-    }
-    pub fn call_function(&self, payload: RunRequest) -> crate::Result<StringResponse> {
-        let py_res = py_lib::call_function(payload)?;
-        Ok(StringResponse {
-            value: py_res.to_string(),
-        })
-    }
-    pub fn read_variable(&self, payload: StringRequest) -> crate::Result<StringResponse> {
-        let py_res = py_lib::read_variable(payload)?;
-        Ok(StringResponse { value: py_res })
-    }
+    Ok(crate::Python(handle))
 }