From 370b68384670961381078b23da3f84cc53dc92e8 Mon Sep 17 00:00:00 2001
From: George Norton <george_norton_uk@hotmail.com>
Date: Fri, 23 Jun 2023 00:16:07 +0100
Subject: [PATCH] Fix dialogs, and bump versions

---
 package.json              |   2 +-
 src-tauri/Cargo.lock      |  26 ++---
 src-tauri/Cargo.toml      |   8 +-
 src-tauri/tauri.conf.json |   2 +-
 src/App.vue               | 202 +++++++++++++++++++-------------------
 5 files changed, 121 insertions(+), 119 deletions(-)

diff --git a/package.json b/package.json
index 4d9479b..600ad13 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "tauri-app",
+  "name": "headphones-toolbox",
   "private": true,
   "version": "0.0.1",
   "type": "module",
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 9c54949..80fb7de 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -1067,6 +1067,19 @@ version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
+[[package]]
+name = "headphones-toolbox"
+version = "0.0.1"
+dependencies = [
+ "byteorder",
+ "rusb",
+ "serde",
+ "serde_json",
+ "tauri",
+ "tauri-build",
+ "window-shadows",
+]
+
 [[package]]
 name = "heck"
 version = "0.3.3"
@@ -2637,19 +2650,6 @@ dependencies = [
  "windows 0.39.0",
 ]
 
-[[package]]
-name = "tauri-app"
-version = "0.0.0"
-dependencies = [
- "byteorder",
- "rusb",
- "serde",
- "serde_json",
- "tauri",
- "tauri-build",
- "window-shadows",
-]
-
 [[package]]
 name = "tauri-build"
 version = "1.4.0"
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 63d4b0f..aa1f792 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
-name = "tauri-app"
-version = "0.0.0"
-description = "A Tauri App"
-authors = ["you"]
+name = "headphones-toolbox"
+version = "0.0.1"
+description = "An application configure Ploopy Headphones."
+authors = ["George Norton"]
 license = ""
 repository = ""
 edition = "2021"
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index efb5d8a..d14fa52 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "Ploopy Headphones Toolbox",
-    "version": "0.0.0"
+    "version": "0.0.1"
   },
   "tauri": {
     "allowlist": {
diff --git a/src/App.vue b/src/App.vue
index e5eb2e8..1dcaf55 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -11,6 +11,8 @@ import { useQuasar } from 'quasar'
 
 const $q = useQuasar()
 $q.dark.set("auto")
+const about = ref(null)
+const importFile = ref(null)
 </script>
 
 <script>
@@ -201,7 +203,7 @@ export default {
       for (var i = 0; i < this.tabs.length; i++) {
         if (this.tabs[i].id == this.tab) {
           this.tabs.splice(i, 1)
-          this.tab = id
+          this.tab = Math.min(id, this.tabs.length - 1)
           i--
         }
         else {
@@ -218,7 +220,7 @@ export default {
           "codec": this.tabs[this.tab].codec
         }
         console.log(this.versions)
-        if (! ("current_version" in this.versions) || this.versions.current_version < 2) {
+        if (!("current_version" in this.versions) || this.versions.current_version < 2) {
           console.log(sendConfig)
           for (var f in sendConfig.filters) {
             console.log(f)
@@ -232,110 +234,110 @@ export default {
         })
       }
     }, 5),
-saveState: debounce(function () {
-  var config = {
-    "currentConfiguration": this.tab,
-    "configurations": this.tabs,
-    "deviceNames": deviceNames,
-    "version": this.version
-  }
-  try {
-    createDir("", { dir: BaseDirectory.AppData, recursive: true }).then(
-      writeTextFile(
-        {
-          contents: JSON.stringify(config, null, 4),
-          path: "configuration.json"
-        },
+    saveState: debounce(function () {
+      var config = {
+        "currentConfiguration": this.tab,
+        "configurations": this.tabs,
+        "deviceNames": deviceNames,
+        "version": this.version
+      }
+      try {
+        createDir("", { dir: BaseDirectory.AppData, recursive: true }).then(
+          writeTextFile(
+            {
+              contents: JSON.stringify(config, null, 4),
+              path: "configuration.json"
+            },
+            { dir: BaseDirectory.AppData }
+          ))
+      } catch (e) {
+        console.log(e);
+      }
+    }, 100),
+    loadState() {
+      readTextFile(
+        "configuration.json",
         { dir: BaseDirectory.AppData }
-      ))
-  } catch (e) {
-    console.log(e);
-  }
-}, 100),
-  loadState() {
-  readTextFile(
-    "configuration.json",
-    { dir: BaseDirectory.AppData }
-  ).then((response) => {
-    var config = JSON.parse(response)
-    if (config) {
-      for (var c in config.configurations) {
-        this.migrateConfig(config.configurations[c])
-        if (config.configurations[c].id == config.currentConfiguration) {
-          this.tab = c
+      ).then((response) => {
+        var config = JSON.parse(response)
+        if (config) {
+          for (var c in config.configurations) {
+            this.migrateConfig(config.configurations[c])
+            if (config.configurations[c].id == config.currentConfiguration) {
+              this.tab = c
+            }
+            config.configurations[c].id = c
+          }
+          this.tabs = reactive(config.configurations)
+          deviceNames = config.deviceNames
         }
-        config.configurations[c].id = c
-      }
-      this.tabs = reactive(config.configurations)
-      deviceNames = config.deviceNames
-    }
-  })
-    .catch((error) => {
-      console.error(error);
-    });
-},
+      })
+        .catch((error) => {
+          console.error(error);
+        });
+    },
     async exportConfiguration() {
-  const exportData = structuredClone(toRaw(this.tabs[this.tab]))
-  exportData.version = this.version
-  delete exportData.state
-  const config = JSON.stringify(exportData, null, 4)
-  exportFile(this.tabs[this.tab].name + ".json", config)
-},
-importConfiguration() {
-  this.$refs.importFile.pickFiles()
-},
-updateDeviceName(name) {
-  deviceNames[this.device] = name
-  deviceListKey.value += 1
-  this.saveState()
-},
-openDevice() {
-  invoke('open', { serialNumber: this.device }).then((result) => {
-    if (result) {
-      this.$q.notify({ type: 'positive', message: "Device connected" })
-      this.connected = true
-    }
-  })
-},
-pollDevices() {
-  invoke('poll_devices').then((message) => {
-    var devices = JSON.parse(message)
-    for (var d in devices) {
-      if (!(devices[d] in deviceNames)) {
-        if (devices.length == 1 && !("Ploopy Headphones" in deviceNames)) {
-          // Most people will only have one device, so use a friendly name
-          deviceNames[devices[d]] = "Ploopy Headphones"
+      const exportData = structuredClone(toRaw(this.tabs[this.tab]))
+      exportData.version = this.version
+      delete exportData.state
+      const config = JSON.stringify(exportData, null, 4)
+      exportFile(this.tabs[this.tab].name + ".json", config)
+    },
+    importConfiguration(){
+      importFile.pickFiles()
+    },
+    updateDeviceName(name) {
+      deviceNames[this.device] = name
+      deviceListKey.value += 1
+      this.saveState()
+    },
+    openDevice() {
+      invoke('open', { serialNumber: this.device }).then((result) => {
+        if (result) {
+          this.$q.notify({ type: 'positive', message: "Device connected" })
+          this.connected = true
         }
-        else {
-          deviceNames[devices[d]] = "Headphones [" + devices[d] + "]"
+      })
+    },
+    pollDevices() {
+      invoke('poll_devices').then((message) => {
+        var devices = JSON.parse(message)
+        for (var d in devices) {
+          if (!(devices[d] in deviceNames)) {
+            if (devices.length == 1 && !("Ploopy Headphones" in deviceNames)) {
+              // Most people will only have one device, so use a friendly name
+              deviceNames[devices[d]] = "Ploopy Headphones"
+            }
+            else {
+              deviceNames[devices[d]] = "Headphones [" + devices[d] + "]"
+            }
+          }
         }
-      }
-    }
-    Object.assign(this.devices, devices)
+        Object.assign(this.devices, devices)
 
-    if ((this.device == undefined || this.device == "none") && this.devices.length > 0) {
-      this.device = this.devices[0];
-    }
-    else {
-      if (this.device == undefined && this.devices.length == 0) {
-        this.$q.notify({ type: 'negative', message: "No devices detected" })
-        this.device = "none"
-        this.connected = false
-      }
-      else if (this.device != "none") {
-        if (this.connected && (devices.indexOf(this.device) == -1)) {
-          this.$q.notify({ type: 'negative', message: "Device disconnected" })
-          this.connected = false
+        if ((this.device == undefined || this.device == "none") && this.devices.length > 0) {
+          this.device = this.devices[0];
         }
-        else if (!this.connected) {
-          if (devices.indexOf(this.device) != -1) {
-            this.openDevice()
+        else {
+          if (this.device == undefined && this.devices.length == 0) {
+            this.$q.notify({ type: 'negative', message: "No devices detected" })
+            this.device = "none"
+            this.connected = false
+          }
+          else if (this.device != "none") {
+            if (this.connected && (devices.indexOf(this.device) == -1)) {
+              this.$q.notify({ type: 'negative', message: "Device disconnected" })
+              this.connected = false
+            }
+            else if (!this.connected) {
+              if (devices.indexOf(this.device) != -1) {
+                this.openDevice()
+              }
+            }
           }
         }
-      }
+      })
     }
-  })
-}
   }
 }
 </script>
@@ -387,7 +389,7 @@ pollDevices() {
                 <q-item-section>Erase saved configuration</q-item-section>
               </q-item>
               <q-separator />
-              <q-item clickable v-close-popup @click="this.$refs.about.show()">
+              <q-item clickable v-close-popup @click="about.show()">
                 <q-item-section>About</q-item-section>
               </q-item>
             </q-list>
@@ -396,10 +398,11 @@ pollDevices() {
       </q-toolbar>
 
       <AboutDialogVue ref="about" />
-
+      <q-file ref="importFile" class="hidden" accept=".json" clearable filled v-model="file" />
     </q-header>
 
     <q-page-container>
+      
       <q-page :style-fn="pageHeight" class="scroll overflow-auto">
 
         <q-tabs v-model="tab" dense align="left" :breakpoint="0">
@@ -434,7 +437,7 @@ pollDevices() {
                 <q-item clickable v-close-popup @click="exportConfiguration()">
                   <q-item-section>Export to JSON</q-item-section>
                 </q-item>
-                <q-item clickable v-close-popup @click="importConfiguration()">
+                <q-item clickable v-close-popup @click="importFile.pickFiles()">
                   <q-item-section>Import from JSON</q-item-section>
                 </q-item>
                 <q-item clickable v-close-popup :disable="!validated" @click="readDeviceConfiguration()">
@@ -465,7 +468,6 @@ pollDevices() {
     </q-page-container>
 
     <q-footer elevated>
-
       <div class="block full-width">
         <GraphVue ref="graph" v-model:filters="tabs[tab]" />
       </div>