From ff247eafb3e44949dc6129d5dc00e72d0c04b409 Mon Sep 17 00:00:00 2001
From: robbevp <robbe@vanpetegem.me>
Date: Sat, 20 Nov 2021 12:20:30 +0100
Subject: [PATCH] Add recently played albums and artists on home (#647)

---
 src/comparators.js             |  9 ++++
 src/components/TracksTable.vue | 12 ++++--
 src/locales/en.json            |  2 +
 src/locales/nl.json            |  2 +
 src/store/plays.js             | 66 ++++++++++++++++++++++++++--
 src/views/Home.vue             | 78 +++++++++++++++++++++++++++++++++-
 6 files changed, 161 insertions(+), 8 deletions(-)

diff --git a/src/comparators.js b/src/comparators.js
index 38ee1896..282690dc 100644
--- a/src/comparators.js
+++ b/src/comparators.js
@@ -137,3 +137,12 @@ export function compareAlbumsByReleaseFirst(newestFirst = false) {
     return (order = order === 0 ? compareStrings(a1.id, a2.id) : order);
   };
 }
+
+export function compareByRecentlyPlayed(stats) {
+  return function (i1, i2) {
+    return (
+      (stats[i2.id]?.last_played_at || new Date(0)) -
+      (stats[i1.id]?.last_played_at || new Date(0))
+    );
+  };
+}
diff --git a/src/components/TracksTable.vue b/src/components/TracksTable.vue
index a92c9dd0..76d6e69d 100644
--- a/src/components/TracksTable.vue
+++ b/src/components/TracksTable.vue
@@ -88,7 +88,11 @@
         <TrackGenres :track="props.item" />
       </template>
       <template v-slot:item.play_count="props">
-        {{ playCountsByTrack[props.item.id] || 0 }}
+        {{
+          (playStatsByTrack[props.item.id] &&
+            playStatsByTrack[props.item.id].count) ||
+          0
+        }}
       </template>
       <template v-slot:item.actions="props">
         <TrackActions :track="props.item" />
@@ -193,7 +197,7 @@ export default {
   computed: {
     ...mapGetters("auth", ["isModerator"]),
     ...mapGetters("player", ["currentTrack"]),
-    ...mapGetters("plays", ["playCountsByTrack"]),
+    ...mapGetters("plays", ["playStatsByTrack"]),
     ...mapState("albums", ["albums"]),
     ...mapState("genres", ["genres"]),
     ...mapState("tracks", { tracksObj: "tracks" }),
@@ -242,8 +246,8 @@ export default {
           break;
         case "play_count":
           sortFunction = (t1, t2) =>
-            (this.playCountsByTrack[t1.id] || 0) -
-            (this.playCountsByTrack[t2.id] || 0);
+            (this.playStatsByTrack[t1.id]?.count || 0) -
+            (this.playStatsByTrack[t2.id]?.count || 0);
           break;
         case "title":
           sortFunction = (t1, t2) =>
diff --git a/src/locales/en.json b/src/locales/en.json
index bba6f34d..ce42c54a 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -190,6 +190,8 @@
 		"random-artists": "Random artists",
 		"recently-added-albums": "Recently added albums",
 		"recently-added-artists": "Recently added artists",
+		"recently-played-albums": "Recently played albums",
+		"recently-played-artists": "Recently played artists",
 		"recently-released": "Recently released"
 	},
 	"image": {
diff --git a/src/locales/nl.json b/src/locales/nl.json
index 5ff0bd92..dd82e381 100644
--- a/src/locales/nl.json
+++ b/src/locales/nl.json
@@ -185,6 +185,8 @@
 		"random-artists": "Random artiesten",
 		"recently-added-albums": "Recent toegevoegde albums",
 		"recently-added-artists": "Recent toegevoegde artiesten",
+		"recently-played-albums": "Recent afgespeelde albums",
+		"recently-played-artists": "Recent afgespeelde artiesten",
 		"recently-released": "Recent uitgebracht"
 	},
 	"image": {
diff --git a/src/store/plays.js b/src/store/plays.js
index 975902c3..774f8298 100644
--- a/src/store/plays.js
+++ b/src/store/plays.js
@@ -73,13 +73,73 @@ export default {
   },
   getters: {
     plays: (state) => Object.values(state.plays),
-    playCountsByTrack: (state, getters) => {
+    playStatsByTrack: (state, getters) => {
       const result = {};
       for (let play of getters.plays) {
         if (!(play.track_id in result)) {
-          result[play.track_id] = 0;
+          result[play.track_id] = {
+            count: 1,
+            last_played_at: new Date(play.played_at),
+          };
+        } else {
+          result[play.track_id].count++;
+
+          if (result[play.track_id].last_played_at < new Date(play.played_at)) {
+            result[play.track_id].last_played_at = new Date(play.played_at);
+          }
+        }
+      }
+      return result;
+    },
+    playStatsByAlbum: (state, getters, rootState) => {
+      const result = {};
+      for (let track_id in getters.playStatsByTrack) {
+        // If this track is not (yet) loaded, we need to skip it
+        if (!rootState.tracks.tracks[track_id]) {
+          continue;
+        }
+
+        const album_id = rootState.tracks.tracks[track_id].album_id;
+        if (!(album_id in result)) {
+          result[album_id] = {
+            last_played_at: getters.playStatsByTrack[track_id].last_played_at,
+          };
+        } else if (
+          result[album_id].last_played_at <
+          getters.playStatsByTrack[track_id].plast_layed_at
+        ) {
+          result[album_id].last_played_at =
+            getters.playStatsByTrack[track_id].last_played_at;
+        }
+      }
+      return result;
+    },
+    playStatsByArtist: (state, getters, rootState) => {
+      const result = {};
+      for (let track_id in getters.playStatsByTrack) {
+        // If this track is not (yet) loaded, we need to skip it
+        if (!rootState.tracks.tracks[track_id]) {
+          continue;
+        }
+
+        for (let ta of rootState.tracks.tracks[track_id].track_artists) {
+          if (!(ta.artist_id in result)) {
+            result[ta.artist_id] = {
+              count: getters.playStatsByTrack[track_id].count,
+              last_played_at: getters.playStatsByTrack[track_id].last_played_at,
+            };
+          } else {
+            result[ta.artist_id].count +=
+              getters.playStatsByTrack[track_id].count;
+            if (
+              result[ta.artist_id].last_played_at <
+              getters.playStatsByTrack[track_id].plast_layed_at
+            ) {
+              result[ta.artist_id].last_played_at =
+                getters.playStatsByTrack[track_id].last_played_at;
+            }
+          }
         }
-        result[play.track_id]++;
       }
       return result;
     },
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 33d270f0..a2e3f986 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -192,6 +192,70 @@
         </template>
       </VDataIterator>
     </VContainer>
+    <VContainer fluid>
+      <VDataIterator
+        :footer-props="{
+          disableItemsPerPage: true,
+          itemsPerPageOptions: [numberOfItems],
+        }"
+        :items="albums"
+        :custom-sort="recentlyPlayedAlbumsSort"
+        :items-per-page="numberOfItems"
+      >
+        <template v-slot:header>
+          <h2 class="text-h4">
+            {{ $t("home.recently-played-albums") }}
+          </h2>
+        </template>
+        <template v-slot:default="props">
+          <VRow class="my-0">
+            <VCol
+              v-for="item in props.items"
+              :key="item.id"
+              lg="3"
+              md="4"
+              sm="6"
+              xl="2"
+              cols="6"
+            >
+              <AlbumCard :album="item" />
+            </VCol>
+          </VRow>
+        </template>
+      </VDataIterator>
+    </VContainer>
+    <VContainer fluid>
+      <VDataIterator
+        :footer-props="{
+          disableItemsPerPage: true,
+          itemsPerPageOptions: [numberOfItems],
+        }"
+        :items="artists"
+        :custom-sort="recentlyPlayedArtistsSort"
+        :items-per-page="numberOfItems"
+      >
+        <template v-slot:header>
+          <h2 class="text-h4">
+            {{ $t("home.recently-played-artists") }}
+          </h2>
+        </template>
+        <template v-slot:default="props">
+          <VRow class="my-0">
+            <VCol
+              v-for="item in props.items"
+              :key="item.id"
+              lg="3"
+              md="4"
+              sm="6"
+              xl="2"
+              cols="6"
+            >
+              <ArtistCard :artist="item" />
+            </VCol>
+          </VRow>
+        </template>
+      </VDataIterator>
+    </VContainer>
   </div>
 </template>
 
@@ -199,7 +263,11 @@
 import { mapGetters } from "vuex";
 import AlbumCard from "../components/AlbumCard";
 import ArtistCard from "../components/ArtistCard";
-import { compareAlbumsByReleaseFirst, compareStrings } from "../comparators";
+import {
+  compareAlbumsByReleaseFirst,
+  compareByRecentlyPlayed,
+  compareStrings,
+} from "../comparators";
 
 export default {
   name: "Home",
@@ -217,6 +285,12 @@ export default {
       });
       return items;
     },
+    recentlyPlayedAlbumsSort(albums) {
+      return albums.sort(compareByRecentlyPlayed(this.playStatsByAlbum));
+    },
+    recentlyPlayedArtistsSort(artists) {
+      return artists.sort(compareByRecentlyPlayed(this.playStatsByArtist));
+    },
     randomSort(items) {
       const newItems = [...items];
       for (let i = newItems.length - 1; i > 0; i--) {
@@ -231,6 +305,8 @@ export default {
       albums: "albums/albums",
       albumsOnThisDay: "albums/albumsOnThisDay",
       artists: "artists/artists",
+      playStatsByAlbum: "plays/playStatsByAlbum",
+      playStatsByArtist: "plays/playStatsByArtist",
     }),
     randomAlbums() {
       return this.randomSort(this.albums);