src-tauri/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [build-dependencies]
-tauri-build = { version = "2", features = [] }
+tauri-build = { version = "1", features = [] }
 
 [dependencies]
 anyhow = { version = "1.0", features = [] }
@@ -18,8 +18,7 @@ r621 = "0.2"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 simplelog = "0.12"
-tauri = { version = "2", features = [] }
+tauri = { version = "1", features = ["shell-open"] }
-tauri-plugin-shell = "2"
 thiserror = "1.0"
 tokio = { version = "1.35", features = ["full"] }
 

src-tauri/capabilities/migrated.json

@@ -1,13 +0,0 @@
-{
-  "identifier": "migrated",
-  "description": "permissions that were migrated from v1",
-  "local": true,
-  "windows": [
-    "main"
-  ],
-  "permissions": [
-    "core:default",
-    "shell:allow-open",
-    "shell:default"
-  ]
-}

src-tauri/gen/schemas/capabilities.json

@@ -1 +0,0 @@
-{"migrated":{"identifier":"migrated","description":"permissions that were migrated from v1","local":true,"windows":["main"],"permissions":["core:default","shell:allow-open","shell:default"]}}

src-tauri/src/main.rs

@@ -2,16 +2,13 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 
 use r621::client::{Authentication, Client};
-use r621::prelude::Post;
-use std::sync::Arc;
 use tauri::State;
 use tokio::sync::Mutex;
+use std::sync::Arc;
+use r621::prelude::Post;
 
 #[tauri::command]
-async fn get_posts(
+async fn get_posts(query: Option<String>, arcmut_esix_client: State<'_, Arc<Mutex<Client>>>) -> anyhow::Result<Vec<Post>, String> {
-    query: Option<String>,
-    arcmut_esix_client: State<'_, Arc<Mutex<Client>>>,
-) -> anyhow::Result<Vec<Post>, String> {
     let mut esix_client = arcmut_esix_client.lock().await;
     match esix_client.list_posts(None, query, None).await {
         Ok(res) => {
@@ -25,10 +22,7 @@ async fn get_posts(
 }
 
 #[tauri::command]
-async fn get_post(
+async fn get_post(post_id: u64, arcmut_esix_client: State<'_, Arc<Mutex<Client>>>) -> anyhow::Result<Post, String> {
-    post_id: u64,
-    arcmut_esix_client: State<'_, Arc<Mutex<Client>>>,
-) -> anyhow::Result<Post, String> {
     let mut esix_client = arcmut_esix_client.lock().await;
     match esix_client.get_post(post_id).await {
         Ok(res) => {
@@ -46,16 +40,16 @@ async fn main() {
     let user_agent = "eSixClient/1.0 (by pixelhunter on e621)";
     let auth = Authentication::Authorized {
         username: "pixelhunter",
-        apikey: "P4pzvnfLSjhQdgCmMfZ8HwUy",
+        apikey: "P4pzvnfLSjhQdgCmMfZ8HwUy"
     };
 
     let esix_client = Client::new(auth, user_agent).expect("Could not create esix client");
     let arcmut_esix_client = Arc::new(Mutex::new(esix_client));
 
     tauri::Builder::default()
-        .plugin(tauri_plugin_shell::init())
         .invoke_handler(tauri::generate_handler![get_posts, get_post])
         .manage(arcmut_esix_client.clone())
         .run(tauri::generate_context!())
         .expect("error while running tauri application");
 }
+

src-tauri/tauri.conf.json

@@ -2,26 +2,36 @@
   "build": {
     "beforeDevCommand": "pnpm dev",
     "beforeBuildCommand": "pnpm build",
-    "frontendDist": "../dist",
+    "devPath": "http://localhost:1420",
-    "devUrl": "http://localhost:1420"
+    "distDir": "../dist"
   },
-  "bundle": {
+  "package": {
-    "active": true,
+    "productName": "esix-client",
-    "targets": "all",
+    "version": "0.0.0"
-    "icon": [
-      "icons/32x32.png",
-      "icons/128x128.png",
-      "icons/128x128@2x.png",
-      "icons/icon.icns",
-      "icons/icon.ico"
-    ]
   },
-  "productName": "esix-client",
+  "tauri": {
-  "mainBinaryName": "esix-client",
+    "allowlist": {
-  "version": "0.0.0",
+      "all": false,
-  "identifier": "de.dhalucario.esix-client",
+      "shell": {
-  "plugins": {},
+        "all": false,
-  "app": {
+        "open": true
+      }
+    },
+    "bundle": {
+      "active": true,
+      "targets": "all",
+      "identifier": "com.tauri.dev",
+      "icon": [
+        "icons/32x32.png",
+        "icons/128x128.png",
+        "icons/128x128@2x.png",
+        "icons/icon.icns",
+        "icons/icon.ico"
+      ]
+    },
+    "security": {
+      "csp": null
+    },
     "windows": [
       {
         "fullscreen": false,
@@ -30,9 +40,6 @@
         "width": 800,
         "height": 600
       }
-    ],
+    ]
-    "security": {
-      "csp": null
-    }
   }
 }