From ce4e48cbd773c97dbdb0e3bad2d6c98d76991bce Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sat, 15 Oct 2022 15:31:07 -0500
Subject: [PATCH] Add:Region support for audible chapter lookup

---
 client/components/ui/Dropdown.vue       | 15 +++++++++++++--
 client/pages/audiobook/_id/chapters.vue | 16 +++++++++++++---
 server/controllers/MiscController.js    |  3 ++-
 server/finders/BookFinder.js            |  4 ++--
 server/providers/Audnexus.js            |  8 ++++----
 5 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/client/components/ui/Dropdown.vue b/client/components/ui/Dropdown.vue
index 0a4b9c30..b921e478 100644
--- a/client/components/ui/Dropdown.vue
+++ b/client/components/ui/Dropdown.vue
@@ -14,7 +14,7 @@
 
     <transition name="menu">
       <ul v-show="showMenu" class="absolute z-10 -mt-px w-full bg-primary border border-black-200 shadow-lg max-h-56 rounded-b-md py-1 ring-1 ring-black ring-opacity-5 overflow-auto focus:outline-none sm:text-sm" tabindex="-1" role="listbox">
-        <template v-for="item in items">
+        <template v-for="item in itemsToShow">
           <li :key="item.value" class="text-gray-100 select-none relative py-2 cursor-pointer hover:bg-black-400" id="listbox-option-0" role="option" @click="clickedOption(item.value)">
             <div class="flex items-center">
               <span class="ml-3 block truncate font-sans text-sm" :class="{ 'font-semibold': item.subtext }">{{ item.text }}</span>
@@ -62,8 +62,19 @@ export default {
         this.$emit('input', val)
       }
     },
+    itemsToShow() {
+      return this.items.map((i) => {
+        if (typeof i === 'string') {
+          return {
+            text: i,
+            value: i
+          }
+        }
+        return i
+      })
+    },
     selectedItem() {
-      return this.items.find((i) => i.value === this.selected)
+      return this.itemsToShow.find((i) => i.value === this.selected)
     },
     selectedText() {
       return this.selectedItem ? this.selectedItem.text : ''
diff --git a/client/pages/audiobook/_id/chapters.vue b/client/pages/audiobook/_id/chapters.vue
index d6dabe33..6ef6ce8a 100644
--- a/client/pages/audiobook/_id/chapters.vue
+++ b/client/pages/audiobook/_id/chapters.vue
@@ -128,7 +128,8 @@
       <div class="w-full h-full max-h-full text-sm rounded-lg bg-bg shadow-lg border border-black-300 relative">
         <div v-if="!chapterData" class="flex p-20">
           <ui-text-input-with-label v-model="asinInput" label="ASIN" />
-          <ui-btn small color="primary" class="mt-5 ml-2" @click="findChapters">Find</ui-btn>
+          <ui-dropdown v-model="regionInput" label="Region" small :items="audibleRegions" class="w-32 mx-1" />
+          <ui-btn small color="primary" class="mt-5" @click="findChapters">Find</ui-btn>
         </div>
         <div v-else class="w-full p-4">
           <div class="flex justify-between mb-4">
@@ -218,10 +219,12 @@ export default {
       currentTrackIndex: 0,
       saving: false,
       asinInput: null,
+      regionInput: 'US',
       findingChapters: false,
       showFindChaptersModal: false,
       chapterData: null,
-      showSecondInputs: false
+      showSecondInputs: false,
+      audibleRegions: ['US', 'CA', 'UK', 'AU', 'FR', 'DE', 'JP', 'IT', 'IN', 'ES']
     }
   },
   computed: {
@@ -475,10 +478,16 @@ export default {
         this.$toast.error('Must input an ASIN')
         return
       }
+
+      // Update local storage region
+      if (this.regionInput !== localStorage.getItem('audibleRegion')) {
+        localStorage.setItem('audibleRegion', this.regionInput)
+      }
+
       this.findingChapters = true
       this.chapterData = null
       this.$axios
-        .$get(`/api/search/chapters?asin=${this.asinInput}`)
+        .$get(`/api/search/chapters?asin=${this.asinInput}&region=${this.regionInput}`)
         .then((data) => {
           this.findingChapters = false
 
@@ -499,6 +508,7 @@ export default {
     }
   },
   mounted() {
+    this.regionInput = localStorage.getItem('audibleRegion') || 'US'
     this.asinInput = this.mediaMetadata.asin || null
     this.newChapters = this.chapters.map((c) => ({ ...c }))
     if (!this.newChapters.length) {
diff --git a/server/controllers/MiscController.js b/server/controllers/MiscController.js
index 2a3029cc..cfa1dc44 100644
--- a/server/controllers/MiscController.js
+++ b/server/controllers/MiscController.js
@@ -210,7 +210,8 @@ class MiscController {
 
   async findChapters(req, res) {
     var asin = req.query.asin
-    var chapterData = await this.bookFinder.findChapters(asin)
+    var region = (req.query.region || 'us').toLowerCase()
+    var chapterData = await this.bookFinder.findChapters(asin, region)
     if (!chapterData) {
       return res.json({ error: 'Chapters not found' })
     }
diff --git a/server/finders/BookFinder.js b/server/finders/BookFinder.js
index 08b9aaef..9c993782 100644
--- a/server/finders/BookFinder.js
+++ b/server/finders/BookFinder.js
@@ -209,8 +209,8 @@ class BookFinder {
     return covers
   }
 
-  findChapters(asin) {
-    return this.audnexus.getChaptersByASIN(asin)
+  findChapters(asin, region) {
+    return this.audnexus.getChaptersByASIN(asin, region)
   }
 }
 module.exports = BookFinder
\ No newline at end of file
diff --git a/server/providers/Audnexus.js b/server/providers/Audnexus.js
index 34651e1a..43dfb665 100644
--- a/server/providers/Audnexus.js
+++ b/server/providers/Audnexus.js
@@ -59,12 +59,12 @@ class Audnexus {
     }
   }
 
-  async getChaptersByASIN(asin) {
-    Logger.debug(`[Audnexus] Get chapters for ASIN ${asin}`)
-    return axios.get(`${this.baseUrl}/books/${asin}/chapters`).then((res) => {
+  getChaptersByASIN(asin, region) {
+    Logger.debug(`[Audnexus] Get chapters for ASIN ${asin}/${region}`)
+    return axios.get(`${this.baseUrl}/books/${asin}/chapters?region=${region}`).then((res) => {
       return res.data
     }).catch((error) => {
-      Logger.error(`[Audnexus] Chapter ASIN request failed for ${asin}`, error)
+      Logger.error(`[Audnexus] Chapter ASIN request failed for ${asin}/${region}`, error)
       return null
     })
   }