update library version and fix args

library

@@ -1 +1 @@
-Subproject commit 979c717cc0ecc3f9a0c26ce868dafc2b20c3328c
+Subproject commit 96cb053e659123afc394187229949e7f32c23372

src-tauri/src/main.rs

@@ -5,23 +5,26 @@
 
 use std::fs::File;
 use std::io::Write;
-use tokio::runtime::Runtime;
 use tauri::State;
+use tokio::runtime::Runtime;
 
 extern crate ip_lib;
-extern crate rand;
 extern crate open;
+extern crate rand;
 
 // Learn more about Tauri commands at https://tauri.app/v1/guides/features/command
 
 #[tauri::command]
 fn get_version() -> String {
-	option_env!("CARGO_PKG_VERSION").unwrap_or("x.x.x").to_string()
+    option_env!("CARGO_PKG_VERSION")
+        .unwrap_or("x.x.x")
+        .to_string()
 }
 
 #[tauri::command]
-fn create_entry(name: String, username: String, pw: &str, mpw: String) -> bool {
+fn create_entry(name: &str, username: String, pw: &str, mpw: &str) -> bool {
-	let return_value = ip_lib::create_entry(&name, username+";"+pw, mpw);
+    let username_and_pw = username + ";" + pw;
+    let return_value = ip_lib::create_entry(name, &username_and_pw, mpw);
     if return_value {
         isync_save();
     }
@@ -34,11 +37,14 @@ fn random_password() -> String {
 }
 
 #[tauri::command]
-fn get_entry(name: String, mpw: String) -> Result<(String,String),String> {
+fn get_entry(name: &str, mpw: &str) -> Result<(String, String), String> {
-	let binding = ip_lib::get_entry(&name, mpw);
+    let binding = ip_lib::get_entry(name, mpw);
     if let Ok(data) = binding {
         let mut split = data.split(';');
-		Ok((split.next().unwrap().to_string(),split.next().unwrap().to_string()))
+        Ok((
+            split.next().unwrap().to_string(),
+            split.next().unwrap().to_string(),
+        ))
     } else {
         Err(binding.expect_err("expected error"))
     }
@@ -50,8 +56,8 @@ fn get_entries() -> Vec<String> {
     for entry in ip_lib::get_entries() {
         let entry_filename = entry.unwrap().file_name();
         let ent = entry_filename.to_str().unwrap();
-		if ent != "token.ipasst" && ent.len()>6 {
+        if ent != "token.ipasst" && ent.len() > 6 {
-			vector.insert(0, ent[..ent.len()-6].to_string());
+            vector.insert(0, ent[..ent.len() - 6].to_string());
         }
     }
 
@@ -62,7 +68,7 @@ fn get_entries() -> Vec<String> {
 
 #[tauri::command]
 fn remove_entry(name: &str) -> bool {
-	let filepath = &(ip_lib::get_ipass_folder()+name+".ipass");
+    let filepath = &(ip_lib::get_ipass_folder() + name + ".ipass");
     if std::path::Path::new(filepath).exists() {
         std::fs::remove_file(filepath).unwrap();
         isync_save();
@@ -73,29 +79,29 @@ fn remove_entry(name: &str) -> bool {
 
 #[tauri::command]
 fn open_authorize() -> u32 {
-	let code:u32 = rand::random();
+    let code: u32 = rand::random();
-    open::that(format!("https://ipost.rocks/authorize?id=1&extra={}",code)).unwrap();
+    open::that(format!("https://ipost.rocks/authorize?id=1&extra={}", code)).unwrap();
     //the IPass app id is 1
     code
 }
 
 #[tauri::command]
 fn store_token(token: String) {
-	let filepath = &(ip_lib::get_ipass_folder()+"token.ipasst");
+    let filepath = &(ip_lib::get_ipass_folder() + "token.ipasst");
     let mut file = File::create(filepath).unwrap();
     file.write_all(token.as_bytes()).unwrap();
 }
 
 #[tauri::command]
 fn remove_token() {
-	let filepath = &(ip_lib::get_ipass_folder()+"token.ipasst");
+    let filepath = &(ip_lib::get_ipass_folder() + "token.ipasst");
     std::fs::remove_file(filepath).unwrap();
     //TODO: cleaner solution via IPass api call to unauthorize
 }
 
 #[tauri::command]
 fn get_isync_status() -> bool {
-	let filepath = &(ip_lib::get_ipass_folder()+"token.ipasst");
+    let filepath = &(ip_lib::get_ipass_folder() + "token.ipasst");
     std::path::Path::new(filepath).exists()
 }
 
@@ -121,10 +127,18 @@ fn main() {
 
     tauri::Builder::default()
         .invoke_handler(tauri::generate_handler![
-			get_version,create_entry,random_password,
+            get_version,
-			get_entry,get_entries,remove_entry,
+            create_entry,
-			open_authorize,store_token,get_isync_status,
+            random_password,
-			sync_isync,remove_token])
+            get_entry,
+            get_entries,
+            remove_entry,
+            open_authorize,
+            store_token,
+            get_isync_status,
+            sync_isync,
+            remove_token
+        ])
         .manage(rt)
         .run(tauri::generate_context!())
         .expect("error while running tauri application");