Merge pull request #227 from trazyn/dev

FIx bug

Author: trazyn

server/router/player.js

@@ -199,7 +199,7 @@ router.get('/song/:id/:name/:artists/:flac?', cache('3 minutes', onlyStatus200),
                     // Only accept highquality
                 } else {
                     // Try to get the normal quality track
-                    song = await selector.getMp3(name, artists, id);
+                    song = await selector.getTrack(name, artists, id);
                 }
             }
         }

server/search/Baidu.js

@@ -5,7 +5,7 @@ import chalk from 'chalk';
 const debug = _debug('dev:plugin:Baidu');
 const error = _debug('dev:plugin:Baidu:error');
 
-export default async(request, keyword, artists, isFlac) => {
+export default async(request, keyword, artists) => {
     debug(chalk.black.bgGreen('💊  Loaded Baidu music.'));
 
     try {
@@ -29,7 +29,6 @@ export default async(request, keyword, artists, isFlac) => {
             uri: 'http://music.taihe.com/data/music/fmlink',
             qs: {
                 songIds: song.songid,
-                type: isFlac ? 'flac' : 'mp3',
             },
         });
 
@@ -53,10 +52,6 @@ export default async(request, keyword, artists, isFlac) => {
             debug(chalk.black.bgGreen('🚚  Result >>>'));
             debug(response.data.songList[0]);
             debug(chalk.black.bgGreen('🚚  <<<'));
-
-            if (isFlac) {
-                song.isFlac = true;
-            }
         }
     } catch (ex) {
         // Anti-warnning

server/search/Netease.js

@@ -35,6 +35,10 @@ export default async(request, keyword, artists, id) => {
             bitRate: song.br,
         };
 
+        if (!song.src) {
+            return Promise.reject(Error(404));
+        }
+
         debug(chalk.black.bgGreen('🚚  Result >>>'));
         debug(song);
         debug(chalk.black.bgGreen('🚚  <<<'));

server/search/index.js

@@ -50,10 +50,10 @@ async function exe(plugins, ...args) {
 }
 
 async function getFlac(keyword, artists) {
-    return exe([Baidu, QQ], keyword, artists, true);
+    return exe([QQ], keyword, artists, true);
 }
 
-async function getMp3(keyword, artists, id /** This id is only work for netease music */) {
+async function getTrack(keyword, artists, id /** This id is only work for netease music */) {
     var preferences = await getPreferences();
     var enginers = preferences.enginers;
     var plugins = [Netease];
@@ -98,5 +98,5 @@ async function getMp3(keyword, artists, id /** This id is only work for netease
 
 export {
     getFlac,
-    getMp3,
+    getTrack,
 };