Merge pull request #217 from trazyn/dev

Release v1.2.6
trazyn · Jul 15, 2018 · ef5899c · ef5899c
2 parents bd2619c + 012c503
commit ef5899c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -34,7 +34,7 @@
 - High quality music(FLAC)
 - Track your listen to Last.fm
 - Fix dead music link [#3](https://github.com/trazyn/ieaseMusic/issues/3)(QQ music, Xiami music, Kugou music, MiGu music, Biadu music all in one)
-- Alfred 3 workflow([alfred-ieasemusic](https://github.com/trazyn/alfred-ieasemusic)), required v1.2.6+
+- Alfred 3 workflow([alfred-ieasemusic](https://github.com/trazyn/alfred-ieasemusic)), required [v1.2.6+](https://github.com/trazyn/ieaseMusic/releases/latest)
 
   ![Home](https://github.com/trazyn/ieaseMusic/blob/dev/screenshots/alfred.png?raw=true)
 
@@ -43,27 +43,27 @@
 Download the last version on the [website](https://github.com/trazyn/ieaseMusic/releases/latest) or below.
 
 #### Mac(10.9+)
-[Download](https://github.com/trazyn/ieaseMusic/releases/download/v1.2.5/ieaseMusic-1.2.5-mac.dmg) the `.dmg` file, Or use `homebrew`:
+[Download](https://github.com/trazyn/ieaseMusic/releases/download/v1.2.6/ieaseMusic-1.2.6-mac.dmg) the `.dmg` file, Or use `homebrew`:
 ```
 brew cask install ieasemusic
 ```
 
 #### Linux
 
-[Download](https://github.com/trazyn/ieaseMusic/releases/download/v1.2.5/ieaseMusic-1.2.5-linux-amd64.deb) the `.deb` file for 'Debian / Ubuntu':
+[Download](https://github.com/trazyn/ieaseMusic/releases/download/v1.2.6/ieaseMusic-1.2.6-linux-amd64.deb) the `.deb` file for 'Debian / Ubuntu':
 ```
-$ sudo dpkg -i ieaseMusic-1.2.5-linux-amd64.deb
+$ sudo dpkg -i ieaseMusic-1.2.6-linux-amd64.deb
 ```
 
-[Download](https://github.com/trazyn/ieaseMusic/releases/download/v1.2.5/ieaseMusic-1.2.5-linux-x86_64.rpm) the `.rpm` file for 'Centos/RHEL':
+[Download](https://github.com/trazyn/ieaseMusic/releases/download/v1.2.6/ieaseMusic-1.2.6-linux-x86_64.rpm) the `.rpm` file for 'Centos/RHEL':
 ```
-$ sudo yum localinstall ieaseMusic-1.2.5-linux-x86_64.rpm
+$ sudo yum localinstall ieaseMusic-1.2.6-linux-x86_64.rpm
 ```
 
-[Download](https://github.com/trazyn/ieaseMusic/releases/download/v1.2.5/iease-music-1.2.5-x86_64.AppImage) the `.Appimage` file for other distribution:
+[Download](https://github.com/trazyn/ieaseMusic/releases/download/v1.2.6/iease-music-1.2.6-x86_64.AppImage) the `.Appimage` file for other distribution:
 ```
-$ chmod u+x iease-music-1.2.5-x86_64.AppImage
-$ ./iease-music-1.2.5-x86_64.AppImage
+$ chmod u+x iease-music-1.2.6-x86_64.AppImage
+$ ./iease-music-1.2.6-x86_64.AppImage
 ```
 
 Archlinux `pacman` install:

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iease-music",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "description": "这应该是最好的网易云音乐播放器了，没有之一，如果有请打醒 🤘",
   "main": "main.js",
   "scripts": {

diff --git a/src/js/pages/Welcome/index.js b/src/js/pages/Welcome/index.js
@@ -196,6 +196,10 @@ class Welcome extends Component {
     renderFavorite(favorite = {}) {
         var { classes, controller } = this.props;
 
+        if (favorite.size === 0) {
+            return false;
+        }
+
         return (
             <Link
                 className={classes.clearfix}

diff --git a/src/js/stores/home.js b/src/js/stores/home.js
@@ -23,11 +23,14 @@ class Home {
             // Save the songs of red heart
             me.rocking(favorite);
 
-            if (recommend.length) {
+            if (favorite.size) {
+                controller.setup(favorite);
+            } else if (recommend.size) {
                 // Play the recommend songs
                 controller.setup(recommend);
             } else {
-                controller.setup(favorite);
+                // Some user no favorite and recommend, set a fallback playlist
+                controller.setup(res.data.list[2]);
             }
         } else {
             res = await axios.get(`/api/home`);