Merge branch 'dev'

# Conflicts:
#	.github/workflows/build.yml
#	.github/workflows/docker.yml

Author: stephen-zeng

build.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+GOOS=darwin GOARCH=arm64 CGO_ENABLED=1 CC=clang go build -o bin/lrcAPI_v$1_darwin_arm64
+GOOS=darwin GOARCH=amd64 CGO_ENABLED=1 CC="clang -arch x86_64" go build -o bin/lrcAPI_v$1_darwin_amd64
+GOOS=linux GOARCH=amd64 CGO_ENABLED=1 CC=x86_64-linux-musl-gcc go build -o bin/lrcAPI_v$1_linux_amd64
+GOOS=linux GOARCH=arm64 CGO_ENABLED=1 CC=aarch64-linux-musl-gcc go build -o bin/lrcAPI_v$1_linux_arm64
+GOOS=windows GOARCH=amd64 CGO_ENABLED=1 CC=x86_64-w64-mingw32-gcc go build -o bin/lrcAPI_v$1_windows_amd64.exe
+GOOS=windows GOARCH=arm64 CGO_ENABLED=1 CC=/opt/llvm-mingw/bin/aarch64-w64-mingw32-gcc go build -o bin/lrcAPI_v$1_windows_arm64.exe
+
+

command/command.go

@@ -1,6 +1,13 @@
 package command
 
+import (
+	"github.com/common-nighthawk/go-figure"
+	"os"
+)
+
 func Arg(args []string) {
+	figlet := figure.NewFigure("LrcAPI-Go", "", true)
+	figlet.Print()
 	for index, arg := range args {
 		if index == 0 {
 			continue
@@ -12,4 +19,8 @@ func Arg(args []string) {
 			Pwd = args[index+1]
 		}
 	}
+	dir, _ := os.Getwd()
+	if os.Getenv("PWD") != "" && os.Getenv("PWD") != dir {
+		Pwd = os.Getenv("PWD")
+	}
 }

go.mod

@@ -7,6 +7,7 @@ require (
 	github.com/bytedance/sonic/loader v0.2.4 // indirect
 	github.com/cloudwego/base64x v0.1.5 // indirect
 	github.com/cloudwego/iasm v0.2.0 // indirect
+	github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be // indirect
 	github.com/gabriel-vasile/mimetype v1.4.8 // indirect
 	github.com/gin-contrib/cors v1.7.5 // indirect
 	github.com/gin-contrib/sse v1.1.0 // indirect

go.sum

@@ -7,6 +7,8 @@ github.com/cloudwego/base64x v0.1.5 h1:XPciSp1xaq2VCSt6lF0phncD4koWyULpl5bUxbfCy
 github.com/cloudwego/base64x v0.1.5/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w=
 github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg=
 github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY=
+github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be h1:J5BL2kskAlV9ckgEsNQXscjIaLiOYiZ75d4e94E6dcQ=
+github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be/go.mod h1:mk5IQ+Y0ZeO87b858TlA645sVcEcbiX6YqP98kt+7+w=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/gabriel-vasile/mimetype v1.4.8 h1:FfZ3gj38NjllZIeJAmMhr+qKL8Wu+nOoI3GqacKw1NM=

handler/lyric.go

@@ -7,6 +7,7 @@ import (
 	"lrcAPI/request"
 	"lrcAPI/util"
 	"net/http"
+	"strconv"
 )
 
 func lyricHandler(c *gin.Context) {
@@ -35,9 +36,9 @@ func lyricHandler(c *gin.Context) {
 		util.ErrorPrinter(err)
 		c.JSON(404, gin.H{})
 	}
-	for _, value := range lyricRequest.Processor.InfoLyric {
+	for index, value := range lyricRequest.Processor.InfoLyric {
 		lyricRequest.File.InfoLyric = append(lyricRequest.File.InfoLyric, file.InfoLyric{
-			ID:     value.ID,
+			ID:     strconv.Itoa(index),
 			Title:  value.Title,
 			Artist: value.Artist,
 			Lyric:  value.Lyric,

processor/config.go

@@ -1,14 +1,21 @@
 package processor
 
+var (
+	API_TOT           = 2
+	NETEASE_API_COUNT = 0
+	QQ_API_COUNT      = 1
+)
+
 type Processor struct {
 	InfoLyric []InfoLyric
 	Title     string `json:"title"`
 	Artist    string `json:"artist"`
 }
 
 type InfoLyric struct {
-	ID     string `json:"id"`
+	Index  int    `json:"index"`
 	Title  string `json:"title"`
 	Artist string `json:"artist"`
 	Lyric  string `json:"lyrics"`
+	API    string `json:"api"`
 }

processor/lyric.go

@@ -1,32 +1,32 @@
 package processor
 
 import (
+	"fmt"
 	"github.com/pkg/errors"
 	"lrcAPI/util"
-	"strconv"
+	"sort"
 )
 
 func (data *Processor) Process() error {
-	var titles, artists, oriLrc, trLrc []string
-	if err := netease(data, &titles, &artists, &oriLrc, &trLrc); err != nil {
+	if err := netease(data); err != nil {
 		return errors.Wrap(err, "neteaseAPI")
 	}
-	if err := qq(data, &titles, &artists, &oriLrc, &trLrc); err != nil {
+	if err := qq(data); err != nil {
 		return errors.Wrap(err, "qqAPI")
 	}
-	for index, _ := range titles {
-		infoLyric := InfoLyric{
-			ID:     strconv.Itoa(index),
-			Title:  titles[index],
-			Artist: artists[index],
-			Lyric:  util.LrcTranslationBlender(oriLrc[index], trLrc[index]),
-		}
-		data.InfoLyric = append(data.InfoLyric, infoLyric)
-	}
+	sort.Slice(data.InfoLyric, func(i, j int) bool {
+		return data.InfoLyric[i].Index < data.InfoLyric[j].Index
+	})
+	data.InfoLyric = append(data.InfoLyric, InfoLyric{
+		Index:  -1,
+		Title:  data.Title,
+		Artist: data.Artist,
+		Lyric:  fmt.Sprintf("[00:00.00]%s\n[00:00.00]%s", data.Title, data.Artist),
+	})
 	return nil
 }
 
-func netease(data *Processor, Titles, Artists, OriLrc, TrLrc *[]string) error {
+func netease(data *Processor) error {
 	musicIDs, titles, artists, err := util.NeteaseGetMusic(data.Title, data.Artist)
 	if err != nil {
 		return errors.WithStack(err)
@@ -39,15 +39,17 @@ func netease(data *Processor, Titles, Artists, OriLrc, TrLrc *[]string) error {
 		if err != nil {
 			return errors.WithStack(err)
 		}
-		*Titles = append(*Titles, (*titles)[index])
-		*Artists = append(*Artists, (*artists)[index])
-		*OriLrc = append(*OriLrc, oriLrc)
-		*TrLrc = append(*TrLrc, trLrc)
+		data.InfoLyric = append(data.InfoLyric, InfoLyric{
+			Index:  API_TOT*index + NETEASE_API_COUNT,
+			Title:  (*titles)[index] + " (网易云音乐)",
+			Artist: (*artists)[index],
+			Lyric:  util.LrcTranslationBlender(oriLrc, trLrc),
+		})
 	}
 	return nil
 }
 
-func qq(data *Processor, Titles, Artists, OriLrc, TrLrc *[]string) error {
+func qq(data *Processor) error {
 	musicIDs, musicMIDs, titles, artists, err := util.QQGetMusic(data.Title)
 	if err != nil {
 		return errors.WithStack(err)
@@ -60,10 +62,12 @@ func qq(data *Processor, Titles, Artists, OriLrc, TrLrc *[]string) error {
 		if err != nil {
 			return errors.WithStack(err)
 		}
-		*Titles = append(*Titles, (*titles)[index])
-		*Artists = append(*Artists, (*artists)[index])
-		*OriLrc = append(*OriLrc, oriLrc)
-		*TrLrc = append(*TrLrc, trLrc)
+		data.InfoLyric = append(data.InfoLyric, InfoLyric{
+			Index:  API_TOT*index + QQ_API_COUNT,
+			Title:  (*titles)[index] + " (QQ音乐)",
+			Artist: (*artists)[index],
+			Lyric:  util.LrcTranslationBlender(oriLrc, trLrc),
+		})
 	}
 	return nil
 }

util/netease.go

@@ -40,6 +40,7 @@ type neteaseSerachIDResponse struct {
 // 通过ID查找歌词
 // 返回歌词，翻译歌词以及错误
 // 返回的歌词都是未转译的
+// 若返回的歌词数据是空的，那就是无歌词（纯音乐）
 func NeteaseGetLyric(ID string) (string, string, error) {
 	url := fmt.Sprintf(neteaseLrcURLTemplate, ID)
 	req, _ := http.NewRequest("GET", url, nil)