MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-07-21 06:21:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

[web] Generalise search_next function to all types

Browse Source
This commit is contained in:
Alain Nussbaumer 2024-03-25 14:49:53 +01:00
parent 0f3f8d5a36
commit c312b2fdfe
1 changed files with 11 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
web-src/src/pages/PageSearchSpotify.vue
View File

@ -47,10 +47,7 @@
:position="0" :position="0"
:context_uri="track.uri" :context_uri="track.uri"
/> />
<VueEternalLoading <VueEternalLoading v-if="query.type === 'track'" :load="search_next">
v-if="query.type === 'track'"
:load="search_tracks_next"
>
<template #loading> <template #loading>
<div class="columns is-centered"> <div class="columns is-centered">
<div class="column has-text-centered"> <div class="column has-text-centered">
@ -93,10 +90,7 @@
:key="artist.id" :key="artist.id"
:item="artist" :item="artist"
/> />
<VueEternalLoading <VueEternalLoading v-if="query.type === 'artist'" :load="search_next">
v-if="query.type === 'artist'"
:load="search_artists_next"
>
<template #loading> <template #loading>
<div class="columns is-centered"> <div class="columns is-centered">
<div class="column has-text-centered"> <div class="column has-text-centered">
@ -139,10 +133,7 @@
:key="album.id" :key="album.id"
:item="album" :item="album"
/> />
<VueEternalLoading <VueEternalLoading v-if="query.type === 'album'" :load="search_next">
v-if="query.type === 'album'"
:load="search_albums_next"
>
<template #loading> <template #loading>
<div class="columns is-centered"> <div class="columns is-centered">
<div class="column has-text-centered"> <div class="column has-text-centered">
@ -185,10 +176,7 @@
:key="playlist.id" :key="playlist.id"
:item="playlist" :item="playlist"
/> />
<VueEternalLoading <VueEternalLoading v-if="query.type === 'playlist'" :load="search_next">
v-if="query.type === 'playlist'"
:load="search_playlists_next"
>
<template #loading> <template #loading>
<div class="columns is-centered"> <div class="columns is-centered">
<div class="column has-text-centered"> <div class="column has-text-centered">
@ -332,14 +320,6 @@ export default {
this.$store.dispatch('add_recent_search', this.query.query) this.$store.dispatch('add_recent_search', this.query.query)
this.search_all() this.search_all()
}, },
search_albums_next({ loaded }) {
this.spotify_search().then((data) => {
this.albums.items = this.albums.items.concat(data.albums.items)
this.albums.total = data.albums.total
this.search_param.offset += data.albums.limit
loaded(data.albums.items.length, PAGE_SIZE)
})
},
search_all() { search_all() {
this.spotify_search().then((data) => { this.spotify_search().then((data) => {
this.tracks = data.tracks ?? { items: [], total: 0 } this.tracks = data.tracks ?? { items: [], total: 0 }
@ -348,28 +328,14 @@ export default {
this.playlists = data.playlists ?? { items: [], total: 0 } this.playlists = data.playlists ?? { items: [], total: 0 }
}) })
}, },
search_artists_next({ loaded }) { search_next(obj) {
const items = this[`${this.query.type}s`]
this.spotify_search().then((data) => { this.spotify_search().then((data) => {
this.artists.items = this.artists.items.concat(data.artists.items) const newItems = data[`${this.query.type}s`]
this.artists.total = data.artists.total items.items = items.items.concat(newItems.items)
this.search_param.offset += data.artists.limit items.total = newItems.total
loaded(data.artists.items.length, PAGE_SIZE) this.search_param.offset += newItems.limit
}) obj.loaded(newItems.items.length, PAGE_SIZE)
},
search_playlists_next({ loaded }) {
this.spotify_search().then((data) => {
this.playlists.items = this.playlists.items.concat(data.playlists.items)
this.playlists.total = data.playlists.total
this.search_param.offset += data.playlists.limit
loaded(data.playlists.items.length, PAGE_SIZE)
})
},
search_tracks_next({ loaded }) {
this.spotify_search().then((data) => {
this.tracks.items = this.tracks.items.concat(data.tracks.items)
this.tracks.total = data.tracks.total
this.search_param.offset += data.tracks.limit
loaded(data.tracks.items.length, PAGE_SIZE)
}) })
}, },
show(type) { show(type) {