AXCWG 3 ヶ月 前
コミット
fa85f6d1e2
2 ファイル変更14 行追加13 行削除
  1. 13 3
      main.js
  2. 1 10
      test.js

+ 13 - 3
main.js

@@ -41,6 +41,7 @@ const https = require("node:https");
 const {OpenCC} = require("opencc");
 const {HttpsProxyAgent} = require("https-proxy-agent");
 const sortArray = require("sort-array");
+const fetch = require("node-fetch");
 const converters2t = new OpenCC('s2t.json')
 const convertert2s = new OpenCC('t2s.json')
 app.use(bodyParser.json({"limit": "200mb"}));
@@ -285,14 +286,23 @@ app.post('/lyric', async (req, res) => {
     let name = req.body.name
     let artist = req.body.artist;
     let album = req.body.albumName;
-    let lrc = "";
+    let lrc = null;
     await fetchThatShit()
 
     async function fetchThatShit() {
         try {
-            lrc = await (await fetch(`http://localhost:28883/api/v1/lyrics/single?title=${convertert2s.convertSync(name)}&album=${convertert2s.convertSync(album)}&artist=${convertert2s.convertSync(artist)}`, {
+            let fetched = (await (await fetch(`http://localhost:28883/api/v1/lyrics/single?title=${convertert2s.convertSync(name)}&album=${convertert2s.convertSync(album)}&artist=${convertert2s.convertSync(artist)}`, {
                 agent: new HttpsProxyAgent("http://localhost:7890")
-            })).text()
+            })).json())
+            for(let entry of fetched) {
+                if(entry.title === converters2t.convertSync(name) || entry.title === convertert2s.convertSync(name) ){
+                    lrc = entry.lyrics
+                }
+            }
+            if(lrc === null) {
+                lrc=fetched[0].lyrics
+            }
+
         } catch (err) {
             await fetchThatShit()
         }

+ 1 - 10
test.js

@@ -5,13 +5,4 @@ queue1.autoRun = false;
 const cnchar = require('cnchar');
 const sortArray = require("sort-array");
 
-async function sth(){
-
-}
-async function getTask(){
-    console.log(2)
-}
-
-
-getTask()
-sth()
+console.log((true || false) && (true && false))