diff --git a/assets/config/diange.json b/assets/config/diange.json new file mode 100644 index 0000000..056d0e9 --- /dev/null +++ b/assets/config/diange.json @@ -0,0 +1,32 @@ +{ + "bilibili-video": { + "enable": true, + "command": "点b歌", + "priority": 3 + }, + "kugou": { + "enable": true, + "command": "点kg歌", + "priority": 5 + }, + "kugou-instr": { + "enable": true, + "command": "点伴奏", + "priority": 6 + }, + "kuwo": { + "enable": true, + "command": "点k歌", + "priority": 2 + }, + "local": { + "enable": true, + "command": "点local", + "priority": 4 + }, + "netease": { + "enable": true, + "command": "点w歌", + "priority": 1 + } +} \ No newline at end of file diff --git a/assets/scripts/windows/start-headless.bat b/assets/scripts/windows/start-headless.bat new file mode 100644 index 0000000..120241d --- /dev/null +++ b/assets/scripts/windows/start-headless.bat @@ -0,0 +1 @@ +start AynaLivePlayer.exe --headless \ No newline at end of file diff --git a/assets/scripts/windows/stop-headless.bat b/assets/scripts/windows/stop-headless.bat new file mode 100644 index 0000000..3e1dedb --- /dev/null +++ b/assets/scripts/windows/stop-headless.bat @@ -0,0 +1 @@ + taskkill /F /IM AynaLivePlayer.exe \ No newline at end of file diff --git a/go.mod b/go.mod index 3e01083..b046f94 100644 --- a/go.mod +++ b/go.mod @@ -42,7 +42,7 @@ require ( github.com/XiaoMengXinX/Music163Api-Go v0.1.30 // indirect github.com/andybalholm/brotli v1.0.5 // indirect github.com/andybalholm/cascadia v1.2.0 // indirect - github.com/aynakeya/deepcolor v1.0.2 // indirect + github.com/aynakeya/deepcolor v1.0.3 // indirect github.com/aynakeya/open-bilibili-live v0.0.7 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/dhowden/tag v0.0.0-20230630033851-978a0926ee25 // indirect diff --git a/go.sum b/go.sum index 915af88..ed3fbdf 100644 --- a/go.sum +++ b/go.sum @@ -65,8 +65,8 @@ github.com/antonfisher/nested-logrus-formatter v1.3.1/go.mod h1:6WTfyWFkBc9+zyBa github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/aynakeya/deepcolor v1.0.2 h1:ldmVMweZTX3uLFpRQBtNyapGMXZ+UqkDp2S08ROD0rE= -github.com/aynakeya/deepcolor v1.0.2/go.mod h1:9wdFsi0G4uAQlu58B2/eHBlGoQ8VkmSyPsK+bDZ+6dQ= +github.com/aynakeya/deepcolor v1.0.3 h1:FKDVxGIiD4R2XSOhS6HwCWPPsmXgG3KKqja1nNNU7HE= +github.com/aynakeya/deepcolor v1.0.3/go.mod h1:9wdFsi0G4uAQlu58B2/eHBlGoQ8VkmSyPsK+bDZ+6dQ= github.com/aynakeya/go-mpv v0.0.6 h1:WCBwHrzl700C1J3f+aXR+URw/OKYPjwUjDW9diOsXYY= github.com/aynakeya/go-mpv v0.0.6/go.mod h1:do6ImaEyt9dlQ7JRS/8ke+P9q4kGW8+Bf6j3faBQOfE= github.com/aynakeya/open-bilibili-live v0.0.7 h1:em/IpFeExaUmOO+jSlhzjjppiuDflLuobzdMo96dtOo= diff --git a/gui/xfyne/window.go b/gui/xfyne/window.go index f2d343e..124d4c5 100644 --- a/gui/xfyne/window.go +++ b/gui/xfyne/window.go @@ -1,3 +1,5 @@ +//go:build darwin || windows || linux + package xfyne import ( diff --git a/internal/source/source.go b/internal/source/source.go index eee04fd..ecd05bf 100644 --- a/internal/source/source.go +++ b/internal/source/source.go @@ -7,7 +7,7 @@ import ( "github.com/AynaLivePlayer/miaosic" //_ "github.com/AynaLivePlayer/miaosic/providers/bilibili" _ "github.com/AynaLivePlayer/miaosic/providers/bilivideo" - _ "github.com/AynaLivePlayer/miaosic/providers/kugou" + "github.com/AynaLivePlayer/miaosic/providers/kugou" _ "github.com/AynaLivePlayer/miaosic/providers/kuwo" "github.com/AynaLivePlayer/miaosic/providers/local" _ "github.com/AynaLivePlayer/miaosic/providers/netease" @@ -34,6 +34,7 @@ var sourceCfg = &_sourceConfig{ func Initialize() { config.LoadConfig(sourceCfg) miaosic.RegisterProvider(local.NewLocal(sourceCfg.LocalSourcePath)) + kugou.UseInstrumental() global.EventManager.CallA( events.MediaProviderUpdate, events.MediaProviderUpdateEvent{ diff --git a/pkg/logger/repository/web/dummy.go b/pkg/logger/repository/web/dummy.go new file mode 100644 index 0000000..60111fb --- /dev/null +++ b/pkg/logger/repository/web/dummy.go @@ -0,0 +1,89 @@ +package repository + +import ( + "AynaLivePlayer/pkg/logger" + "fmt" +) + +type DummyLogger struct { +} + +func (l *DummyLogger) DebugW(message string, keysAndValues ...interface{}) { + //TODO implement me + panic("implement me") +} + +func (l *DummyLogger) DebugS(message string, fields logger.LogField) { + //TODO implement me + panic("implement me") +} + +func (l *DummyLogger) InfoW(message string, keysAndValues ...interface{}) { + //TODO implement me + panic("implement me") +} + +func (l *DummyLogger) InfoS(message string, fields logger.LogField) { + //TODO implement me + panic("implement me") +} + +func (l *DummyLogger) WarnW(message string, keysAndValues ...interface{}) { + //TODO implement me + panic("implement me") +} + +func (l *DummyLogger) WarnS(message string, fields logger.LogField) { + //TODO implement me + panic("implement me") +} + +func (l *DummyLogger) ErrorW(message string, keysAndValues ...interface{}) { + //TODO implement me + panic("implement me") +} + +func (l *DummyLogger) ErrorS(message string, fields logger.LogField) { + //TODO implement me + panic("implement me") +} + +func (l *DummyLogger) Debug(args ...interface{}) { + fmt.Println(args...) +} + +func (l *DummyLogger) Debugf(format string, args ...interface{}) { + fmt.Printf(format, args...) +} + +func (l *DummyLogger) Info(args ...interface{}) { + fmt.Println(args...) +} + +func (l *DummyLogger) Infof(format string, args ...interface{}) { + fmt.Printf(format, args...) +} + +func (l *DummyLogger) Warn(args ...interface{}) { + fmt.Println(args...) +} + +func (l *DummyLogger) Warnf(format string, args ...interface{}) { + fmt.Printf(format, args...) +} + +func (l *DummyLogger) Error(args ...interface{}) { + fmt.Println(args...) +} + +func (l *DummyLogger) Errorf(format string, args ...interface{}) { + fmt.Printf(format, args...) +} + +func (l *DummyLogger) WithPrefix(prefix string) logger.ILogger { + return l +} + +func (l *DummyLogger) SetLogLevel(level logger.LogLevel) { + +} diff --git a/pkg/miaosic b/pkg/miaosic index 2521f55..ad1c0c2 160000 --- a/pkg/miaosic +++ b/pkg/miaosic @@ -1 +1 @@ -Subproject commit 2521f55b66dbff0433a4e38568bb8c9bd56eb586 +Subproject commit ad1c0c2427d7e4a6ca3fda55a7407ea9d681f06a diff --git a/plugin/diange/diange.go b/plugin/diange/diange.go index e60fe9a..83a8a61 100644 --- a/plugin/diange/diange.go +++ b/plugin/diange/diange.go @@ -326,7 +326,6 @@ func (d *Diange) handleMessage(event *event.Event) { }) return } - } func (d *Diange) Title() string {