From 13f21534baed85d3a0b6114152647387cdb2593c Mon Sep 17 00:00:00 2001
From: Igor <Igigog21@gmail.com>
Date: Sun, 22 Oct 2023 23:03:50 +0200
Subject: [PATCH] cleanup

---
 src-tauri/src/main.rs  | 22 ++++++++++++----------
 src-tauri/src/model.rs |  2 +-
 src/App.vue            |  2 +-
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index f6fb09f..7b05253 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -31,12 +31,11 @@ use tauri::Manager;
 use window_shadows::set_shadow;
 
 // Logging
-use log::{debug, error, info, warn};
+use log::{error, info, warn};
 extern crate simplelog;
 use simplelog::*;
 use std::fs;
 use std::fs::File;
-use tauri::PathResolver;
 
 mod commands;
 mod model;
@@ -304,17 +303,19 @@ fn send_cmd(
 fn write_config(
     config: Config,
     connection_state: State<'_, Mutex<ConnectionState>>,
-) -> Result<bool, String> {
+) -> Result<(), String> {
     let prep = SetPreprocessingConfiguration::new(&config.preprocessing);
     let filters = SetFilterConfiguration::new(&config.filters);
     let codec = SetPcm3060Configuration::new(&config.codec);
     let cmd = SetConfiguration::new(prep, filters, codec);
-    send_cmd(connection_state, cmd).map(|_| true)
+    send_cmd(connection_state, cmd)?;
+    Ok(())
 }
 
 #[tauri::command]
-fn save_config(connection_state: State<'_, Mutex<ConnectionState>>) -> Result<bool, String> {
-    send_cmd(connection_state, SaveConfiguration::new()).map(|_| true)
+fn save_config(connection_state: State<'_, Mutex<ConnectionState>>) -> Result<(), String> {
+    send_cmd(connection_state, SaveConfiguration::new())?;
+    Ok(())
 }
 
 #[tauri::command]
@@ -379,8 +380,9 @@ fn load_config(connection_state: State<'_, Mutex<ConnectionState>>) -> Result<Co
 }
 
 #[tauri::command]
-fn factory_reset(connection_state: State<'_, Mutex<ConnectionState>>) -> Result<bool, String> {
-    send_cmd(connection_state, FactoryReset::new()).map(|_| true)
+fn factory_reset(connection_state: State<'_, Mutex<ConnectionState>>) -> Result<(), String> {
+    send_cmd(connection_state, FactoryReset::new())?;
+    Ok(())
 }
 
 #[tauri::command]
@@ -401,7 +403,7 @@ fn reboot_bootloader(connection_state: State<Mutex<ConnectionState>>) -> Result<
     );
     info!("Reboot Device: {}", r.is_err());
 
-    return Ok(());
+    Ok(())
 }
 
 #[tauri::command]
@@ -464,7 +466,7 @@ fn open(
             None => continue,
         }
     }
-    return Err("Unknown error".to_owned());
+    Err("Unknown error".to_owned())
 }
 
 #[tauri::command]
diff --git a/src-tauri/src/model.rs b/src-tauri/src/model.rs
index c05ced4..b4b4421 100644
--- a/src-tauri/src/model.rs
+++ b/src-tauri/src/model.rs
@@ -166,7 +166,7 @@ impl Filter {
 
     pub fn payload(&self) -> Vec<u8> {
         let mut filter_payload = Vec::new();
-        filter_payload.push(self.discriminant() as u8);
+        filter_payload.push(self.discriminant());
         filter_payload.extend_from_slice(&[0u8; 3]);
 
         match self {
diff --git a/src/App.vue b/src/App.vue
index f4e0d44..9147203 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -249,7 +249,7 @@ export default {
           }
         }
 
-        invoke('write_config', { config: sendConfig }).then((message) => {})
+        invoke('write_config', { config: sendConfig }).then(() => {})
       }
     }, 5),
     saveState: debounce(function () {