From a264efe2bbf82aac38a02e617f89ca63047793df Mon Sep 17 00:00:00 2001
From: Alain Nussbaumer <alain.nussbaumer@alleluia.ch>
Date: Mon, 24 Jul 2023 19:51:00 +0200
Subject: [PATCH] [web] Fix genre not being displayed correctly depending on
 the media kind

The genre is not displayed depending on the media kind and not only for the "music" kind.
---
 web-src/src/components/ListArtists.vue        | 22 ++----
 web-src/src/components/ListGenres.vue         | 16 ++---
 web-src/src/components/ModalDialogGenre.vue   | 25 ++++---
 .../src/components/ModalDialogQueueItem.vue   |  9 +--
 web-src/src/components/ModalDialogTrack.vue   |  5 +-
 web-src/src/components/TabsAudiobooks.vue     | 12 ++++
 web-src/src/locales/de.json                   |  3 +-
 web-src/src/locales/en.json                   |  3 +-
 web-src/src/locales/fr.json                   |  3 +-
 web-src/src/locales/zh.json                   |  3 +-
 web-src/src/pages/PageAudiobooksGenres.vue    | 72 +++++++++++++++++++
 ...PageGenreAlbum.vue => PageGenreAlbums.vue} | 27 +++----
 web-src/src/pages/PageGenreTracks.vue         | 17 +++--
 web-src/src/pages/PageGenres.vue              |  8 +--
 web-src/src/router/index.js                   | 23 +++---
 web-src/src/webapi/index.js                   | 18 ++---
 16 files changed, 179 insertions(+), 87 deletions(-)
 create mode 100644 web-src/src/pages/PageAudiobooksGenres.vue
 rename web-src/src/pages/{PageGenreAlbum.vue => PageGenreAlbums.vue} (85%)

diff --git a/web-src/src/components/ListArtists.vue b/web-src/src/components/ListArtists.vue
index 94e39479..e4c76080 100644
--- a/web-src/src/components/ListArtists.vue
+++ b/web-src/src/components/ListArtists.vue
@@ -26,9 +26,8 @@
   </template>
   <teleport to="#app">
     <modal-dialog-artist
-      :show="show_details_modal"
       :artist="selected_artist"
-      :media_kind="media_kind"
+      :show="show_details_modal"
       @close="show_details_modal = false"
     />
   </teleport>
@@ -41,7 +40,7 @@ export default {
   name: 'ListArtists',
   components: { ModalDialogArtist },
 
-  props: ['artists', 'media_kind', 'hide_group_title'],
+  props: ['artists', 'hide_group_title'],
 
   data() {
     return {
@@ -50,23 +49,12 @@ export default {
     }
   },
 
-  computed: {
-    media_kind_resolved() {
-      return this.media_kind ? this.media_kind : this.selected_artist.media_kind
-    }
-  },
-
   methods: {
     open_artist(artist) {
       this.selected_artist = artist
-      if (this.media_kind_resolved === 'audiobook') {
-        this.$router.push({
-          name: 'audiobooks-artist',
-          params: { id: artist.id }
-        })
-      } else {
-        this.$router.push({ name: 'music-artist', params: { id: artist.id } })
-      }
+      const route =
+        artist.media_kind === 'audiobook' ? 'audiobooks-artist' : 'music-artist'
+      this.$router.push({ name: route, params: { id: artist.id } })
     },
 
     open_dialog(artist) {
diff --git a/web-src/src/components/ListGenres.vue b/web-src/src/components/ListGenres.vue
index d247f4ea..7f121710 100644
--- a/web-src/src/components/ListGenres.vue
+++ b/web-src/src/components/ListGenres.vue
@@ -28,6 +28,7 @@
     <modal-dialog-genre
       :show="show_details_modal"
       :genre="selected_genre"
+      :media_kind="media_kind"
       @close="show_details_modal = false"
     />
   </teleport>
@@ -40,7 +41,7 @@ export default {
   name: 'ListGenres',
   components: { ModalDialogGenre },
 
-  props: ['genres', 'media_kind', 'hide_group_title'],
+  props: ['genres', 'hide_group_title', 'media_kind'],
 
   data() {
     return {
@@ -49,17 +50,14 @@ export default {
     }
   },
 
-  computed: {
-    media_kind_resolved() {
-      return this.media_kind ? this.media_kind : this.selected_genre.media_kind
-    }
-  },
-
   methods: {
     open_genre(genre) {
-      this.$router.push({ name: 'music-genre', params: { name: genre.name } })
+      this.$router.push({
+        name: 'genre-albums',
+        params: { name: genre.name },
+        query: { media_kind: this.media_kind }
+      })
     },
-
     open_dialog(genre) {
       this.selected_genre = genre
       this.show_details_modal = true
diff --git a/web-src/src/components/ModalDialogGenre.vue b/web-src/src/components/ModalDialogGenre.vue
index c7b5c82b..619343ce 100644
--- a/web-src/src/components/ModalDialogGenre.vue
+++ b/web-src/src/components/ModalDialogGenre.vue
@@ -62,37 +62,36 @@ import webapi from '@/webapi'
 
 export default {
   name: 'ModalDialogGenre',
-  props: ['show', 'genre'],
+  props: ['genre', 'media_kind', 'show'],
   emits: ['close'],
 
+  computed: {
+    expression() {
+      return `genre is "${this.genre.name}" and media_kind is ${this.media_kind}`
+    }
+  },
   methods: {
     play() {
       this.$emit('close')
-      webapi.player_play_expression(
-        'genre is "' + this.genre.name + '" and media_kind is music',
-        false
-      )
+      webapi.player_play_expression(this.expression, false)
     },
 
     queue_add() {
       this.$emit('close')
-      webapi.queue_expression_add(
-        'genre is "' + this.genre.name + '" and media_kind is music'
-      )
+      webapi.queue_expression_add(this.expression)
     },
 
     queue_add_next() {
       this.$emit('close')
-      webapi.queue_expression_add_next(
-        'genre is "' + this.genre.name + '" and media_kind is music'
-      )
+      webapi.queue_expression_add_next(this.expression)
     },
 
     open_genre() {
       this.$emit('close')
       this.$router.push({
-        name: 'music-genre',
-        params: { name: this.genre.name }
+        name: 'genre-albums',
+        params: { name: this.genre.name },
+        query: { media_kind: this.media_kind }
       })
     }
   }
diff --git a/web-src/src/components/ModalDialogQueueItem.vue b/web-src/src/components/ModalDialogQueueItem.vue
index aac021f2..02a7590d 100644
--- a/web-src/src/components/ModalDialogQueueItem.vue
+++ b/web-src/src/components/ModalDialogQueueItem.vue
@@ -208,12 +208,12 @@ export default {
     },
 
     open_album() {
-      if (this.media_kind === 'podcast') {
+      if (this.item.media_kind === 'podcast') {
         this.$router.push({
           name: 'podcast',
           params: { id: this.item.album_id }
         })
-      } else if (this.media_kind === 'audiobook') {
+      } else if (this.item.media_kind === 'audiobook') {
         this.$router.push({
           name: 'audiobooks-album',
           params: { id: this.item.album_id }
@@ -235,8 +235,9 @@ export default {
 
     open_genre() {
       this.$router.push({
-        name: 'music-genre',
-        params: { name: this.item.genre }
+        name: 'genre-albums',
+        params: { name: this.item.genre },
+        query: { media_kind: this.item.media_kind }
       })
     },
 
diff --git a/web-src/src/components/ModalDialogTrack.vue b/web-src/src/components/ModalDialogTrack.vue
index 20ce0714..a8bab9d8 100644
--- a/web-src/src/components/ModalDialogTrack.vue
+++ b/web-src/src/components/ModalDialogTrack.vue
@@ -270,8 +270,9 @@ export default {
 
     open_genre() {
       this.$router.push({
-        name: 'music-genre',
-        params: { name: this.track.genre }
+        name: 'genre-albums',
+        params: { name: this.track.genre },
+        query: { media_kind: this.track.media_kind }
       })
     },
 
diff --git a/web-src/src/components/TabsAudiobooks.vue b/web-src/src/components/TabsAudiobooks.vue
index ccad1d9a..90921b64 100644
--- a/web-src/src/components/TabsAudiobooks.vue
+++ b/web-src/src/components/TabsAudiobooks.vue
@@ -33,6 +33,18 @@
                   </a>
                 </li>
               </router-link>
+              <router-link
+                v-slot="{ navigate, isActive }"
+                :to="{ name: 'audiobooks-genres' }"
+                custom
+              >
+                <li :class="{ 'is-active': isActive }">
+                  <a @click="navigate" @keypress.enter="navigate">
+                    <mdicon class="icon is-small" name="speaker" size="16" />
+                    <span v-text="$t('page.audiobooks.tabs.genres')" />
+                  </a>
+                </li>
+              </router-link>
             </ul>
           </div>
         </div>
diff --git a/web-src/src/locales/de.json b/web-src/src/locales/de.json
index 35cca4cc..50a300fe 100644
--- a/web-src/src/locales/de.json
+++ b/web-src/src/locales/de.json
@@ -313,7 +313,8 @@
       },
       "tabs": {
         "authors": "Autoren",
-        "audiobooks": "Hörbücher"
+        "audiobooks": "Hörbücher",
+        "genres": "Genres"
       }
     },
     "browse": {
diff --git a/web-src/src/locales/en.json b/web-src/src/locales/en.json
index 7b3edc09..90c655c0 100644
--- a/web-src/src/locales/en.json
+++ b/web-src/src/locales/en.json
@@ -313,7 +313,8 @@
       },
       "tabs": {
         "authors": "Authors",
-        "audiobooks": "Audiobooks"
+        "audiobooks": "Audiobooks",
+        "genres": "Genres"
       }
     },
     "browse": {
diff --git a/web-src/src/locales/fr.json b/web-src/src/locales/fr.json
index ddfcefe7..7b06e3e5 100644
--- a/web-src/src/locales/fr.json
+++ b/web-src/src/locales/fr.json
@@ -313,7 +313,8 @@
       },
       "tabs": {
         "authors": "Auteurs",
-        "audiobooks": "Livres audio"
+        "audiobooks": "Livres audio",
+        "genres": "Genres"
       }
     },
     "browse": {
diff --git a/web-src/src/locales/zh.json b/web-src/src/locales/zh.json
index e6792f4e..5b4df730 100644
--- a/web-src/src/locales/zh.json
+++ b/web-src/src/locales/zh.json
@@ -313,7 +313,8 @@
       },
       "tabs": {
         "authors": "作者",
-        "audiobooks": "有声读物"
+        "audiobooks": "有声读物",
+        "genres": "流派"
       }
     },
     "browse": {
diff --git a/web-src/src/pages/PageAudiobooksGenres.vue b/web-src/src/pages/PageAudiobooksGenres.vue
new file mode 100644
index 00000000..1c9c8c18
--- /dev/null
+++ b/web-src/src/pages/PageAudiobooksGenres.vue
@@ -0,0 +1,72 @@
+<template>
+  <div class="fd-page-with-tabs">
+    <tabs-audiobooks />
+    <content-with-heading>
+      <template #options>
+        <index-button-list :index="genres.indexList" />
+      </template>
+      <template #heading-left>
+        <p class="title is-4" v-text="$t('page.genres.title')" />
+        <p
+          class="heading"
+          v-text="$t('page.genres.count', { count: genres.total })"
+        />
+      </template>
+      <template #content>
+        <list-genres :genres="genres" :media_kind="'audiobook'" />
+      </template>
+    </content-with-heading>
+  </div>
+</template>
+
+<script>
+import { GroupByList, byName } from '@/lib/GroupByList'
+import ContentWithHeading from '@/templates/ContentWithHeading.vue'
+import IndexButtonList from '@/components/IndexButtonList.vue'
+import ListGenres from '@/components/ListGenres.vue'
+import TabsAudiobooks from '@/components/TabsAudiobooks.vue'
+import webapi from '@/webapi'
+
+const dataObject = {
+  load(to) {
+    return webapi.library_genres('audiobook')
+  },
+
+  set(vm, response) {
+    vm.genres = response.data
+    vm.genres = new GroupByList(response.data)
+    vm.genres.group(byName('name_sort'))
+  }
+}
+
+export default {
+  name: 'PageAudiobookGenres',
+  components: {
+    ContentWithHeading,
+    IndexButtonList,
+    ListGenres,
+    TabsAudiobooks
+  },
+
+  beforeRouteEnter(to, from, next) {
+    dataObject.load(to).then((response) => {
+      next((vm) => dataObject.set(vm, response))
+    })
+  },
+  beforeRouteUpdate(to, from, next) {
+    const vm = this
+    dataObject.load(to).then((response) => {
+      dataObject.set(vm, response)
+      next()
+    })
+  },
+
+  data() {
+    return {
+      genres: new GroupByList()
+    }
+  }
+}
+</script>
+
+<style></style>
diff --git a/web-src/src/pages/PageGenreAlbum.vue b/web-src/src/pages/PageGenreAlbums.vue
similarity index 85%
rename from web-src/src/pages/PageGenreAlbum.vue
rename to web-src/src/pages/PageGenreAlbums.vue
index 9048bfa2..0c512439 100644
--- a/web-src/src/pages/PageGenreAlbum.vue
+++ b/web-src/src/pages/PageGenreAlbums.vue
@@ -35,8 +35,9 @@
         </p>
         <list-albums :albums="albums_list" />
         <modal-dialog-genre
-          :show="show_genre_details_modal"
           :genre="genre"
+          :media_kind="media_kind"
+          :show="show_genre_details_modal"
           @close="show_genre_details_modal = false"
         />
       </template>
@@ -45,8 +46,8 @@
 </template>
 
 <script>
-import ContentWithHeading from '@/templates/ContentWithHeading.vue'
 import { GroupByList, byName } from '@/lib/GroupByList'
+import ContentWithHeading from '@/templates/ContentWithHeading.vue'
 import IndexButtonList from '@/components/IndexButtonList.vue'
 import ListAlbums from '@/components/ListAlbums.vue'
 import ModalDialogGenre from '@/components/ModalDialogGenre.vue'
@@ -55,8 +56,8 @@ import webapi from '@/webapi'
 const dataObject = {
   load(to) {
     return Promise.all([
-      webapi.library_genre(to.params.name),
-      webapi.library_genre_albums(to.params.name)
+      webapi.library_genre(to.params.name, to.query.media_kind),
+      webapi.library_genre_albums(to.params.name, to.query.media_kind)
     ])
   },
 
@@ -68,14 +69,13 @@ const dataObject = {
 }
 
 export default {
-  name: 'PageGenreAlbum',
+  name: 'PageGenreAlbums',
   components: {
     ContentWithHeading,
     IndexButtonList,
     ListAlbums,
     ModalDialogGenre
   },
-
   beforeRouteEnter(to, from, next) {
     dataObject.load(to).then((response) => {
       next((vm) => dataObject.set(vm, response))
@@ -92,28 +92,31 @@ export default {
       next()
     })
   },
-
   data() {
     return {
       genre: {},
       albums_list: new GroupByList(),
-
       show_genre_details_modal: false
     }
   },
-
+  computed: {
+    media_kind() {
+      return this.$route.query.media_kind
+    }
+  },
   methods: {
     open_tracks() {
       this.show_details_modal = false
       this.$router.push({
-        name: 'music-genre-tracks',
-        params: { name: this.genre.name }
+        name: 'genre-tracks',
+        params: { name: this.genre.name },
+        query: { media_kind: this.media_kind }
       })
     },
 
     play() {
       webapi.player_play_expression(
-        'genre is "' + this.genre.name + '" and media_kind is music',
+        `genre is "${this.genre.name}" and media_kind is ${this.media_kind}`,
         true
       )
     }
diff --git a/web-src/src/pages/PageGenreTracks.vue b/web-src/src/pages/PageGenreTracks.vue
index 284c24b8..4766c0b1 100644
--- a/web-src/src/pages/PageGenreTracks.vue
+++ b/web-src/src/pages/PageGenreTracks.vue
@@ -46,6 +46,7 @@
         <modal-dialog-genre
           :show="show_genre_details_modal"
           :genre="genre"
+          :media_kind="media_kind"
           @close="show_genre_details_modal = false"
         />
       </template>
@@ -55,9 +56,9 @@
 
 <script>
 import * as types from '@/store/mutation_types'
+import { GroupByList, byName, byRating } from '@/lib/GroupByList'
 import ContentWithHeading from '@/templates/ContentWithHeading.vue'
 import ControlDropdown from '@/components/ControlDropdown.vue'
-import { GroupByList, byName, byRating } from '@/lib/GroupByList'
 import IndexButtonList from '@/components/IndexButtonList.vue'
 import ListTracks from '@/components/ListTracks.vue'
 import ModalDialogGenre from '@/components/ModalDialogGenre.vue'
@@ -66,8 +67,8 @@ import webapi from '@/webapi'
 const dataObject = {
   load(to) {
     return Promise.all([
-      webapi.library_genre(to.params.name),
-      webapi.library_genre_tracks(to.params.name)
+      webapi.library_genre(to.params.name, to.query.media_kind),
+      webapi.library_genre_tracks(to.params.name, to.query.media_kind)
     ])
   },
 
@@ -124,7 +125,10 @@ export default {
 
   computed: {
     expression() {
-      return 'genre is "' + this.genre.name + '" and media_kind is music'
+      return `genre is "${this.genre.name}" and media_kind is ${this.media_kind}`
+    },
+    media_kind() {
+      return this.$route.query.media_kind
     },
     selected_groupby_option_id: {
       get() {
@@ -147,8 +151,9 @@ export default {
     open_genre() {
       this.show_details_modal = false
       this.$router.push({
-        name: 'music-genre',
-        params: { name: this.genre.name }
+        name: 'genre-albums',
+        params: { name: this.genre.name },
+        query: { media_kind: this.media_kind }
       })
     },
 
diff --git a/web-src/src/pages/PageGenres.vue b/web-src/src/pages/PageGenres.vue
index 115b7bfb..a911bc3c 100644
--- a/web-src/src/pages/PageGenres.vue
+++ b/web-src/src/pages/PageGenres.vue
@@ -13,15 +13,15 @@
         />
       </template>
       <template #content>
-        <list-genres :genres="genres" />
+        <list-genres :genres="genres" :media_kind="'music'" />
       </template>
     </content-with-heading>
   </div>
 </template>
 
 <script>
-import ContentWithHeading from '@/templates/ContentWithHeading.vue'
 import { GroupByList, byName } from '@/lib/GroupByList'
+import ContentWithHeading from '@/templates/ContentWithHeading.vue'
 import IndexButtonList from '@/components/IndexButtonList.vue'
 import ListGenres from '@/components/ListGenres.vue'
 import TabsMusic from '@/components/TabsMusic.vue'
@@ -43,9 +43,9 @@ export default {
   name: 'PageGenres',
   components: {
     ContentWithHeading,
-    TabsMusic,
     IndexButtonList,
-    ListGenres
+    ListGenres,
+    TabsMusic
   },
 
   beforeRouteEnter(to, from, next) {
diff --git a/web-src/src/router/index.js b/web-src/src/router/index.js
index 2d211249..f99ebf9c 100644
--- a/web-src/src/router/index.js
+++ b/web-src/src/router/index.js
@@ -12,6 +12,7 @@ import PageAudiobooksAlbum from '@/pages/PageAudiobooksAlbum.vue'
 import PageAudiobooksAlbums from '@/pages/PageAudiobooksAlbums.vue'
 import PageAudiobooksArtist from '@/pages/PageAudiobooksArtist.vue'
 import PageAudiobooksArtists from '@/pages/PageAudiobooksArtists.vue'
+import PageAudiobooksGenres from '@/pages/PageAudiobooksGenres.vue'
 import PageBrowse from '@/pages/PageBrowse.vue'
 import PageBrowseRecentlyAdded from '@/pages/PageBrowseRecentlyAdded.vue'
 import PageBrowseRecentlyPlayed from '@/pages/PageBrowseRecentlyPlayed.vue'
@@ -22,7 +23,7 @@ import PageComposerAlbums from '@/pages/PageComposerAlbums.vue'
 import PageComposerTracks from '@/pages/PageComposerTracks.vue'
 import PageComposers from '@/pages/PageComposers.vue'
 import PageFiles from '@/pages/PageFiles.vue'
-import PageGenreAlbum from '@/pages/PageGenreAlbum.vue'
+import PageGenreAlbums from '@/pages/PageGenreAlbums.vue'
 import PageGenreTracks from '@/pages/PageGenreTracks.vue'
 import PageGenres from '@/pages/PageGenres.vue'
 import PagePlaylistFolder from '@/pages/PagePlaylistFolder.vue'
@@ -115,6 +116,12 @@ export const router = createRouter({
       name: 'audiobooks-artists',
       path: '/audiobooks/artists'
     },
+    {
+      component: PageAudiobooksGenres,
+      meta: { has_index: true, has_tabs: true, show_progress: true },
+      name: 'audiobooks-genres',
+      path: '/audiobooks/genres'
+    },
     {
       name: 'audiobooks',
       path: '/audiobooks',
@@ -186,22 +193,22 @@ export const router = createRouter({
       path: '/files'
     },
     {
-      component: PageGenreAlbum,
+      component: PageGenreAlbums,
       meta: { has_index: true, show_progress: true },
-      path: '/music/genres/:name/albums',
-      name: 'music-genre'
+      name: 'genre-albums',
+      path: '/genres/:name/albums'
     },
     {
       component: PageGenreTracks,
       meta: { has_index: true, show_progress: true },
-      name: 'music-genre-tracks',
-      path: '/music/genres/:name/tracks'
+      name: 'genre-tracks',
+      path: '/genres/:name/tracks'
     },
     {
       component: PageGenres,
       meta: { has_index: true, has_tabs: true, show_progress: true },
-      path: '/music/genres',
-      name: 'music-genres'
+      name: 'music-genres',
+      path: '/music/genres'
     },
     {
       component: PageNowPlaying,
diff --git a/web-src/src/webapi/index.js b/web-src/src/webapi/index.js
index c6a5a108..17ddc959 100644
--- a/web-src/src/webapi/index.js
+++ b/web-src/src/webapi/index.js
@@ -304,24 +304,26 @@ export default {
     })
   },
 
-  library_genre(genre) {
-    return axios.get(`./api/library/genres/${encodeURIComponent(genre)}`)
+  library_genre(genre, media_kind = undefined) {
+    return axios.get(`./api/library/genres/${encodeURIComponent(genre)}`, {
+      params: { media_kind: media_kind }
+    })
   },
 
-  library_genre_albums(genre) {
+  library_genre_albums(genre, media_kind) {
     const genreParams = {
-      type: 'albums',
-      expression: `genre is "${genre}" and media_kind is music`
+      expression: `genre is "${genre}" and media_kind is ${media_kind}`,
+      type: 'albums'
     }
     return axios.get('./api/search', {
       params: genreParams
     })
   },
 
-  library_genre_tracks(genre) {
+  library_genre_tracks(genre, media_kind) {
     const genreParams = {
-      type: 'tracks',
-      expression: `genre is "${genre}" and media_kind is music`
+      expression: `genre is "${genre}" and media_kind is ${media_kind}`,
+      type: 'tracks'
     }
     return axios.get('./api/search', {
       params: genreParams