From c8d857edb91e6c7da265ec217d1d34e1f2d2ee92 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Mon, 6 Sep 2021 16:11:37 -0500
Subject: [PATCH] Fix details tab save

---
 client/assets/app.css                         |  4 +++
 .../components/modals/edit-tabs/Details.vue   | 26 ++++++++++---------
 client/package.json                           |  2 +-
 package.json                                  |  2 +-
 server/utils/audioFileScanner.js              |  2 +-
 5 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/client/assets/app.css b/client/assets/app.css
index b24e0d22..b09310e9 100644
--- a/client/assets/app.css
+++ b/client/assets/app.css
@@ -83,6 +83,10 @@
   box-shadow: 2px 8px 6px #111111aa;
 }
 
+.box-shadow-sm-up {
+  box-shadow: 0px -5px 8px #11111122;
+}
+
 .box-shadow-md-up {
   box-shadow: 0px -8px 8px #11111144;
 }
diff --git a/client/components/modals/edit-tabs/Details.vue b/client/components/modals/edit-tabs/Details.vue
index 1a849f90..a1797cb1 100644
--- a/client/components/modals/edit-tabs/Details.vue
+++ b/client/components/modals/edit-tabs/Details.vue
@@ -1,7 +1,8 @@
 <template>
   <div class="w-full h-full relative">
-    <div ref="formWrapper" class="px-4 py-6 details-form-wrapper w-full overflow-hidden overflow-y-auto">
-      <!-- <div v-if="userProgress" class="bg-success bg-opacity-40 rounded-md w-full px-4 py-1 mb-4 border border-success border-opacity-50">
+    <form class="w-full h-full" @submit.prevent="submitForm">
+      <div ref="formWrapper" class="px-4 py-6 details-form-wrapper w-full overflow-hidden overflow-y-auto">
+        <!-- <div v-if="userProgress" class="bg-success bg-opacity-40 rounded-md w-full px-4 py-1 mb-4 border border-success border-opacity-50">
         <div class="w-full flex items-center">
           <p>
             Your progress: <span class="font-mono text-lg">{{ (userProgress * 100).toFixed(0) }}%</span>
@@ -10,7 +11,7 @@
           <ui-btn v-if="!resettingProgress" small :padding-x="2" class="-mr-3" @click="resetProgress">Reset</ui-btn>
         </div>
       </div> -->
-      <form @submit.prevent="submitForm">
+
         <ui-text-input-with-label v-model="details.title" label="Title" />
 
         <ui-text-input-with-label v-model="details.subtitle" label="Subtitle" class="mt-2" />
@@ -49,16 +50,16 @@
             <ui-text-input-with-label v-model="details.narrarator" label="Narrarator" />
           </div>
         </div>
-      </form>
-    </div>
-
-    <div class="absolute bottom-0 left-0 w-full py-4 bg-bg" :class="isScrollable ? 'box-shadow-md-up' : 'border-t border-primary border-opacity-50'">
-      <div class="flex px-4">
-        <ui-btn color="error" type="button" small @click.stop.prevent="deleteAudiobook">Remove</ui-btn>
-        <div class="flex-grow" />
-        <ui-btn type="submit">Submit</ui-btn>
       </div>
-    </div>
+
+      <div class="absolute bottom-0 left-0 w-full py-4 bg-bg" :class="isScrollable ? 'box-shadow-md-up' : 'box-shadow-sm-up border-t border-primary border-opacity-50'">
+        <div class="flex px-4">
+          <ui-btn color="error" type="button" small @click.stop.prevent="deleteAudiobook">Remove</ui-btn>
+          <div class="flex-grow" />
+          <ui-btn type="submit">Submit</ui-btn>
+        </div>
+      </div>
+    </form>
   </div>
 </template>
 
@@ -229,5 +230,6 @@ export default {
 <style scoped>
 .details-form-wrapper {
   height: calc(100% - 70px);
+  max-height: calc(100% - 70px);
 }
 </style>
\ No newline at end of file
diff --git a/client/package.json b/client/package.json
index f90e4521..13819c8b 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf-client",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "Audiobook manager and player",
   "main": "index.js",
   "scripts": {
diff --git a/package.json b/package.json
index 9f8a87e3..fef9eae2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "Self-hosted audiobook server for managing and playing audiobooks.",
   "main": "index.js",
   "scripts": {
diff --git a/server/utils/audioFileScanner.js b/server/utils/audioFileScanner.js
index 102edff4..a2905852 100644
--- a/server/utils/audioFileScanner.js
+++ b/server/utils/audioFileScanner.js
@@ -63,7 +63,7 @@ function isNumber(val) {
 }
 
 function getTrackNumberFromMeta(scanData) {
-  return !isNaN(scanData.trackNumber) && scanData.trackNumber !== null ? Number(scanData.trackNumber) : null
+  return !isNaN(scanData.trackNumber) && scanData.trackNumber !== null ? Math.trunc(Number(scanData.trackNumber)) : null
 }
 
 function getTrackNumberFromFilename(title, author, series, publishYear, filename) {