From a29d2c057e5c4d9cd9baad9f6cea9f93d88ccf39 Mon Sep 17 00:00:00 2001 From: Hami Lemon Date: Tue, 29 Mar 2022 19:46:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A8=A1=E5=9D=97=E5=90=8D:?= =?UTF-8?q?=20lrc2lts=20=3D>=20ltc=20(LrcToCaptions)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/.name | 1 + .idea/{lrc2srt.iml => ltc.iml} | 0 .idea/modules.xml | 2 +- cloudlyric.go | 2 +- cloudlyric_test.go | 2 +- go.mod | 2 +- lrc.go | 4 ++-- lrc_test.go | 2 +- build.bat => lrctocaptions/build.bat | 2 +- lts/main.go => lrctocaptions/ltc.go | 28 ++++++++++++++-------------- qqlyric.go | 2 +- qqlyric_test.go | 2 +- srt.go | 4 ++-- srt_test.go | 2 +- util.go | 2 +- util_test.go | 2 +- 16 files changed, 30 insertions(+), 29 deletions(-) create mode 100644 .idea/.name rename .idea/{lrc2srt.iml => ltc.iml} (100%) rename build.bat => lrctocaptions/build.bat (60%) rename lts/main.go => lrctocaptions/ltc.go (84%) diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..4fcc028 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +ltc \ No newline at end of file diff --git a/.idea/lrc2srt.iml b/.idea/ltc.iml similarity index 100% rename from .idea/lrc2srt.iml rename to .idea/ltc.iml diff --git a/.idea/modules.xml b/.idea/modules.xml index 19b0b7d..d70defd 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/cloudlyric.go b/cloudlyric.go index 0cd1fac..e46127c 100644 --- a/cloudlyric.go +++ b/cloudlyric.go @@ -1,4 +1,4 @@ -package lrc2srt +package ltc import ( "encoding/json" diff --git a/cloudlyric_test.go b/cloudlyric_test.go index 8d69e2d..0d82d25 100644 --- a/cloudlyric_test.go +++ b/cloudlyric_test.go @@ -1,4 +1,4 @@ -package lrc2srt +package ltc import ( "fmt" diff --git a/go.mod b/go.mod index 20b43fd..d11e0e1 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/Hami-Lemon/lrc2srt +module github.com/Hami-Lemon/ltc go 1.18 diff --git a/lrc.go b/lrc.go index a4c803c..049d304 100644 --- a/lrc.go +++ b/lrc.go @@ -1,11 +1,11 @@ -package lrc2srt +package ltc import ( "regexp" "strconv" "strings" - "github.com/Hami-Lemon/lrc2srt/glist" + "github.com/Hami-Lemon/ltc/glist" ) type LRCNode struct { diff --git a/lrc_test.go b/lrc_test.go index 10a71b5..2104117 100644 --- a/lrc_test.go +++ b/lrc_test.go @@ -1,4 +1,4 @@ -package lrc2srt +package ltc import ( "reflect" diff --git a/build.bat b/lrctocaptions/build.bat similarity index 60% rename from build.bat rename to lrctocaptions/build.bat index f6cf966..f62eda1 100644 --- a/build.bat +++ b/lrctocaptions/build.bat @@ -1,3 +1,3 @@ echo off @REM forceposix 表示在windows上参数也为linux风格，即以“-”开头 -go build -tags="forceposix" -ldflags "-s -w" -o lts.exe . +go build -tags="forceposix" -ldflags "-s -w" -o ltc.exe . diff --git a/lts/main.go b/lrctocaptions/ltc.go similarity index 84% rename from lts/main.go rename to lrctocaptions/ltc.go index d5fafb3..0136ba9 100644 --- a/lts/main.go +++ b/lrctocaptions/ltc.go @@ -7,7 +7,7 @@ import ( "strings" "time" - l2s "github.com/Hami-Lemon/lrc2srt" + "github.com/Hami-Lemon/ltc" "github.com/jessevdk/go-flags" ) @@ -39,7 +39,7 @@ func main() { } //显示版本信息 if opt.Version { - fmt.Printf("LrcToSrt(lts) version: %s\n", VERSION) + fmt.Printf("LrcToCaptions(ltc) version: %s\n", VERSION) return } //获取保存的文件名 @@ -51,9 +51,9 @@ func main() { var lyric, tranLyric string if opt.Id != "" { if opt.Source != "163" { - lyric, tranLyric = l2s.GetQQLyric(opt.Id) + lyric, tranLyric = ltc.GetQQLyric(opt.Id) } else { - lyric, tranLyric = l2s.Get163Lyric(opt.Id) + lyric, tranLyric = ltc.Get163Lyric(opt.Id) } //下载歌词 if opt.Download { @@ -64,9 +64,9 @@ func main() { } else if !strings.HasSuffix(o, ".lrc") { o += ".lrc" } - l2s.WriteFile(o, lyric) + ltc.WriteFile(o, lyric) if tranLyric != "" { - l2s.WriteFile("tran_"+o, tranLyric) + ltc.WriteFile("tran_"+o, tranLyric) } fmt.Println("下载歌词完成！") return @@ -77,7 +77,7 @@ func main() { fmt.Println("Error: 不支持的格式，目前只支持lrc歌词文件。") os.Exit(1) } - lyric = l2s.ReadFile(opt.Input) + lyric = ltc.ReadFile(opt.Input) if lyric == "" { fmt.Println("获取歌词失败，文件内容为空。") os.Exit(1) @@ -86,17 +86,17 @@ func main() { fmt.Println("Error: 请指定需要转换的歌词。") os.Exit(1) } - lrc, lrcT := l2s.ParseLRC(lyric), l2s.ParseLRC(tranLyric) - srt, srtT := l2s.LrcToSrt(lrc), l2s.LrcToSrt(lrcT) + lrc, lrcT := ltc.ParseLRC(lyric), ltc.ParseLRC(tranLyric) + srt, srtT := ltc.LrcToSrt(lrc), ltc.LrcToSrt(lrcT) if srtT != nil { - var mode l2s.SRTMergeMode + var mode ltc.SRTMergeMode switch opt.Mode { case 1: - mode = l2s.SRT_MERGE_MODE_STACK + mode = ltc.SRT_MERGE_MODE_STACK case 2: - mode = l2s.SRT_MERGE_MODE_UP + mode = ltc.SRT_MERGE_MODE_UP case 3: - mode = l2s.SRT_MERGE_MODE_BOTTOM + mode = ltc.SRT_MERGE_MODE_BOTTOM } srt.Merge(srtT, mode) } @@ -128,7 +128,7 @@ func main() { //如果是相对路径，父目录即是当前运行路径 dir, er := os.Getwd() if er == nil { - name = dir + name + name = dir + string(os.PathSeparator) + name } } fmt.Printf("保存结果为：%s\n", name) diff --git a/qqlyric.go b/qqlyric.go index a3acfba..4fe3ad6 100644 --- a/qqlyric.go +++ b/qqlyric.go @@ -1,4 +1,4 @@ -package lrc2srt +package ltc import ( "compress/gzip" diff --git a/qqlyric_test.go b/qqlyric_test.go index 18dc81c..d339d6e 100644 --- a/qqlyric_test.go +++ b/qqlyric_test.go @@ -1,4 +1,4 @@ -package lrc2srt +package ltc import ( "fmt" diff --git a/srt.go b/srt.go index d61b485..e7e361b 100644 --- a/srt.go +++ b/srt.go @@ -1,9 +1,9 @@ -package lrc2srt +package ltc import ( "bufio" "fmt" - "github.com/Hami-Lemon/lrc2srt/glist" + "github.com/Hami-Lemon/ltc/glist" "io" "os" "path/filepath" diff --git a/srt_test.go b/srt_test.go index 370665d..921af88 100644 --- a/srt_test.go +++ b/srt_test.go @@ -1,4 +1,4 @@ -package lrc2srt +package ltc import "testing" diff --git a/util.go b/util.go index 8f6a720..43d026e 100644 --- a/util.go +++ b/util.go @@ -1,4 +1,4 @@ -package lrc2srt +package ltc import ( "fmt" diff --git a/util_test.go b/util_test.go index c052392..12c5b16 100644 --- a/util_test.go +++ b/util_test.go @@ -1,4 +1,4 @@ -package lrc2srt +package ltc import "testing"