Fix bugs.

hitokoto-osc · Jun 22, 2018 · 4c115f8 · 4c115f8
1 parent bc34969
commit 4c115f8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/src/controllers/netease.js b/src/controllers/netease.js
@@ -424,7 +424,7 @@ controllers.detail = async (ctx, next) => {
     return
   } else {
     ret = await nm.song(ctx.params.id)
-    if (ret.songs.length > 0) {
+    if (Array.isArray(ret.songs) && ret.songs.length > 0) {
       cache.set('nm:detail:' + ctx.params.id, ret, 60 * 60 * 2)
     }
   }
@@ -463,7 +463,7 @@ const Response400 = (ctx, code = 0) => {
 const silentSummary = async (id, ctx) => {
   // First, Get Music URL
   const URLs = await nm.url(id)
-  if (URLs && URLs.data && URLs.data.length > 0) {
+  if (URLs && Array.isArray(URLs.data) && URLs.data.length > 0) {
     const ids = []
     for (let _ of URLs.data) {
       if (_.code !== 404 && _.url) {

diff --git a/src/route.js b/src/route.js
@@ -10,19 +10,18 @@ class route {
   }
 
   async routes () {
-    let routes
-    await this.controller
-      .then((controller) => {
-        // Load RouteMap
-        const Router = require('koa-router')
-        const RouteMap = require(path.join(__dirname, '../', './routes'))(new Router(), controller)
-        routes = RouteMap
-      })
-      .catch(err => {
-        winston.error(err)
-        process.exit(1)
-      })
-    return routes
+    try {
+      let routes
+      const controller = await this.controller
+      // Load RouteMap
+      const Router = require('koa-router')
+      const RouteMap = require(path.join(__dirname, '../', './routes'))(new Router(), controller)
+      routes = RouteMap
+      return routes
+    } catch (err) {
+      winston.error(err)
+      process.exit(1)
+    }
   }
 }
 module.exports = route