From 4f4f2b09e3f29718eaade4a932803f752b223476 Mon Sep 17 00:00:00 2001
From: qier222 <qier222@outlook.com>
Date: Mon, 12 Apr 2021 14:12:15 +0800
Subject: [PATCH] fix: bugs

---
 src/components/Cover.vue           |  2 ++
 src/components/CoverRow.vue        |  3 ++-
 src/components/DailyTracksCard.vue | 31 ++++++++++++++++++++++--------
 src/components/Navbar.vue          |  4 ++--
 src/main.js                        | 17 ++++++++++++++++
 src/router/index.js                | 12 +++++++++++-
 src/utils/Player.js                | 27 +++++++++++++++-----------
 src/views/search.vue               |  4 +++-
 src/views/settings.vue             | 14 +++++++++-----
 9 files changed, 85 insertions(+), 29 deletions(-)

diff --git a/src/components/Cover.vue b/src/components/Cover.vue
index 705941b..d81cfc7 100644
--- a/src/components/Cover.vue
+++ b/src/components/Cover.vue
@@ -100,6 +100,7 @@ img {
   border-radius: 0.75em;
   width: 100%;
   user-select: none;
+  aspect-ratio: 1 / 1;
 }
 
 .cover-hover {
@@ -156,6 +157,7 @@ img {
   z-index: -1;
   background-size: cover;
   border-radius: 0.75em;
+  aspect-ratio: 1 / 1;
 }
 
 .fade-enter-active,
diff --git a/src/components/CoverRow.vue b/src/components/CoverRow.vue
index 164bccc..1aa7dca 100644
--- a/src/components/CoverRow.vue
+++ b/src/components/CoverRow.vue
@@ -10,7 +10,7 @@
         :imageUrl="getImageUrl(item)"
         :type="type"
         :id="item.id"
-        :playButtonSize="type === 'artist' ? 26 : 22"
+        :playButtonSize="type === 'artist' ? 26 : playButtonSize"
       />
       <div class="text">
         <div class="info" v-if="showPlayCount">
@@ -55,6 +55,7 @@ export default {
     showPlayCount: { type: Boolean, default: false },
     columnNumber: { type: Number, default: 5 },
     gap: { type: String, default: "44px 24px" },
+    playButtonSize: { type: Number, default: 22 },
   },
   computed: {
     rowStyles() {
diff --git a/src/components/DailyTracksCard.vue b/src/components/DailyTracksCard.vue
index 4fdf40a..b748346 100644
--- a/src/components/DailyTracksCard.vue
+++ b/src/components/DailyTracksCard.vue
@@ -21,8 +21,16 @@
 </template>
 
 <script>
-import { mapMutations, mapState } from "vuex";
+import { mapMutations, mapState, mapActions } from "vuex";
 import { dailyRecommendTracks } from "@/api/playlist";
+import { isAccountLoggedIn } from "@/utils/auth";
+import { sample } from "lodash";
+
+const defaultCovers = [
+  "https://p2.music.126.net/0-Ybpa8FrDfRgKYCTJD8Xg==/109951164796696795.jpg",
+  "https://p2.music.126.net/QxJA2mr4hhb9DZyucIOIQw==/109951165422200291.jpg",
+  "https://p1.music.126.net/AhYP9TET8l-VSGOpWAKZXw==/109951165134386387.jpg",
+];
 
 export default {
   name: "DailyTracksCard",
@@ -31,26 +39,33 @@ export default {
   },
   computed: {
     ...mapState(["dailyTracks"]),
+    coverUrl() {
+      return this.dailyTracks[0]?.al.picUrl || sample(defaultCovers);
+    },
     cardStyles() {
       return {
-        background:
-          this.dailyTracks.length !== 0
-            ? `no-repeat url("${this.dailyTracks[0].al.picUrl}?param=1024y1024") center/cover`
-            : "",
+        background: `no-repeat url("${this.coverUrl}?param=1024y1024") center/cover`,
       };
     },
   },
   methods: {
+    ...mapActions(["showToast"]),
     ...mapMutations(["updateDailyTracks"]),
     loadDailyTracks() {
-      dailyRecommendTracks().then((result) => {
-        this.updateDailyTracks(result.data.dailySongs);
-      });
+      dailyRecommendTracks()
+        .then((result) => {
+          this.updateDailyTracks(result.data.dailySongs);
+        })
+        .catch(() => {});
     },
     goToDailyTracks() {
       this.$router.push({ name: "dailySongs" });
     },
     playDailyTracks() {
+      if (!isAccountLoggedIn()) {
+        this.showToast("此操作需要登录网易云账号");
+        return;
+      }
       let trackIDs = this.dailyTracks.map((t) => t.id);
       this.$store.state.player.replacePlaylist(
         trackIDs,
diff --git a/src/components/Navbar.vue b/src/components/Navbar.vue
index 6effa48..4c3a8a9 100644
--- a/src/components/Navbar.vue
+++ b/src/components/Navbar.vue
@@ -124,8 +124,8 @@ export default {
       return isLooseLoggedIn();
     },
     avatarUrl() {
-      return this.data.user.avatarUrl
-        ? `${this.data.user.avatarUrl}?param=512y512`
+      return this.data?.user?.avatarUrl && this.isLooseLoggedIn
+        ? `${this.data?.user?.avatarUrl}?param=512y512`
         : "http://s4.music.126.net/style/web2/img/default/default_avatar.jpg?param=60y60";
     },
   },
diff --git a/src/main.js b/src/main.js
index 9a3fd57..6099a38 100644
--- a/src/main.js
+++ b/src/main.js
@@ -13,6 +13,23 @@ import * as Sentry from "@sentry/browser";
 import { Vue as VueIntegration } from "@sentry/integrations";
 import { Integrations } from "@sentry/tracing";
 
+window.resetApp = () => {
+  localStorage.clear();
+  indexedDB.deleteDatabase("yesplaymusic");
+  document.cookie.split(";").forEach(function (c) {
+    document.cookie = c
+      .replace(/^ +/, "")
+      .replace(/=.*/, "=;expires=" + new Date().toUTCString() + ";path=/");
+  });
+  return "已重置应用，请刷新页面（按Ctrl/Command + R）";
+};
+
+console.log(
+  "如出现问题，可尝试在本页输入 %cresetApp()%c 然后按回车重置应用。",
+  "background: #eaeffd;color:#335eea;padding: 4px 6px;border-radius:3px;",
+  "background:unset;color:unset;"
+);
+
 Vue.use(VueAnalytics, {
   id: "UA-180189423-1",
   router,
diff --git a/src/router/index.js b/src/router/index.js
index 2c6d268..8755bb3 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -2,7 +2,7 @@ import Vue from "vue";
 import VueRouter from "vue-router";
 import NProgress from "nprogress";
 import "@/assets/css/nprogress.css";
-import { isLooseLoggedIn } from "@/utils/auth";
+import { isLooseLoggedIn, isAccountLoggedIn } from "@/utils/auth";
 
 NProgress.configure({ showSpinner: false, trickleSpeed: 100 });
 
@@ -122,6 +122,9 @@ const routes = [
     path: "/daily/songs",
     name: "dailySongs",
     component: () => import("@/views/dailyTracks.vue"),
+    meta: {
+      requireAccountLogin: true,
+    },
   },
   {
     path: "/lastfm/callback",
@@ -147,6 +150,13 @@ VueRouter.prototype.push = function push(location) {
 
 router.beforeEach((to, from, next) => {
   // 需要登录的逻辑
+  if (to.meta.requireAccountLogin) {
+    if (isAccountLoggedIn()) {
+      next();
+    } else {
+      next({ path: "/login/account" });
+    }
+  }
   if (to.meta.requireLogin) {
     if (isLooseLoggedIn()) {
       next();
diff --git a/src/utils/Player.js b/src/utils/Player.js
index bd1123d..99fb5e8 100644
--- a/src/utils/Player.js
+++ b/src/utils/Player.js
@@ -160,9 +160,12 @@ export default class {
     this._shuffledList = shuffle(list);
     if (firstTrackID !== "first") this._shuffledList.unshift(firstTrackID);
   }
-  async _scrobble(track, time, complete = false) {
+  async _scrobble(track, time, completed = false) {
+    console.debug(
+      `[debug][Player.js] scrobble track 👉 ${track.name} by ${track.ar[0].name} 👉 time:${time} completed: ${completed}`
+    );
     const trackDuration = ~~(track.dt / 1000);
-    time = complete ? trackDuration : time;
+    time = completed ? trackDuration : ~~time;
     scrobble({
       id: track.id,
       sourceid: this.playlistSource.id,
@@ -247,7 +250,9 @@ export default class {
     autoplay = true,
     ifUnplayableThen = "playNextTrack"
   ) {
-    if (autoplay) this._scrobble(this.currentTrack, this._howler?.seek(), true);
+    if (autoplay) {
+      this._scrobble(this.currentTrack, this._howler.seek());
+    }
     return getTrackDetail(id).then((data) => {
       let track = data.songs[0];
       this._currentTrack = track;
@@ -267,8 +272,11 @@ export default class {
     });
   }
   _cacheNextTrack() {
-    const nextTrack = this._getNextTrack();
-    getTrackDetail(nextTrack[0]).then((data) => {
+    let nextTrackID = this._isPersonalFM
+      ? this._personalFMNextTrack.id
+      : this._getNextTrack()[0];
+    if (!nextTrackID) return;
+    getTrackDetail(nextTrackID).then((data) => {
       let track = data.songs[0];
       this._getAudioSource(track);
     });
@@ -342,7 +350,8 @@ export default class {
     }
   }
   _nextTrackCallback() {
-    if (!this.isPersonalFM && this.repeatMode === "one") {
+    this._scrobble(this._currentTrack, 0, true);
+    if (this.repeatMode === "one") {
       this._replaceCurrentTrack(this._currentTrack.id);
     } else {
       this.playNextTrack();
@@ -464,11 +473,7 @@ export default class {
     }
   }
   setOutputDevice() {
-    if (
-      process.env.IS_ELECTRON !== true ||
-      this._howler._sounds.length <= 0 ||
-      !this._howler._sounds[0]._node
-    ) {
+    if (this._howler._sounds.length <= 0 || !this._howler._sounds[0]._node) {
       return;
     }
     this._howler._sounds[0]._node.setSinkId(store.state.settings.outputDevice);
diff --git a/src/views/search.vue b/src/views/search.vue
index b3ff967..2458663 100644
--- a/src/views/search.vue
+++ b/src/views/search.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="search" v-show="show">
     <div class="row" v-show="artists.length > 0 || albums.length > 0">
-      <div class="artists">
+      <div class="artists" v-show="artists.length > 0">
         <div class="section-title" v-show="artists.length > 0"
           >{{ $t("search.artist")
           }}<router-link :to="`/search/${keywords}/artists`">{{
@@ -30,6 +30,7 @@
           :columnNumber="3"
           subTextFontSize="14px"
           gap="34px 24px"
+          :playButtonSize="26"
         />
       </div>
     </div>
@@ -68,6 +69,7 @@
         :columnNumber="6"
         subTextFontSize="14px"
         gap="34px 24px"
+        :playButtonSize="26"
       />
     </div>
 
diff --git a/src/views/settings.vue b/src/views/settings.vue
index 8cec889..aca6718 100644
--- a/src/views/settings.vue
+++ b/src/views/settings.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="settings">
     <div class="container">
-      <div class="user" v-if="data.user.nickname !== undefined">
+      <div class="user" v-if="showUserInfo">
         <div class="left">
           <img class="avatar" :src="data.user.avatarUrl" />
           <div class="info">
@@ -317,7 +317,7 @@
 
 <script>
 import { mapState } from "vuex";
-import { doLogout } from "@/utils/auth";
+import { isLooseLoggedIn, doLogout } from "@/utils/auth";
 import { auth as lastfmAuth } from "@/api/lastfm";
 import { changeAppearance, bytesToSize } from "@/utils/common";
 import { countDBSize, clearDB } from "@/utils/db";
@@ -351,6 +351,10 @@ export default {
     version() {
       return pkg.version;
     },
+    showUserInfo() {
+      return isLooseLoggedIn() && this.data.user.nickname;
+    },
+
     lang: {
       get() {
         return this.settings.lang;
@@ -517,9 +521,9 @@ export default {
           value,
         });
       },
-      isLastfmConnected() {
-        return this.lastfm.key !== undefined;
-      },
+    },
+    isLastfmConnected() {
+      return this.lastfm.key !== undefined;
     },
   },
   methods: {