Merge branch 'unifyFormat'

main.js

@@ -1,20 +1,33 @@
 import {Worker} from 'worker_threads'
 import Minimist from 'minimist'
-
-let argv = Minimist(process.argv.slice(2));
 import fs from 'fs';
 import express from 'express';
-import ffmpeg from 'fluent-ffmpeg';
-
-const app = express();
 import mysql from 'mysql2';
 import SendSeekable from 'send-seekable'
+import 'cnchar'
+import 'sort-array'
+import nodemailer from 'nodemailer'
+import Queue from 'js-queue'
+
+
+import webp from 'webp-converter'
+
+import sortArray from "sort-array";
+
+import pkg from 'opencc'
+import https from "node:https";
+
+import nrc from "node-run-cmd";
+
+import bodyParser from "body-parser";
+
+let argv = Minimist(process.argv.slice(2));
+
+const app = express();
 
 const pool = mysql.createPool({
     keepAliveInitialDelay: 0, enableKeepAlive: true,
 })
-import 'cnchar'
-import 'sort-array'
 
 const Kind = {
     0: "去和声伴奏",
@@ -34,23 +47,8 @@ const db = mysql.createConnection({
     enableKeepAlive: true,
     keepAliveInitialDelay: 0,
 })
-import nodemailer from 'nodemailer'
-import Queue from 'js-queue'
-
-
-import webp from 'webp-converter'
-
-import sortArray from "sort-array";
-
-import pkg from 'opencc'
 const {OpenCC} = pkg
 
-import https from "node:https";
-
-import nrc from "node-run-cmd";
-
-import bodyParser from "body-parser";
-
 webp.grant_permission()
 let queue = new Queue();
 queue.autoRun = false;
@@ -270,7 +268,6 @@ async function Submit(req) {
     } catch (e) {
         GC()
         console.error(e)
-        return
     }
 
 
@@ -389,9 +386,7 @@ app.post('/lyric', async (req, res) => {
 
     async function fetchThatShit() {
         try {
-            let fetched = (await (await fetch(`http://192.168.1.166:28883/jsonapi?title=${convertert2s.convertSync(name)}&artist=${convertert2s.convertSync(artist)}&album=${convertert2s.convertSync(album)}`)).text())
-
-            lrc = fetched
+            lrc = (await (await fetch(`http://192.168.1.166:28883/jsonapi?title=${convertert2s.convertSync(name)}&artist=${convertert2s.convertSync(artist)}&album=${convertert2s.convertSync(album)}`)).text())
 
 
         } catch (err) {