Merge pull request #189 from anhoder/master

optimize
go-musicfox · Sep 3, 2023 · 074f359 · 074f359
2 parents 477dc68 + 046d731
commit 074f359
Show file tree

Hide file tree

Showing 161 changed files with 166 additions and 164 deletions.
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -18,7 +18,7 @@ builds:
     goos:
       - linux
     ldflags:
-      - -s -w -X github.com/go-musicfox/go-musicfox/pkg/constants.AppVersion={{.Tag}} -X github.com/go-musicfox/go-musicfox/pkg/constants.LastfmKey={{.Env.LASTFM_KEY}} -X github.com/go-musicfox/go-musicfox/pkg/constants.LastfmSecret={{.Env.LASTFM_SECRET}}
+      - -s -w -X github.com/go-musicfox/go-musicfox/internal/constants.AppVersion={{.Tag}} -X github.com/go-musicfox/go-musicfox/internal/constants.LastfmKey={{.Env.LASTFM_KEY}} -X github.com/go-musicfox/go-musicfox/internal/constants.LastfmSecret={{.Env.LASTFM_SECRET}}
   - id: go-musicfox-linux-arm64
     main: ./cmd/musicfox.go
     binary: musicfox
@@ -34,7 +34,7 @@ builds:
       - LDFLAGS=-L/usr/aarch64-linux-gnu/lib:$LDFLAGS
       - PKG_CONFIG_PATH=/usr/aarch64-linux-gnu/lib/pkgconfig:$PKG_CONFIG_PATH
     ldflags:
-      - -s -w -X github.com/go-musicfox/go-musicfox/pkg/constants.AppVersion={{.Tag}} -X github.com/go-musicfox/go-musicfox/pkg/constants.LastfmKey={{.Env.LASTFM_KEY}} -X github.com/go-musicfox/go-musicfox/pkg/constants.LastfmSecret={{.Env.LASTFM_SECRET}}
+      - -s -w -X github.com/go-musicfox/go-musicfox/internal/constants.AppVersion={{.Tag}} -X github.com/go-musicfox/go-musicfox/internal/constants.LastfmKey={{.Env.LASTFM_KEY}} -X github.com/go-musicfox/go-musicfox/internal/constants.LastfmSecret={{.Env.LASTFM_SECRET}}
   - id: go-musicfox-linux-arm
     main: ./cmd/musicfox.go
     binary: musicfox
@@ -50,7 +50,7 @@ builds:
       - LDFLAGS=-L/usr/arm-linux-gnueabi/lib:$LDFLAGS
       - PKG_CONFIG_PATH=/usr/arm-linux-gnueabi/lib/pkgconfig:$PKG_CONFIG_PATH
     ldflags:
-      - -s -w -X github.com/go-musicfox/go-musicfox/pkg/constants.AppVersion={{.Tag}} -X github.com/go-musicfox/go-musicfox/pkg/constants.LastfmKey={{.Env.LASTFM_KEY}} -X github.com/go-musicfox/go-musicfox/pkg/constants.LastfmSecret={{.Env.LASTFM_SECRET}}
+      - -s -w -X github.com/go-musicfox/go-musicfox/internal/constants.AppVersion={{.Tag}} -X github.com/go-musicfox/go-musicfox/internal/constants.LastfmKey={{.Env.LASTFM_KEY}} -X github.com/go-musicfox/go-musicfox/internal/constants.LastfmSecret={{.Env.LASTFM_SECRET}}
   - id: go-musicfox-windows-amd64
     main: ./cmd/musicfox.go
     binary: musicfox
@@ -59,7 +59,7 @@ builds:
     goos:
       - windows
     ldflags:
-      - -s -w -X github.com/go-musicfox/go-musicfox/pkg/constants.AppVersion={{.Tag}} -X github.com/go-musicfox/go-musicfox/pkg/constants.LastfmKey={{.Env.LASTFM_KEY}} -X github.com/go-musicfox/go-musicfox/pkg/constants.LastfmSecret={{.Env.LASTFM_SECRET}}
+      - -s -w -X github.com/go-musicfox/go-musicfox/internal/constants.AppVersion={{.Tag}} -X github.com/go-musicfox/go-musicfox/internal/constants.LastfmKey={{.Env.LASTFM_KEY}} -X github.com/go-musicfox/go-musicfox/internal/constants.LastfmSecret={{.Env.LASTFM_SECRET}}
     env:
       - CC=/usr/local/mingw/bin/x86_64-w64-mingw32-gcc
       - CXX=/usr/local/mingw/bin/x86_64-w64-mingw32-g++
@@ -74,7 +74,7 @@ builds:
     goos:
       - windows
     ldflags:
-      - -s -w -X github.com/go-musicfox/go-musicfox/pkg/constants.AppVersion={{.Tag}} -X github.com/go-musicfox/go-musicfox/pkg/constants.LastfmKey={{.Env.LASTFM_KEY}} -X github.com/go-musicfox/go-musicfox/pkg/constants.LastfmSecret={{.Env.LASTFM_SECRET}}
+      - -s -w -X github.com/go-musicfox/go-musicfox/internal/constants.AppVersion={{.Tag}} -X github.com/go-musicfox/go-musicfox/internal/constants.LastfmKey={{.Env.LASTFM_KEY}} -X github.com/go-musicfox/go-musicfox/internal/constants.LastfmSecret={{.Env.LASTFM_SECRET}}
     env:
       - CC=/usr/local/mingw/bin/aarch64-w64-mingw32-gcc
       - CXX=/usr/local/mingw/bin/aarch64-w64-mingw32-g++
@@ -89,7 +89,7 @@ builds:
     goos:
       - darwin
     ldflags:
-      - -s -w -X github.com/go-musicfox/go-musicfox/pkg/constants.AppVersion={{.Tag}} -X github.com/go-musicfox/go-musicfox/pkg/constants.LastfmKey={{.Env.LASTFM_KEY}} -X github.com/go-musicfox/go-musicfox/pkg/constants.LastfmSecret={{.Env.LASTFM_SECRET}}
+      - -s -w -X github.com/go-musicfox/go-musicfox/internal/constants.AppVersion={{.Tag}} -X github.com/go-musicfox/go-musicfox/internal/constants.LastfmKey={{.Env.LASTFM_KEY}} -X github.com/go-musicfox/go-musicfox/internal/constants.LastfmSecret={{.Env.LASTFM_SECRET}}
     env:
       - CC=oa64-clang
       - CXX=oa64-clang++
@@ -101,7 +101,7 @@ builds:
     goos:
       - darwin
     ldflags:
-      - -s -w -X github.com/go-musicfox/go-musicfox/pkg/constants.AppVersion={{.Tag}} -X github.com/go-musicfox/go-musicfox/pkg/constants.LastfmKey={{.Env.LASTFM_KEY}} -X github.com/go-musicfox/go-musicfox/pkg/constants.LastfmSecret={{.Env.LASTFM_SECRET}}
+      - -s -w -X github.com/go-musicfox/go-musicfox/internal/constants.AppVersion={{.Tag}} -X github.com/go-musicfox/go-musicfox/internal/constants.LastfmKey={{.Env.LASTFM_KEY}} -X github.com/go-musicfox/go-musicfox/internal/constants.LastfmSecret={{.Env.LASTFM_SECRET}}
     env:
       - CC=o64-clang
       - CXX=o64-clang++

diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 PACKAGE_NAME          := go-musicfox
 GOLANG_CROSS_VERSION  ?= v1.21.0
-INJECT_PACKAGE        ?= github.com/go-musicfox/go-musicfox/pkg/constants
+INJECT_PACKAGE        ?= github.com/go-musicfox/go-musicfox/internal/constants
 LDFLAGS               := -s -w
 LASTFM_KEY            ?=
 LASTFM_SECRET         ?=
@@ -85,6 +85,5 @@ release-debug-shell:
     	-v `pwd`:/go/src/$(PACKAGE_NAME) \
 		-v `pwd`/sysroot:/sysroot \
 		-w /go/src/$(PACKAGE_NAME) \
-    	-w /go/src/go-musicfox \
     	--entrypoint="/bin/bash" \
     	$(GORELEASER_IMAGE)
diff --git a/cmd/musicfox.go b/cmd/musicfox.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/go-musicfox/go-musicfox/pkg/entry"
+	"github.com/go-musicfox/go-musicfox/internal/entry"
 )
 
 func main() {

diff --git a/deploy/nix/default.nix b/deploy/nix/default.nix
@@ -23,7 +23,7 @@ buildGoModule rec {
   ldflags = [
     "-s"
     "-w"
-    "-X github.com/go-musicfox/go-musicfox/pkg/constants.AppVersion=${version}"
+    "-X github.com/go-musicfox/go-musicfox/internal/constants.AppVersion=${version}"
   ];
 
   nativeBuildInputs = [

diff --git a/hack/build.sh b/hack/build.sh
@@ -12,7 +12,7 @@ BUILD_GOOS=${GOOS:-$(go env GOOS)}
 BUILD_GOARCH=${GOARCH:-$(go env GOARCH)}
 GOBINARY=${GOBINARY:-go}
 LDFLAGS=${LDFLAGS:-""}
-INJECT_PACKAGE=${INJECT_PACKAGE:-"github.com/go-musicfox/go-musicfox/pkg/constants"}
+INJECT_PACKAGE=${INJECT_PACKAGE:-"github.com/go-musicfox/go-musicfox/internal/constants"}
 LASTFM_KEY=${LASTFM_KEY:-""}
 LASTFM_SECRET=${LASTFM_SECRET:-""}
 BUILD_TARGET=${BUILD_TARGET:-""}

diff --git a/pkg/commands/config.go → internal/commands/config.go b/pkg/commands/config.go → internal/commands/config.go
@@ -5,7 +5,7 @@ import (
 	"path"
 
 	"github.com/anhoder/foxful-cli/util"
-	"github.com/go-musicfox/go-musicfox/pkg/constants"
+	"github.com/go-musicfox/go-musicfox/internal/constants"
 	"github.com/go-musicfox/go-musicfox/utils"
 	"github.com/gookit/gcli/v2"
 	"github.com/muesli/termenv"

diff --git a/pkg/commands/netease.go → internal/commands/netease.go b/pkg/commands/netease.go → internal/commands/netease.go
@@ -6,9 +6,9 @@ import (
 	"strconv"
 
 	"github.com/anhoder/foxful-cli/model"
-	"github.com/go-musicfox/go-musicfox/pkg/configs"
-	"github.com/go-musicfox/go-musicfox/pkg/constants"
-	"github.com/go-musicfox/go-musicfox/pkg/ui"
+	"github.com/go-musicfox/go-musicfox/internal/configs"
+	"github.com/go-musicfox/go-musicfox/internal/constants"
+	"github.com/go-musicfox/go-musicfox/internal/ui"
 	"github.com/go-musicfox/go-musicfox/utils"
 	"github.com/mattn/go-runewidth"
 

diff --git a/pkg/commands/options.go → internal/commands/options.go b/pkg/commands/options.go → internal/commands/options.go
diff --git a/pkg/configs/registry.go → internal/configs/registry.go b/pkg/configs/registry.go → internal/configs/registry.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/anhoder/foxful-cli/model"
 	tea "github.com/charmbracelet/bubbletea"
-	"github.com/go-musicfox/go-musicfox/pkg/constants"
+	"github.com/go-musicfox/go-musicfox/internal/constants"
 
 	"github.com/go-musicfox/netease-music/service"
 	"github.com/gookit/ini/v2"

diff --git a/pkg/constants/constants.go → internal/constants/constants.go b/pkg/constants/constants.go → internal/constants/constants.go
diff --git a/pkg/entry/cli.go → internal/entry/cli.go b/pkg/entry/cli.go → internal/entry/cli.go
@@ -5,9 +5,9 @@ import (
 	"log"
 
 	"github.com/anhoder/foxful-cli/util"
-	"github.com/go-musicfox/go-musicfox/pkg/commands"
-	"github.com/go-musicfox/go-musicfox/pkg/configs"
-	"github.com/go-musicfox/go-musicfox/pkg/constants"
+	"github.com/go-musicfox/go-musicfox/internal/commands"
+	"github.com/go-musicfox/go-musicfox/internal/configs"
+	"github.com/go-musicfox/go-musicfox/internal/constants"
 	"github.com/go-musicfox/go-musicfox/utils"
 
 	neteaseutil "github.com/go-musicfox/netease-music/util"

diff --git a/pkg/entry/entry.go → internal/entry/entry.go b/pkg/entry/entry.go → internal/entry/entry.go
diff --git a/pkg/entry/entry_darwin.go → internal/entry/entry_darwin.go b/pkg/entry/entry_darwin.go → internal/entry/entry_darwin.go
@@ -4,8 +4,8 @@ package entry
 
 import (
 	"github.com/ebitengine/purego/objc"
-	"github.com/go-musicfox/go-musicfox/pkg/macdriver/cocoa"
-	"github.com/go-musicfox/go-musicfox/pkg/macdriver/core"
+	"github.com/go-musicfox/go-musicfox/internal/macdriver/cocoa"
+	"github.com/go-musicfox/go-musicfox/internal/macdriver/core"
 	"github.com/go-musicfox/go-musicfox/utils"
 )
 

diff --git a/pkg/lastfm/api.go → internal/lastfm/api.go b/pkg/lastfm/api.go → internal/lastfm/api.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/go-musicfox/go-musicfox/pkg/constants"
-	"github.com/go-musicfox/go-musicfox/pkg/structs"
+	"github.com/go-musicfox/go-musicfox/internal/constants"
+	"github.com/go-musicfox/go-musicfox/internal/structs"
 	"github.com/go-musicfox/go-musicfox/utils"
 
 	"github.com/pkg/errors"

diff --git a/pkg/lastfm/api_test.go → internal/lastfm/api_test.go b/pkg/lastfm/api_test.go → internal/lastfm/api_test.go
diff --git a/pkg/lyric/lrc.go → internal/lyric/lrc.go b/pkg/lyric/lrc.go → internal/lyric/lrc.go
diff --git a/pkg/lyric/lrc_timer.go → internal/lyric/lrc_timer.go b/pkg/lyric/lrc_timer.go → internal/lyric/lrc_timer.go
@@ -48,6 +48,9 @@ func (t *LRCTimer) Start() {
 		transContent = t.transFile.FindByTimeMs(current.StartTimeMs)
 		isLast       = t.curIndex >= len(fragments)-1
 	)
+	for _, l := range t.listeners {
+		l(current.StartTimeMs, current.Content, transContent, isLast, t.curIndex)
+	}
 	for {
 		select {
 		case <-t.stop:

diff --git a/pkg/macdriver/avcore/avasset.go → internal/macdriver/avcore/avasset.go b/pkg/macdriver/avcore/avasset.go → internal/macdriver/avcore/avasset.go
@@ -4,7 +4,7 @@ package avcore
 
 import (
 	"github.com/ebitengine/purego/objc"
-	"github.com/go-musicfox/go-musicfox/pkg/macdriver/core"
+	"github.com/go-musicfox/go-musicfox/internal/macdriver/core"
 )
 
 func init() {

diff --git a/pkg/macdriver/avcore/avcore.go → internal/macdriver/avcore/avcore.go b/pkg/macdriver/avcore/avcore.go → internal/macdriver/avcore/avcore.go
diff --git a/pkg/macdriver/avcore/avplayer.go → internal/macdriver/avcore/avplayer.go b/pkg/macdriver/avcore/avplayer.go → internal/macdriver/avcore/avplayer.go
@@ -6,8 +6,8 @@ import (
 	"unsafe"
 
 	"github.com/ebitengine/purego/objc"
-	"github.com/go-musicfox/go-musicfox/pkg/macdriver"
-	"github.com/go-musicfox/go-musicfox/pkg/macdriver/core"
+	"github.com/go-musicfox/go-musicfox/internal/macdriver"
+	"github.com/go-musicfox/go-musicfox/internal/macdriver/core"
 )
 
 func init() {

diff --git a/pkg/macdriver/avcore/avplayer_test.go → internal/macdriver/avcore/avplayer_test.go b/pkg/macdriver/avcore/avplayer_test.go → internal/macdriver/avcore/avplayer_test.go
@@ -7,8 +7,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/go-musicfox/go-musicfox/pkg/macdriver/cocoa"
-	"github.com/go-musicfox/go-musicfox/pkg/macdriver/core"
+	"github.com/go-musicfox/go-musicfox/internal/macdriver/cocoa"
+	"github.com/go-musicfox/go-musicfox/internal/macdriver/core"
 )
 
 func TestMain(m *testing.M) {

diff --git a/pkg/macdriver/avcore/avplayeritem.go → internal/macdriver/avcore/avplayeritem.go b/pkg/macdriver/avcore/avplayeritem.go → internal/macdriver/avcore/avplayeritem.go
@@ -6,7 +6,7 @@ import (
 	"unsafe"
 
 	"github.com/ebitengine/purego/objc"
-	"github.com/go-musicfox/go-musicfox/pkg/macdriver/core"
+	"github.com/go-musicfox/go-musicfox/internal/macdriver/core"
 )
 
 func init() {

diff --git a/pkg/macdriver/avcore/testdata/a.mp3 → internal/macdriver/avcore/testdata/a.mp3 b/pkg/macdriver/avcore/testdata/a.mp3 → internal/macdriver/avcore/testdata/a.mp3
diff --git a/pkg/macdriver/cocoa/cocoa.go → internal/macdriver/cocoa/cocoa.go b/pkg/macdriver/cocoa/cocoa.go → internal/macdriver/cocoa/cocoa.go
diff --git a/pkg/macdriver/cocoa/nsapplication.go → internal/macdriver/cocoa/nsapplication.go b/pkg/macdriver/cocoa/nsapplication.go → internal/macdriver/cocoa/nsapplication.go
@@ -4,7 +4,7 @@ package cocoa
 
 import (
 	"github.com/ebitengine/purego/objc"
-	"github.com/go-musicfox/go-musicfox/pkg/macdriver/core"
+	"github.com/go-musicfox/go-musicfox/internal/macdriver/core"
 )
 
 func init() {

diff --git a/...macdriver/cocoa/nsapplication_delegate.go → ...macdriver/cocoa/nsapplication_delegate.go b/...macdriver/cocoa/nsapplication_delegate.go → ...macdriver/cocoa/nsapplication_delegate.go
@@ -4,8 +4,8 @@ package cocoa
 
 import (
 	"github.com/ebitengine/purego/objc"
-	"github.com/go-musicfox/go-musicfox/pkg/macdriver"
-	"github.com/go-musicfox/go-musicfox/pkg/macdriver/core"
+	"github.com/go-musicfox/go-musicfox/internal/macdriver"
+	"github.com/go-musicfox/go-musicfox/internal/macdriver/core"
 )
 
 func init() {

diff --git a/pkg/macdriver/cocoa/nsapplication_test.go → ...nal/macdriver/cocoa/nsapplication_test.go b/pkg/macdriver/cocoa/nsapplication_test.go → ...nal/macdriver/cocoa/nsapplication_test.go
diff --git a/pkg/macdriver/cocoa/nsimage.go → internal/macdriver/cocoa/nsimage.go b/pkg/macdriver/cocoa/nsimage.go → internal/macdriver/cocoa/nsimage.go
@@ -4,8 +4,8 @@ package cocoa
 
 import (
 	"github.com/ebitengine/purego/objc"
-	"github.com/go-musicfox/go-musicfox/pkg/macdriver"
-	"github.com/go-musicfox/go-musicfox/pkg/macdriver/core"
+	"github.com/go-musicfox/go-musicfox/internal/macdriver"
+	"github.com/go-musicfox/go-musicfox/internal/macdriver/core"
 )
 
 func init() {

diff --git a/pkg/macdriver/cocoa/nsimage_test.go → internal/macdriver/cocoa/nsimage_test.go b/pkg/macdriver/cocoa/nsimage_test.go → internal/macdriver/cocoa/nsimage_test.go
@@ -5,7 +5,7 @@ package cocoa
 import (
 	"testing"
 
-	"github.com/go-musicfox/go-musicfox/pkg/macdriver/core"
+	"github.com/go-musicfox/go-musicfox/internal/macdriver/core"
 )
 
 func TestNSImage(t *testing.T) {

diff --git a/pkg/macdriver/cocoa/nsnotificationcenter.go → ...l/macdriver/cocoa/nsnotificationcenter.go b/pkg/macdriver/cocoa/nsnotificationcenter.go → ...l/macdriver/cocoa/nsnotificationcenter.go
@@ -4,8 +4,8 @@ package cocoa
 
 import (
 	"github.com/ebitengine/purego/objc"
-	"github.com/go-musicfox/go-musicfox/pkg/macdriver"
-	"github.com/go-musicfox/go-musicfox/pkg/macdriver/core"
+	"github.com/go-musicfox/go-musicfox/internal/macdriver"
+	"github.com/go-musicfox/go-musicfox/internal/macdriver/core"
 )
 
 func init() {

diff --git a/pkg/macdriver/cocoa/nsworkspace.go → internal/macdriver/cocoa/nsworkspace.go b/pkg/macdriver/cocoa/nsworkspace.go → internal/macdriver/cocoa/nsworkspace.go
@@ -4,7 +4,7 @@ package cocoa
 
 import (
 	"github.com/ebitengine/purego/objc"
-	"github.com/go-musicfox/go-musicfox/pkg/macdriver/core"
+	"github.com/go-musicfox/go-musicfox/internal/macdriver/core"
 )
 
 func init() {

diff --git a/pkg/macdriver/cocoa/nsworkspace_test.go → internal/macdriver/cocoa/nsworkspace_test.go b/pkg/macdriver/cocoa/nsworkspace_test.go → internal/macdriver/cocoa/nsworkspace_test.go
diff --git a/pkg/macdriver/core/core.go → internal/macdriver/core/core.go b/pkg/macdriver/core/core.go → internal/macdriver/core/core.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/ebitengine/purego"
 	"github.com/ebitengine/purego/objc"
-	"github.com/go-musicfox/go-musicfox/pkg/macdriver"
+	"github.com/go-musicfox/go-musicfox/internal/macdriver"
 )
 
 var (

diff --git a/pkg/macdriver/core/nsarray.go → internal/macdriver/core/nsarray.go b/pkg/macdriver/core/nsarray.go → internal/macdriver/core/nsarray.go
diff --git a/pkg/macdriver/core/nsarray_test.go → internal/macdriver/core/nsarray_test.go b/pkg/macdriver/core/nsarray_test.go → internal/macdriver/core/nsarray_test.go
diff --git a/pkg/macdriver/core/nsautoreleasepool.go → internal/macdriver/core/nsautoreleasepool.go b/pkg/macdriver/core/nsautoreleasepool.go → internal/macdriver/core/nsautoreleasepool.go
@@ -2,7 +2,7 @@ package core
 
 import (
 	"github.com/ebitengine/purego/objc"
-	"github.com/go-musicfox/go-musicfox/pkg/macdriver"
+	"github.com/go-musicfox/go-musicfox/internal/macdriver"
 )
 
 func init() {

diff --git a/pkg/macdriver/core/nsdictionary.go → internal/macdriver/core/nsdictionary.go b/pkg/macdriver/core/nsdictionary.go → internal/macdriver/core/nsdictionary.go
@@ -4,7 +4,7 @@ package core
 
 import (
 	"github.com/ebitengine/purego/objc"
-	"github.com/go-musicfox/go-musicfox/pkg/macdriver"
+	"github.com/go-musicfox/go-musicfox/internal/macdriver"
 )
 
 func init() {

diff --git a/pkg/macdriver/core/nsinvocation.go → internal/macdriver/core/nsinvocation.go b/pkg/macdriver/core/nsinvocation.go → internal/macdriver/core/nsinvocation.go
diff --git a/pkg/macdriver/core/nsmethodsignature.go → internal/macdriver/core/nsmethodsignature.go b/pkg/macdriver/core/nsmethodsignature.go → internal/macdriver/core/nsmethodsignature.go
diff --git a/pkg/macdriver/core/nsmutabledictionary.go → ...nal/macdriver/core/nsmutabledictionary.go b/pkg/macdriver/core/nsmutabledictionary.go → ...nal/macdriver/core/nsmutabledictionary.go
@@ -4,7 +4,7 @@ package core
 
 import (
 	"github.com/ebitengine/purego/objc"
-	"github.com/go-musicfox/go-musicfox/pkg/macdriver"
+	"github.com/go-musicfox/go-musicfox/internal/macdriver"
 )
 
 func init() {

diff --git a/...acdriver/core/nsmutabledictionary_test.go → ...acdriver/core/nsmutabledictionary_test.go b/...acdriver/core/nsmutabledictionary_test.go → ...acdriver/core/nsmutabledictionary_test.go
diff --git a/pkg/macdriver/core/nsnumber.go → internal/macdriver/core/nsnumber.go b/pkg/macdriver/core/nsnumber.go → internal/macdriver/core/nsnumber.go
diff --git a/pkg/macdriver/core/nsnumber_test.go → internal/macdriver/core/nsnumber_test.go b/pkg/macdriver/core/nsnumber_test.go → internal/macdriver/core/nsnumber_test.go
diff --git a/pkg/macdriver/core/nsstring.go → internal/macdriver/core/nsstring.go b/pkg/macdriver/core/nsstring.go → internal/macdriver/core/nsstring.go
@@ -6,7 +6,7 @@ import (
 	"unsafe"
 
 	"github.com/ebitengine/purego/objc"
-	"github.com/go-musicfox/go-musicfox/pkg/macdriver"
+	"github.com/go-musicfox/go-musicfox/internal/macdriver"
 )
 
 func init() {

diff --git a/pkg/macdriver/core/nsstring_test.go → internal/macdriver/core/nsstring_test.go b/pkg/macdriver/core/nsstring_test.go → internal/macdriver/core/nsstring_test.go
diff --git a/pkg/macdriver/core/nsurl.go → internal/macdriver/core/nsurl.go b/pkg/macdriver/core/nsurl.go → internal/macdriver/core/nsurl.go
diff --git a/pkg/macdriver/core/nsurl_test.go → internal/macdriver/core/nsurl_test.go b/pkg/macdriver/core/nsurl_test.go → internal/macdriver/core/nsurl_test.go
diff --git a/pkg/macdriver/macdriver.go → internal/macdriver/macdriver.go b/pkg/macdriver/macdriver.go → internal/macdriver/macdriver.go
diff --git a/pkg/macdriver/mediaplayer/mediaplayer.go → ...rnal/macdriver/mediaplayer/mediaplayer.go b/pkg/macdriver/mediaplayer/mediaplayer.go → ...rnal/macdriver/mediaplayer/mediaplayer.go
@@ -6,7 +6,7 @@ import (
 	"sync"
 
 	"github.com/ebitengine/purego"
-	"github.com/go-musicfox/go-musicfox/pkg/macdriver/core"
+	"github.com/go-musicfox/go-musicfox/internal/macdriver/core"
 )
 
 var importOnce sync.Once

diff --git a/...player/mpchangeplaybackpositioncommand.go → ...player/mpchangeplaybackpositioncommand.go b/...player/mpchangeplaybackpositioncommand.go → ...player/mpchangeplaybackpositioncommand.go
diff --git a/...r/mpchangeplaybackpositioncommand_test.go → ...r/mpchangeplaybackpositioncommand_test.go b/...r/mpchangeplaybackpositioncommand_test.go → ...r/mpchangeplaybackpositioncommand_test.go
diff --git a/...ediaplayer/mpchangeplaybackratecommand.go → ...ediaplayer/mpchangeplaybackratecommand.go b/...ediaplayer/mpchangeplaybackratecommand.go → ...ediaplayer/mpchangeplaybackratecommand.go
diff --git a/...layer/mpchangeplaybackratecommand_test.go → ...layer/mpchangeplaybackratecommand_test.go b/...layer/mpchangeplaybackratecommand_test.go → ...layer/mpchangeplaybackratecommand_test.go
diff --git a/.../mediaplayer/mpchangerepeatmodecommand.go → .../mediaplayer/mpchangerepeatmodecommand.go b/.../mediaplayer/mpchangerepeatmodecommand.go → .../mediaplayer/mpchangerepeatmodecommand.go
@@ -4,7 +4,7 @@ package mediaplayer
 
 import (
 	"github.com/ebitengine/purego/objc"
-	"github.com/go-musicfox/go-musicfox/pkg/macdriver/core"
+	"github.com/go-musicfox/go-musicfox/internal/macdriver/core"
 )
 
 func init() {

diff --git a/...aplayer/mpchangerepeatmodecommand_test.go → ...aplayer/mpchangerepeatmodecommand_test.go b/...aplayer/mpchangerepeatmodecommand_test.go → ...aplayer/mpchangerepeatmodecommand_test.go
diff --git a/...mediaplayer/mpchangeshufflemodecommand.go → ...mediaplayer/mpchangeshufflemodecommand.go b/...mediaplayer/mpchangeshufflemodecommand.go → ...mediaplayer/mpchangeshufflemodecommand.go
@@ -4,7 +4,7 @@ package mediaplayer
 
 import (
 	"github.com/ebitengine/purego/objc"
-	"github.com/go-musicfox/go-musicfox/pkg/macdriver/core"
+	"github.com/go-musicfox/go-musicfox/internal/macdriver/core"
 )
 
 func init() {

diff --git a/...player/mpchangeshufflemodecommand_test.go → ...player/mpchangeshufflemodecommand_test.go b/...player/mpchangeshufflemodecommand_test.go → ...player/mpchangeshufflemodecommand_test.go
diff --git a/...acdriver/mediaplayer/mpfeedbackcommand.go → ...acdriver/mediaplayer/mpfeedbackcommand.go b/...acdriver/mediaplayer/mpfeedbackcommand.go → ...acdriver/mediaplayer/mpfeedbackcommand.go
@@ -4,7 +4,7 @@ package mediaplayer
 
 import (
 	"github.com/ebitengine/purego/objc"
-	"github.com/go-musicfox/go-musicfox/pkg/macdriver/core"
+	"github.com/go-musicfox/go-musicfox/internal/macdriver/core"
 )
 
 func init() {

diff --git a/...ver/mediaplayer/mpfeedbackcommand_test.go → ...ver/mediaplayer/mpfeedbackcommand_test.go b/...ver/mediaplayer/mpfeedbackcommand_test.go → ...ver/mediaplayer/mpfeedbackcommand_test.go
@@ -5,7 +5,7 @@ package mediaplayer
 import (
 	"testing"
 
-	"github.com/go-musicfox/go-musicfox/pkg/macdriver/core"
+	"github.com/go-musicfox/go-musicfox/internal/macdriver/core"
 )
 
 func TestMPFeedbackCommand(t *testing.T) {

diff --git a/...cdriver/mediaplayer/mpmediaitemartwork.go → ...cdriver/mediaplayer/mpmediaitemartwork.go b/...cdriver/mediaplayer/mpmediaitemartwork.go → ...cdriver/mediaplayer/mpmediaitemartwork.go
@@ -4,9 +4,9 @@ package mediaplayer
 
 import (
 	"github.com/ebitengine/purego/objc"
-	"github.com/go-musicfox/go-musicfox/pkg/macdriver"
-	"github.com/go-musicfox/go-musicfox/pkg/macdriver/cocoa"
-	"github.com/go-musicfox/go-musicfox/pkg/macdriver/core"
+	"github.com/go-musicfox/go-musicfox/internal/macdriver"
+	"github.com/go-musicfox/go-musicfox/internal/macdriver/cocoa"
+	"github.com/go-musicfox/go-musicfox/internal/macdriver/core"
 )
 
 func init() {

diff --git a/...er/mediaplayer/mpmediaitemartwork_test.go → ...er/mediaplayer/mpmediaitemartwork_test.go b/...er/mediaplayer/mpmediaitemartwork_test.go → ...er/mediaplayer/mpmediaitemartwork_test.go
@@ -5,8 +5,8 @@ package mediaplayer
 import (
 	"testing"
 
-	"github.com/go-musicfox/go-musicfox/pkg/macdriver/cocoa"
-	"github.com/go-musicfox/go-musicfox/pkg/macdriver/core"
+	"github.com/go-musicfox/go-musicfox/internal/macdriver/cocoa"
+	"github.com/go-musicfox/go-musicfox/internal/macdriver/core"
 )
 
 func TestMPMediaItemArtwork(t *testing.T) {