refactor queu store to use play track using index

- this allows to have duplicate tracks in queue safely
- store indexes in localstorage instead of track objects.
This commit is contained in:
geoffrey45
2022-07-02 18:13:54 +03:00
committed by Mungai Geoffrey
parent f0d3c1c663
commit c9830842ed
10 changed files with 62 additions and 89 deletions
+8 -4
View File
@@ -9,7 +9,7 @@
:index="track.index"
@updateQueue="updateQueue"
:isPlaying="queue.playing"
:isCurrent="queue.current.trackid == track.trackid"
:isCurrent="queue.currentid == track.trackid"
/>
</div>
</div>
@@ -47,18 +47,22 @@ let route = useRoute().name;
* @param track Track object
*/
function updateQueue(track: Track) {
const index = props.tracks.findIndex(
(t: Track) => t.trackid === track.trackid
);
switch (route) {
case "FolderView":
queue.playFromFolder(props.path, props.tracks);
queue.play(track);
queue.play(index);
break;
case "AlbumView":
queue.playFromAlbum(track.album, track.albumartist, props.tracks);
queue.play(track);
queue.play(index);
break;
case "PlaylistView":
queue.playFromPlaylist(props.pname, props.playlistid, props.tracks);
queue.play(track);
queue.play(index);
break;
}
}
+6 -3
View File
@@ -10,7 +10,7 @@
</div>
<div class="separator no-border"></div>
<div>
<SongCard :track="queue.current" />
<SongCard :track="queue.tracks[queue.current]" />
<Progress />
<HotKeys />
</div>
@@ -39,7 +39,11 @@ const showContextMenu = (e: Event) => {
e.preventDefault();
e.stopPropagation();
const menus = trackContext(queue.current, useModalStore, useQueueStore);
const menus = trackContext(
queue.tracks[queue.current],
useModalStore,
useQueueStore
);
contextStore.showContextMenu(e, menus, ContextSrc.Track);
context_on.value = true;
@@ -82,7 +86,6 @@ const showContextMenu = (e: Event) => {
.button {
position: absolute;
background-size: 1.5rem;
top: $small;
cursor: pointer;
transition: all 200ms;
+1 -1
View File
@@ -1,6 +1,6 @@
<template>
<div class="r-home">
<UpNext :next="queue.next" :playNext="queue.playNext" />
<UpNext :next="queue.tracks[queue.next]" :playNext="queue.playNext" />
<Recommendations />
</div>
</template>
+4 -4
View File
@@ -1,7 +1,7 @@
<template>
<div class="up-next">
<div class="r-grid">
<UpNext :next="queue.next" :playNext="queue.playNext" />
<UpNext :next="queue.tracks[queue.next]" :playNext="queue.playNext" />
<div class="scrollable-r border rounded">
<div
class="inner"
@@ -9,11 +9,11 @@
@mouseleave="setMouseOver(false)"
>
<TrackItem
v-for="t in queue.tracks"
v-for="(t, index) in queue.tracks"
:key="t.trackid"
:track="t"
@playThis="queue.play(t)"
:isCurrent="t.trackid === queue.current.trackid"
@playThis="queue.play(index)"
:isCurrent="index === queue.current"
:isPlaying="queue.playing"
/>
</div>
@@ -2,13 +2,13 @@
<div id="tracks-results" v-if="search.tracks.value">
<TransitionGroup name="list">
<TrackItem
v-for="track in search.tracks.value"
v-for="(track, index) in search.tracks.value"
:key="track.trackid"
:track="track"
:isPlaying="queue.playing"
:isCurrent="queue.current.trackid == track.trackid"
:isCurrent="queue.currentid == track.trackid"
:isSearchTrack="true"
@PlayThis="updateQueue"
@PlayThis="updateQueue(index)"
/>
</TransitionGroup>
<LoadMore v-if="search.tracks.more" @loadMore="loadMore" />
@@ -30,9 +30,9 @@ function loadMore() {
search.loadTracks(search.loadCounter.tracks);
}
function updateQueue(track: Track) {
function updateQueue(index: number) {
queue.playFromSearch(search.query, search.tracks.value);
queue.play(track);
queue.play(index);
}
</script>
+1 -1
View File
@@ -139,7 +139,7 @@ const context = useContextStore();
.children {
transform: scale(1);
transition: transform 0.2s ease-in-out;
transition: transform 0.1s ease-in-out;
}
}
}
+2 -2
View File
@@ -74,11 +74,11 @@ const showContextMenu = (e: Event) => {
};
const emit = defineEmits<{
(e: "PlayThis", track: Track): void;
(e: "PlayThis"): void;
}>();
const playThis = (track: Track) => {
emit("PlayThis", track);
emit("PlayThis");
};
</script>