feat: version reject

.env

@@ -1,2 +1,2 @@
-GOLANG_VERSION=1.18.2
+GOLANG_VERSION=1.19
 GO111MODULE=on

.goreleaser.yaml

@@ -4,6 +4,7 @@ env:
   - HOMEBREW_NAME=go-musicfox
 builds:
   - id: go-musicfox-linux-amd64
+    main: ./cmd/musicfox
     binary: musicfox
     hooks:
       pre:
@@ -16,6 +17,8 @@ builds:
       - amd64
     goos:
       - linux
+    ldflags:
+      - -s -w -X constants.AppVersion={{.Version}}
 #  - id: go-musicfox-linux-arm64
 #    binary: musicfox
 #    hooks:
@@ -30,29 +33,38 @@ builds:
 #      - CC=aarch64-linux-gnu-gcc
 #      - CXX=aarch64-linux-gnu-g++
   - id: go-musicfox-windows-amd64
+    main: ./cmd/musicfox
     binary: musicfox
     goarch:
       - amd64
     goos:
       - windows
+    ldflags:
+      - -s -w -X constants.AppVersion={{.Version}}
     env:
       - CC=x86_64-w64-mingw32-gcc
       - CXX=x86_64-w64-mingw32-g++
   - id: go-musicfox-darwin-arm64
+    main: ./cmd/musicfox
     binary: musicfox
     goarch:
       - arm64
     goos:
       - darwin
+    ldflags:
+      - -s -w -X constants.AppVersion={{.Version}}
     env:
       - CC=oa64-clang
       - CXX=oa64-clang++
   - id: go-musicfox-darwin-amd64
+    main: ./cmd/musicfox
     binary: musicfox
     goarch:
       - amd64
     goos:
       - darwin
+    ldflags:
+      - -s -w -X constants.AppVersion={{.Version}}
     env:
       - CC=o64-clang
       - CXX=o64-clang++

cmd/musicfox/main.go

@@ -4,8 +4,8 @@ import (
     "fmt"
     "github.com/gookit/gcli/v2"
     "go-musicfox/configs"
-    "go-musicfox/constants"
     "go-musicfox/pkg/commands"
+    "go-musicfox/pkg/constants"
     "go-musicfox/pkg/ui"
     "go-musicfox/utils"
 )

configs/registry.go

@@ -2,7 +2,7 @@ package configs
 
 import (
     "github.com/gookit/ini/v2"
-    "go-musicfox/constants"
+    "go-musicfox/pkg/constants"
     "time"
 )
 

constants/constants.go → pkg/constants/constants.go

@@ -4,9 +4,10 @@ import (
     "time"
 )
 
+// AppVersion Inject by -ldflags
+var AppVersion = "2.2.1"
+
 const AppName = "musicfox"
-const AppVersion = "2.2.1"
-const AppVersionInt = 20201
 const AppDescription = "<cyan>Musicfox - 命令行版网易云音乐</>"
 const AppShowStartup = true
 const AppGithubUrl = "https://github.com/anhoder/go-musicfox"

utils/player.go → pkg/player/player.go

@@ -1,18 +1,20 @@
-package utils
+package player
 
 import (
     "fmt"
+    "go-musicfox/utils"
+    "io"
+    "net/http"
+    "os"
+    "time"
+
     "github.com/faiface/beep"
     "github.com/faiface/beep/effects"
     "github.com/faiface/beep/flac"
     "github.com/faiface/beep/mp3"
     "github.com/faiface/beep/speaker"
     "github.com/faiface/beep/vorbis"
     "github.com/faiface/beep/wav"
-    "io"
-    "net/http"
-    "os"
-    "time"
 )
 
 // State 播放器状态
@@ -46,7 +48,7 @@ type Player struct {
     CurMusic UrlMusic
     ctrl     *beep.Ctrl
     volume   *effects.Volume
-    Timer    *Timer
+    Timer    *utils.Timer
     timeChan chan time.Duration
     done     chan struct{}
 
@@ -87,7 +89,7 @@ func (p *Player) listen() {
         cacheRFile, cacheWFile *os.File
     )
 
-    cacheFile := fmt.Sprintf("%s/music_cache", GetLocalDataDir())
+    cacheFile := fmt.Sprintf("%s/music_cache", utils.GetLocalDataDir())
 
     for {
         select {
@@ -179,7 +181,7 @@ func (p *Player) listen() {
             speaker.Play(p.volume)
 
             // 启动计时器
-            p.Timer = New(Options{
+            p.Timer = utils.New(utils.Options{
                 Duration:       24 * time.Hour,
                 TickerInternal: 200 * time.Millisecond,
                 OnRun:          func(started bool) {},

pkg/storage/last_signin_date.go

@@ -1,6 +1,8 @@
 package storage
 
-import "go-musicfox/constants"
+import (
+	"go-musicfox/pkg/constants"
+)
 
 type LastSignIn struct {}
 

pkg/storage/play_mode.go

@@ -1,6 +1,8 @@
 package storage
 
-import "go-musicfox/constants"
+import (
+	"go-musicfox/pkg/constants"
+)
 
 type PlayMode struct {}
 

pkg/storage/player_snapshot.go

@@ -1,7 +1,7 @@
 package storage
 
 import (
-    "go-musicfox/constants"
+    "go-musicfox/pkg/constants"
     "go-musicfox/pkg/structs"
 )
 

pkg/storage/user.go

@@ -1,6 +1,8 @@
 package storage
 
-import "go-musicfox/constants"
+import (
+	"go-musicfox/pkg/constants"
+)
 
 type User struct {}
 

pkg/ui/main_ui.go

@@ -1,17 +1,17 @@
 package ui
 
 import (
-    "fmt"
-    tea "github.com/anhoder/bubbletea"
-    "github.com/mattn/go-runewidth"
-    "github.com/muesli/termenv"
+	"fmt"
+	tea "github.com/anhoder/bubbletea"
+	"github.com/mattn/go-runewidth"
+	"github.com/muesli/termenv"
 	"go-musicfox/configs"
-    "go-musicfox/constants"
-    "go-musicfox/utils"
-    "math"
-    "strings"
-    "time"
-    "unicode/utf8"
+	"go-musicfox/pkg/constants"
+	"go-musicfox/utils"
+	"math"
+	"strings"
+	"time"
+	"unicode/utf8"
 )
 
 // ModelType 显示模型的类型

pkg/ui/menu_check_update.go

@@ -1,8 +1,8 @@
 package ui
 
 import (
-    "go-musicfox/constants"
-    "go-musicfox/utils"
+	"go-musicfox/pkg/constants"
+	"go-musicfox/utils"
 )
 
 type CheckUpdateMenu struct {

pkg/ui/menu_help.go

@@ -1,8 +1,8 @@
 package ui
 
 import (
-    "go-musicfox/constants"
-    "go-musicfox/utils"
+	"go-musicfox/pkg/constants"
+	"go-musicfox/utils"
 )
 
 type HelpMenu struct {

pkg/ui/netease.go

@@ -8,9 +8,9 @@ import (
     "github.com/mattn/go-runewidth"
     "github.com/telanflow/cookiejar"
     "go-musicfox/configs"
-    "go-musicfox/constants"
-    "go-musicfox/pkg/structs"
+    "go-musicfox/pkg/constants"
     db2 "go-musicfox/pkg/storage"
+    "go-musicfox/pkg/structs"
     "go-musicfox/utils"
     "strconv"
     "time"

pkg/ui/operate.go

@@ -4,9 +4,10 @@ import (
 	"fmt"
 	"github.com/anhoder/netease-music/service"
 	"github.com/muesli/termenv"
-	"go-musicfox/constants"
-	"go-musicfox/pkg/structs"
+	"go-musicfox/pkg/constants"
+	"go-musicfox/pkg/player"
 	db2 "go-musicfox/pkg/storage"
+	"go-musicfox/pkg/structs"
 	"go-musicfox/utils"
 	"math"
 	"strconv"
@@ -285,11 +286,11 @@ func spaceKeyHandle(m *NeteaseModel) {
 		}
 
 		switch m.player.State {
-		case utils.Paused:
+		case player.Paused:
 			m.player.Resume()
-		case utils.Playing:
+		case player.Playing:
 			m.player.Paused()
-		case utils.Stopped:
+		case player.Stopped:
 			_ = m.player.PlaySong(m.player.playlist[m.player.curSongIndex], DurationNext)
 		}
 
@@ -298,9 +299,9 @@ func spaceKeyHandle(m *NeteaseModel) {
 
 	if inPlayingMenu && songs[selectedIndex].Id == m.player.playlist[m.player.curSongIndex].Id {
 		switch m.player.State {
-		case utils.Paused:
+		case player.Paused:
 			m.player.Resume()
-		case utils.Playing:
+		case player.Playing:
 			m.player.Paused()
 		}
 	} else {

pkg/ui/player.go

@@ -8,10 +8,11 @@ import (
     "github.com/mattn/go-runewidth"
     "github.com/muesli/termenv"
     "go-musicfox/configs"
-    "go-musicfox/constants"
-	"go-musicfox/pkg/structs"
+    "go-musicfox/pkg/constants"
     lyric2 "go-musicfox/pkg/lyric"
+    "go-musicfox/pkg/player"
     db2 "go-musicfox/pkg/storage"
+    "go-musicfox/pkg/structs"
     "go-musicfox/utils"
     "math"
     "math/rand"
@@ -61,14 +62,14 @@ type Player struct {
     playErrCount int // 错误计数，当错误连续超过5次，停止播放
     mode PlayMode
 
-    *utils.Player // 播放器
+    *player.Player // 播放器
 }
 
 func NewPlayer(model *NeteaseModel) *Player {
     player := &Player{
         model:  model,
         mode:   PmListLoop,
-        Player: utils.NewPlayer(),
+        Player: player.NewPlayer(),
     }
 
     // done监听
@@ -182,7 +183,7 @@ func (p *Player) songView() string {
         builder.WriteString(strings.Repeat(" ", p.model.menuStartColumn-4))
         builder.WriteString(SetFgStyle(fmt.Sprintf("[%s] ", p.mode), termenv.ANSIBrightMagenta))
     }
-    if p.State == utils.Playing {
+    if p.State == player.Playing {
         builder.WriteString(SetFgStyle("♫  ♪ ♫  ♪  ", termenv.ANSIBrightYellow))
     } else {
         builder.WriteString(SetFgStyle("_ _ z Z Z  ", termenv.ANSIBrightRed))
@@ -327,7 +328,7 @@ func (p *Player) PlaySong(song structs.Song, duration PlayDirection) error {
     musicType, err2 := jsonparser.GetString(response, "data", "[0]", "type")
     musicType = strings.ToLower(musicType)
     if err1 != nil || err2 != nil || (musicType != "mp3" && musicType != "flac") {
-        p.State = utils.Stopped
+        p.State = player.Stopped
         p.progressRamp = []string{}
         p.playErrCount++
         if p.playErrCount >= 3 {
@@ -348,9 +349,9 @@ func (p *Player) PlaySong(song structs.Song, duration PlayDirection) error {
 
     switch musicType {
     case "mp3":
-        p.Player.Play(utils.Mp3, url, song.Duration)
+        p.Player.Play(player.Mp3, url, song.Duration)
     case "flac":
-        p.Player.Play(utils.Flac, url, song.Duration)
+        p.Player.Play(player.Flac, url, song.Duration)
     }
 
     var artistNames []string

pkg/ui/startup.go

@@ -1,17 +1,17 @@
 package ui
 
 import (
-    "fmt"
-    tea "github.com/anhoder/bubbletea"
-    "github.com/fogleman/ease"
-    "github.com/muesli/termenv"
+	"fmt"
+	tea "github.com/anhoder/bubbletea"
+	"github.com/fogleman/ease"
+	"github.com/muesli/termenv"
 	"go-musicfox/configs"
-    "go-musicfox/constants"
-    "go-musicfox/utils"
-    "math"
-    "strings"
-    "time"
-    "unicode/utf8"
+	"go-musicfox/pkg/constants"
+	"go-musicfox/utils"
+	"math"
+	"strings"
+	"time"
+	"unicode/utf8"
 )
 
 var (

pkg/ui/ui_helper.go

@@ -5,7 +5,7 @@ import (
 	"github.com/lucasb-eyer/go-colorful"
 	"github.com/muesli/termenv"
 	"go-musicfox/configs"
-	"go-musicfox/constants"
+	"go-musicfox/pkg/constants"
 	ds2 "go-musicfox/pkg/structs"
 	"go-musicfox/utils"
 	"math/rand"

utils/utils.go

@@ -6,6 +6,7 @@ import (
     "encoding/binary"
     "errors"
     "fmt"
+    "go-musicfox/pkg/constants"
     "io"
     "net/http"
     "os"
@@ -16,7 +17,6 @@ import (
 
     "github.com/buger/jsonparser"
     "go-musicfox/configs"
-    "go-musicfox/constants"
     ds2 "go-musicfox/pkg/structs"
 )