Merge branch 'master' into feature/v3.8.0

Author: anhoder

.github/workflows/release.yaml

@@ -28,7 +28,7 @@ jobs:
 
       - name: branch name
         id: branch_name
-        run: |
+        run: |-
           echo "RELEASE_TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
 
       - name: setup release environment
@@ -37,11 +37,14 @@ jobs:
 
       - if: github.ref == 'refs/heads/master' || startsWith(github.ref,'refs/heads/feature/')
         name: release dry-run GORELEASER_SKIP_VALIDATE=true
-        run: make release-dry-run GORELEASER_SKIP_VALIDATE=true
+        run: |- 
+          make release-dry-run GORELEASER_SKIP_VALIDATE=true
+          make scoop-config-gen
 
       - if: startsWith(github.ref,'refs/tags/v')
         name: release dry-run
-        run: make release-dry-run
+        run: |-
+          make release-dry-run
         env:
           RELEASE_TAG: ${{ steps.branch_name.outputs.RELEASE_TAG }}
 
@@ -52,3 +55,19 @@ jobs:
           make release
         env:
           RELEASE_TAG: ${{ steps.branch_name.outputs.RELEASE_TAG }}
+
+      - if: startsWith(github.ref,'refs/tags/v') && github.repository == 'go-musicfox/go-musicfox'
+        name: Generate scoop config and commit
+        run: |-
+          make scoop-config-gen
+          git config --global user.email "anhoder@88.com"
+          git config --global user.name "anhoder"
+          git add .
+          git commit -m "feat: update scoop config" || true
+
+      - if: startsWith(github.ref,'refs/tags/v') && github.repository == 'go-musicfox/go-musicfox'
+        name: Push scoop config
+        uses: ad-m/github-push-action@master
+        with:
+          github_token: ${{secrets.ACCESS_TOKEN}}
+          branch: master

.goreleaser.yaml

@@ -102,24 +102,24 @@ brews:
       system 'echo', '-e', "\033[1;33m给个star✨吧~\033[0m \033[4;36mhttps://github.com/go-musicfox/go-musicfox \033[0m"
       bin.install 'musicfox'
 
-
-scoop:
-  url_template: "https://github.com/go-musicfox/go-musicfox/releases/download/{{ .Tag }}/{{ .ArtifactName }}"
-  bucket:
-    owner: go-musicfox
-    name: go-musicfox
-  folder: deploy/scoop
-
-  commit_author:
-    name: anhoder
-    email: anhoder@88.com
-
-  commit_msg_template: "Scoop update for {{ .ProjectName }} version {{ .Tag }}"
-  homepage: "https://github.com/go-musicfox/go-musicfox"
-  description: "go-musicfox是用Go写的又一款网易云音乐命令行客户端，支持UnblockNeteaseMusic、各种音质级别、lastfm、MPRIS..."
-  license: MIT
-
-  post_install: ["Write-Host '好用记得给go-musicfox一个star✨哦~'"]
+# goreleaser支持的配置不多，暂时不用
+#scoop:
+#  url_template: "https://github.com/go-musicfox/go-musicfox/releases/download/{{ .Tag }}/{{ .ArtifactName }}"
+#  bucket:
+#    owner: go-musicfox
+#    name: go-musicfox
+#  folder: deploy/scoop
+#
+#  commit_author:
+#    name: anhoder
+#    email: anhoder@88.com
+#
+#  commit_msg_template: "Scoop update for {{ .ProjectName }} version {{ .Tag }}"
+#  homepage: "https://github.com/go-musicfox/go-musicfox"
+#  description: "go-musicfox是用Go写的又一款网易云音乐命令行客户端，支持UnblockNeteaseMusic、各种音质级别、lastfm、MPRIS..."
+#  license: MIT
+#
+#  post_install: ["Write-Host '好用记得给go-musicfox一个star✨哦~'"]
 
 release:
   github:

Makefile

@@ -16,6 +16,10 @@ build:
 install:
 	./hack/build.sh install
 
+.PHONY: scoop-config-gen
+scoop-config-gen:
+	./hack/scoop_gen.sh
+
 .PHONY: sysroot-pack
 sysroot-pack:
 	@tar cf - $(SYSROOT_DIR) -P | pv -s $[$(du -sk $(SYSROOT_DIR) | awk '{print $1}') * 1024] | pbzip2 > $(SYSROOT_ARCHIVE)

README.md

@@ -48,7 +48,11 @@ go-musicfox是用Go写的又一款网易云音乐命令行客户端，支持Unbl
 
 #### 9. MacOS歌词显示
 
-![LyricsX](previews/lyricsX.png)
+![LyricsX](previews/lyricsX.gif)
+
+> 1. 需要下载安装[LyricsX go-musicfox Fork版本](https://github.com/go-musicfox/LyricsX/releases/latest)
+> 2. 且go-musicfox >= v3.7.7
+> 3. 在LyricsX设置中，打开`使用系统正在播放的应用`
 
 ## 安装
 

deploy/scoop/go-musicfox.json

@@ -1,18 +1,28 @@
 {
-    "version": "3.7.5",
+    "version": "3.7.7",
     "architecture": {
         "64bit": {
-            "url": "https://github.com/go-musicfox/go-musicfox/releases/download/v3.7.5/go-musicfox_3.7.5_windows_amd64.zip",
-            "bin": [
-                "go-musicfox_3.7.5_windows_amd64/musicfox.exe"
-            ],
-            "hash": "0f032d4893b77e633082eaf876ac2a6a188f25f78ee2b6a3ac8917a5858a246c"
+            "url": "https://github.com/go-musicfox/go-musicfox/releases/download/v3.7.7/go-musicfox_3.7.7_windows_amd64.zip",
+            "hash": "3dee19441c82fe30159e34f00a190267a6fed7cc8baceeae0f707377be162b0a",
+            "extract_dir": "go-musicfox_3.7.7_windows_amd64"
         }
     },
+    "bin": "musicfox.exe",
     "homepage": "https://github.com/go-musicfox/go-musicfox",
     "license": "MIT",
     "description": "go-musicfox是用Go写的又一款网易云音乐命令行客户端，支持UnblockNeteaseMusic、各种音质级别、lastfm、MPRIS...",
-    "post_install": [
-        "Write-Host '好用记得给go-musicfox一个star✨哦~'"
-    ]
-}
+    "post_install": "Write-Host '好用记得给go-musicfox一个star✨哦~'",
+    "env_set": {
+        "MUSICFOX_ROOT": "$dir\\data"
+    },
+    "persist": "data",
+    "checkver": "github",
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://github.com/go-musicfox/go-musicfox/releases/download/v$version/go-musicfox_$version_windows_amd64.zip",
+                "extract_dir": "go-musicfox_$version_windows_amd64"
+            }
+        }
+    }
+}

deploy/scoop/go-musicfox.json.tpl

@@ -0,0 +1,28 @@
+{
+    "version": "${SCOOP_VERSION}",
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/go-musicfox/go-musicfox/releases/download/v${SCOOP_VERSION}/go-musicfox_${SCOOP_VERSION}_windows_amd64.zip",
+            "hash": "${SCOOP_HASH}",
+            "extract_dir": "go-musicfox_${SCOOP_VERSION}_windows_amd64"
+        }
+    },
+    "bin": "musicfox.exe",
+    "homepage": "https://github.com/go-musicfox/go-musicfox",
+    "license": "MIT",
+    "description": "go-musicfox是用Go写的又一款网易云音乐命令行客户端，支持UnblockNeteaseMusic、各种音质级别、lastfm、MPRIS...",
+    "post_install": "Write-Host '好用记得给go-musicfox一个star✨哦~'",
+    "env_set": {
+        "MUSICFOX_ROOT": "\$dir\\\\data"
+    },
+    "persist": "data",
+    "checkver": "github",
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://github.com/go-musicfox/go-musicfox/releases/download/v\$version/go-musicfox_\$version_windows_amd64.zip",
+                "extract_dir": "go-musicfox_\$version_windows_amd64"
+            }
+        }
+    }
+}

go.mod

@@ -3,13 +3,14 @@ module github.com/go-musicfox/go-musicfox
 go 1.18
 
 require (
-	github.com/anhoder/bubbles v0.7.8
-	github.com/anhoder/bubbletea v0.13.0
 	github.com/anhoder/netease-music v1.3.4
 	github.com/anhoder/notificator v0.0.5
 	github.com/bogem/id3v2/v2 v2.1.3
 	github.com/boltdb/bolt v1.3.1
 	github.com/buger/jsonparser v1.1.1
+	github.com/charmbracelet/bubbles v0.15.0
+	github.com/charmbracelet/bubbletea v0.23.2
+	github.com/charmbracelet/lipgloss v0.6.0
 	github.com/faiface/beep v1.1.0
 	github.com/fhs/gompd/v2 v2.2.0
 	github.com/fogleman/ease v0.0.0-20170301025033-8da417bf1776
@@ -20,7 +21,7 @@ require (
 	github.com/gookit/ini/v2 v2.1.0
 	github.com/lucasb-eyer/go-colorful v1.2.0
 	github.com/mattn/go-runewidth v0.0.14
-	github.com/muesli/termenv v0.11.0
+	github.com/muesli/termenv v0.14.0
 	github.com/pkg/errors v0.9.1
 	github.com/progrium/macdriver v0.2.0
 	github.com/shkh/lastfm-go v0.0.0-20191215035245-89a801c244e0
@@ -33,9 +34,10 @@ require (
 require (
 	github.com/anhoder/requests v0.1.2 // indirect
 	github.com/atotto/clipboard v0.1.4 // indirect
+	github.com/aymanbagabas/go-osc52 v1.2.1 // indirect
 	github.com/cnsilvan/UnblockNeteaseMusic v0.0.0-20220606141015-ee827820fabb // indirect
 	github.com/cocoonlife/goflac v0.0.0-20170210142907-50ea06ed5a9d // indirect
-	github.com/containerd/console v1.0.3 // indirect
+	github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 // indirect
 	github.com/forgoer/openssl v1.2.1 // indirect
 	github.com/go-flac/go-flac v0.3.1 // indirect
 	github.com/gomodule/redigo v1.8.8 // indirect
@@ -47,25 +49,30 @@ require (
 	github.com/jfreymuth/oggvorbis v1.0.3 // indirect
 	github.com/jfreymuth/vorbis v1.0.2 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/mattn/go-isatty v0.0.17 // indirect
+	github.com/mattn/go-localereader v0.0.1 // indirect
 	github.com/mewkiz/flac v1.0.7 // indirect
 	github.com/mewkiz/pkg v0.0.0-20211102230744-16a6ce8f1b77 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b // indirect
+	github.com/muesli/cancelreader v0.2.2 // indirect
+	github.com/muesli/reflow v0.3.0 // indirect
 	github.com/rivo/uniseg v0.4.2 // indirect
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
-	golang.org/x/crypto v0.1.0 // indirect
+	golang.org/x/crypto v0.7.0 // indirect
 	golang.org/x/exp/shiny v0.0.0-20230307190834-24139beb5833 // indirect
 	golang.org/x/image v0.5.0 // indirect
 	golang.org/x/mobile v0.0.0-20201217150744-e6ae53a27f4f // indirect
 	golang.org/x/sync v0.1.0 // indirect
-	golang.org/x/sys v0.5.0 // indirect
-	golang.org/x/term v0.5.0 // indirect
+	golang.org/x/sys v0.6.0 // indirect
+	golang.org/x/term v0.6.0 // indirect
 	golang.org/x/text v0.8.0 // indirect
 )
 
 replace (
+	github.com/charmbracelet/bubbletea v0.23.2 => github.com/go-musicfox/bubbletea v0.23.3
 	github.com/cnsilvan/UnblockNeteaseMusic v0.0.0-20220606141015-ee827820fabb => github.com/anhoder/UnblockNeteaseMusic v0.1.0
 	github.com/cocoonlife/goflac v0.0.0-20170210142907-50ea06ed5a9d => github.com/anhoder/goflac v0.1.0
 	github.com/faiface/beep v1.1.0 => github.com/anhoder/beep v1.1.8