Fix #888: use correct threading model for creating share URLs

This commit is contained in:
Drew Weymouth
2026-04-05 08:28:48 -07:00
parent dcee51eb4a
commit 058156abe7
+31 -24
View File
@@ -8,7 +8,6 @@ import (
"image/color" "image/color"
"io" "io"
"log" "log"
"net/url"
"os" "os"
"path/filepath" "path/filepath"
"time" "time"
@@ -423,14 +422,28 @@ func (c *Controller) SetTrackRatings(trackIDs []string, rating int) {
} }
func (c *Controller) ShowShareDialog(id string) { func (c *Controller) ShowShareDialog(id string) {
go func() { sh, ok := c.App.ServerManager.Server.(mediaprovider.SupportsSharing)
shareUrl, err := c.createShareURL(id) if !ok {
if err != nil { // this should not happen since interface checks are done
// before showing share menu items, but just in case:
c.ToastProvider.ShowErrorToast(lang.L("server does not support sharing"))
return
}
go func() {
shareUrl, err := sh.CreateShareURL(id)
if err != nil {
log.Printf("error creating share URL: %v", err)
fyne.Do(func() {
c.showError(
"Failed to share content. This commonly occurs when the server does not support sharing, " +
"or has the feature disabled.\nPlease check the server's settings and try again.",
)
})
return return
} }
fyne.Do(func() { fyne.Do(func() {
hyperlink := widget.NewHyperlink(shareUrl.String(), shareUrl) hyperlink := widget.NewHyperlink(shareUrl.String(), shareUrl)
dismissed := false
dlg := dialog.NewCustom(lang.L("Share content"), lang.L("OK"), dlg := dialog.NewCustom(lang.L("Share content"), lang.L("OK"),
container.NewHBox( container.NewHBox(
hyperlink, hyperlink,
@@ -438,38 +451,32 @@ func (c *Controller) ShowShareDialog(id string) {
fyne.CurrentApp().Clipboard().SetContent(hyperlink.Text) fyne.CurrentApp().Clipboard().SetContent(hyperlink.Text)
}), }),
widget.NewButtonWithIcon("", theme.ViewRefreshIcon(), func() { widget.NewButtonWithIcon("", theme.ViewRefreshIcon(), func() {
if shareUrl, err := c.createShareURL(id); err == nil { go func() {
shareUrl, err := sh.CreateShareURL(id)
if err != nil {
log.Printf("error creating share URL: %v", err)
return
}
fyne.Do(func() {
if !dismissed {
hyperlink.Text = shareUrl.String() hyperlink.Text = shareUrl.String()
hyperlink.URL = shareUrl hyperlink.URL = shareUrl
hyperlink.Refresh() hyperlink.Refresh()
} }
})
}()
}), }),
), ),
c.MainWindow, c.MainWindow,
) )
dlg.SetOnClosed(func() {
dismissed = true
})
dlg.Show() dlg.Show()
}) })
}() }()
} }
func (c *Controller) createShareURL(id string) (*url.URL, error) {
r, ok := c.App.ServerManager.Server.(mediaprovider.SupportsSharing)
if !ok {
return nil, fmt.Errorf("server does not support sharing")
}
shareUrl, err := r.CreateShareURL(id)
if err != nil {
log.Printf("error creating share URL: %v", err)
c.showError(
"Failed to share content. This commonly occurs when the server does not support sharing, " +
"or has the feature disabled.\nPlease check the server's settings and try again.",
)
return nil, err
}
return shareUrl, nil
}
func (c *Controller) ShowDownloadDialog(tracks []*mediaprovider.Track, downloadName string) { func (c *Controller) ShowDownloadDialog(tracks []*mediaprovider.Track, downloadName string) {
numTracks := len(tracks) numTracks := len(tracks)
var fileName string var fileName string