From 68a172aa4f556a113b8f470ebc619d6c51208fc3 Mon Sep 17 00:00:00 2001 From: aynakeya Date: Tue, 8 Jul 2025 00:33:11 +0800 Subject: [PATCH 1/5] save session when application close --- plugin/sourcelogin/sourcelogin.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/plugin/sourcelogin/sourcelogin.go b/plugin/sourcelogin/sourcelogin.go index 97968c1..cd4c54d 100644 --- a/plugin/sourcelogin/sourcelogin.go +++ b/plugin/sourcelogin/sourcelogin.go @@ -54,6 +54,17 @@ func (w *SourceLogin) Enable() error { } func (w *SourceLogin) Disable() error { + w.log.Info("save session for all provider") + providers := miaosic.ListAvailableProviders() + for _, pname := range providers { + if p, ok := miaosic.GetProvider(pname); ok { + pl, ok2 := p.(miaosic.Loginable) + if ok2 { + w.log.Info("save session for %s", pname) + w.sessions[pname] = pl.SaveSession() + } + } + } return nil } From dc727935a81d960fdc63bc98f2c4f653b4f3e296 Mon Sep 17 00:00:00 2001 From: aynakeya Date: Wed, 16 Jul 2025 19:21:54 +0800 Subject: [PATCH 2/5] update source --- pkg/miaosic | 2 +- plugin/diange/diange.go | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkg/miaosic b/pkg/miaosic index 971f5fc..c1e6fc3 160000 --- a/pkg/miaosic +++ b/pkg/miaosic @@ -1 +1 @@ -Subproject commit 971f5fc4e5e09fe1e9db0fb90e7d0c2c6fb541d7 +Subproject commit c1e6fc35fc662bd03d9aac41b3c1267d742946d2 diff --git a/plugin/diange/diange.go b/plugin/diange/diange.go index 0cf05a9..fc31010 100644 --- a/plugin/diange/diange.go +++ b/plugin/diange/diange.go @@ -83,7 +83,7 @@ func NewDiange() *Diange { "kugou-instr": { Enable: true, Command: "点伴奏", - Priority: 6, + Priority: 7, }, "bilibili-video": { Enable: true, @@ -93,13 +93,18 @@ func NewDiange() *Diange { "local": { Enable: true, Command: "点l歌", - Priority: 4, + Priority: 6, }, "kugou": { Enable: true, Command: "点kg歌", Priority: 5, }, + "qq": { + Enable: true, + Command: "点q歌", + Priority: 4, + }, }, cooldowns: make(map[string]int), userCount: sync.Map{}, From 261166e67d698d34c6dfc07bb0b34149bac9367d Mon Sep 17 00:00:00 2001 From: aynakeya Date: Wed, 16 Jul 2025 19:39:08 +0800 Subject: [PATCH 3/5] update dependency --- pkg/liveroom-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/liveroom-sdk b/pkg/liveroom-sdk index 2274322..7e498e6 160000 --- a/pkg/liveroom-sdk +++ b/pkg/liveroom-sdk @@ -1 +1 @@ -Subproject commit 2274322ccc3cf31b0acc67f8a3eeccca50fc30ad +Subproject commit 7e498e64e593b828507df4e65132f55cf96ebd7c From 3f5623f11787044d6d19b4fbabf259a7b1d50aa6 Mon Sep 17 00:00:00 2001 From: aynakeya Date: Wed, 16 Jul 2025 22:43:11 +0800 Subject: [PATCH 4/5] downgrade fyne to v2.5.5 --- go.mod | 26 ++++++++++++-------------- gui/component/button.go | 6 +++++- gui/gutil/fyne.go | 18 ++++++++++++------ gui/player_controller.go | 2 +- 4 files changed, 30 insertions(+), 22 deletions(-) diff --git a/go.mod b/go.mod index 14ce493..8891063 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ replace ( ) require ( - fyne.io/fyne/v2 v2.6.1 + fyne.io/fyne/v2 v2.5.5 github.com/AynaLivePlayer/liveroom-sdk v0.1.0 github.com/AynaLivePlayer/miaosic v0.2.3 github.com/adrg/libvlc-go/v3 v3.1.6 @@ -33,14 +33,14 @@ require ( github.com/virtuald/go-paniclog v0.0.0-20190812204905-43a7fa316459 go.uber.org/zap v1.27.0 golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b - golang.org/x/sys v0.33.0 + golang.org/x/sys v0.34.0 gopkg.in/ini.v1 v1.67.0 ) require ( - fyne.io/systray v1.11.0 // indirect - github.com/AynaLivePlayer/blivedm-go v0.0.0-20250527143915-74cc4b2603bc // indirect - github.com/BurntSushi/toml v1.4.0 // indirect + fyne.io/systray v1.11.1-0.20250603113521-ca66a66d8b58 // indirect + github.com/AynaLivePlayer/blivedm-go v0.0.0-20250629154348-690af765bfbc // indirect + github.com/BurntSushi/toml v1.5.0 // indirect github.com/PuerkitoBio/goquery v1.10.3 // indirect github.com/XiaoMengXinX/Music163Api-Go v0.1.30 // indirect github.com/andybalholm/brotli v1.1.0 // indirect @@ -50,19 +50,16 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/dhowden/tag v0.0.0-20240417053706-3d75831295e8 // indirect github.com/fredbi/uri v1.1.0 // indirect - github.com/fsnotify/fsnotify v1.7.0 // indirect - github.com/fyne-io/gl-js v0.1.0 // indirect - github.com/fyne-io/glfw-js v0.2.0 // indirect + github.com/fsnotify/fsnotify v1.9.0 // indirect + github.com/fyne-io/gl-js v0.2.0 // indirect + github.com/fyne-io/glfw-js v0.3.0 // indirect github.com/fyne-io/image v0.1.1 // indirect - github.com/fyne-io/oksvg v0.1.0 // indirect github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71 // indirect github.com/go-text/render v0.2.0 // indirect github.com/go-text/typesetting v0.2.1 // indirect github.com/godbus/dbus/v5 v5.1.0 // indirect github.com/google/uuid v1.5.0 // indirect - github.com/hack-pad/go-indexeddb v0.3.2 // indirect - github.com/hack-pad/safejs v0.1.0 // indirect - github.com/jeandeaual/go-locale v0.0.0-20241217141322-fcc2cadd6f08 // indirect + github.com/jeandeaual/go-locale v0.0.0-20250612000132-0ef82f21eade // indirect github.com/jinzhu/copier v0.4.0 // indirect github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25 // indirect github.com/makiuchi-d/gozxing v0.1.1 // indirect @@ -80,8 +77,9 @@ require ( github.com/yuin/goldmark v1.7.8 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/image v0.24.0 // indirect - golang.org/x/net v0.41.0 // indirect - golang.org/x/text v0.26.0 // indirect + golang.org/x/mobile v0.0.0-20231127183840-76ac6878050a // indirect + golang.org/x/net v0.42.0 // indirect + golang.org/x/text v0.27.0 // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/gui/component/button.go b/gui/component/button.go index 8e77113..933a5d0 100644 --- a/gui/component/button.go +++ b/gui/component/button.go @@ -1,6 +1,7 @@ package component import ( + "AynaLivePlayer/gui/gutil" "fyne.io/fyne/v2" "fyne.io/fyne/v2/widget" ) @@ -38,7 +39,10 @@ func (b *AsyncButton) SetOnTapped(f func()) { go func() { f() //time.Sleep(3 * time.Second) - fyne.Do(b.Enable) + // todo use fyne.Do after upgrade to v2.6.x + gutil.RunInFyneThread(b.Enable) + //b.Enable() + //fyne.Do(b.Enable) }() } } diff --git a/gui/gutil/fyne.go b/gui/gutil/fyne.go index 985bdb8..3f3c119 100644 --- a/gui/gutil/fyne.go +++ b/gui/gutil/fyne.go @@ -2,14 +2,20 @@ package gutil import ( "AynaLivePlayer/pkg/event" - "fyne.io/fyne/v2" ) // since 2.6.1, calls to fyne API from other go routine must be wrapped in fyne.Do func ThreadSafeHandler(fn func(e *event.Event)) func(e *event.Event) { - return func(e *event.Event) { - fyne.Do(func() { - fn(e) - }) - } + return fn + // todo: uncomment this after 2.6.x become stable + //return func(e *event.Event) { + // fyne.Do(func() { + // fn(e) + // }) + //} +} + +func RunInFyneThread(fn func()) { + fn() + //fyne.Do(fn) } diff --git a/gui/player_controller.go b/gui/player_controller.go index 1931785..3aca8c3 100644 --- a/gui/player_controller.go +++ b/gui/player_controller.go @@ -176,7 +176,7 @@ func registerPlayControllerHandler() { return } PlayController.Cover.Resource = pic.Resource - fyne.Do(PlayController.Cover.Refresh) + gutil.RunInFyneThread(PlayController.Cover.Refresh) } }() From c31342c7085444dd4059fdb304343c3ff4ee8211 Mon Sep 17 00:00:00 2001 From: aynakeya Date: Wed, 23 Jul 2025 02:44:04 +0800 Subject: [PATCH 5/5] fix netease login failed/get url failure --- pkg/miaosic | 2 +- webtemplates.json | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) delete mode 100644 webtemplates.json diff --git a/pkg/miaosic b/pkg/miaosic index c1e6fc3..ad5098e 160000 --- a/pkg/miaosic +++ b/pkg/miaosic @@ -1 +1 @@ -Subproject commit c1e6fc35fc662bd03d9aac41b3c1267d742946d2 +Subproject commit ad5098eb5fdb8900392d536834a7b2d9dd89fb3f diff --git a/webtemplates.json b/webtemplates.json deleted file mode 100644 index 616cb44..0000000 --- a/webtemplates.json +++ /dev/null @@ -1,14 +0,0 @@ -[ - { - "Name": "时间例子", - "Template": "

\r\n\r\n

秒显示：\r\n/

\r\n\r\n

\r\n分秒显示: \r\n\r\n/\r\n\r\n

\r\n" - }, - { - "Name": "播放列表例子", - "Template": "

默认

\r\n\r\n

自定义格式

\r\n\r\n \r\n " - }, - { - "Name": "default", - "Template": "\r\n
\r\n \r\n ---\r\n \r\n ---\r\n \r\n
\r\n" - } -]