Skip to content

🎧 Your Personal Streaming Service

More work on Shares

Deluan84aa094e56de
diff --git a/cmd/root.go b/cmd/root.go
index e7b694a24..da088e767 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -84,9 +84,6 @@ func startServer(ctx context.Context) func() error {
a.MountRouter("Native API", consts.URLPathNativeAPI, CreateNativeAPIRouter())
a.MountRouter("Subsonic API", consts.URLPathSubsonicAPI, CreateSubsonicAPIRouter())
a.MountRouter("Public Endpoints", consts.URLPathPublic, CreatePublicRouter())
- if conf.Server.DevEnableShare {
- a.MountRouter("Share Endpoint", consts.URLPathShares, CreateSharesRouter())
- }
if conf.Server.LastFM.Enabled {
a.MountRouter("LastFM Auth", consts.URLPathNativeAPI+"/lastfm", CreateLastFMRouter())
}
diff --git a/cmd/wire_gen.go b/cmd/wire_gen.go
index f1df1ad17..abe023cfb 100644
--- a/cmd/wire_gen.go
+++ b/cmd/wire_gen.go
@@ -22,7 +22,6 @@ import (
"github.com/navidrome/navidrome/server/events"
"github.com/navidrome/navidrome/server/nativeapi"
"github.com/navidrome/navidrome/server/public"
- "github.com/navidrome/navidrome/server/shares"
"github.com/navidrome/navidrome/server/subsonic"
"sync"
)
@@ -75,15 +74,8 @@ func CreatePublicRouter() *public.Router {
artworkArtwork := artwork.NewArtwork(dataStore, fileCache, fFmpeg, externalMetadata)
transcodingCache := core.GetTranscodingCache()
mediaStreamer := core.NewMediaStreamer(dataStore, fFmpeg, transcodingCache)
- router := public.New(artworkArtwork, mediaStreamer)
- return router
-}
-
-func CreateSharesRouter() *shares.Router {
- sqlDB := db.Db()
- dataStore := persistence.New(sqlDB)
share := core.NewShare(dataStore)
- router := shares.New(dataStore, share)
+ router := public.New(dataStore, artworkArtwork, mediaStreamer, share)
return router
}
@@ -118,7 +110,7 @@ func createScanner() scanner.Scanner {
// wire_injectors.go:
-var allProviders = wire.NewSet(core.Set, artwork.Set, subsonic.New, nativeapi.New, public.New, shares.New, persistence.New, lastfm.NewRouter, listenbrainz.NewRouter, events.GetBroker, db.Db)
+var allProviders = wire.NewSet(core.Set, artwork.Set, subsonic.New, nativeapi.New, public.New, persistence.New, lastfm.NewRouter, listenbrainz.NewRouter, events.GetBroker, db.Db)
// Scanner must be a Singleton
var (
diff --git a/cmd/wire_injectors.go b/cmd/wire_injectors.go
index 1f41e1a36..cc896421f 100644
--- a/cmd/wire_injectors.go
+++ b/cmd/wire_injectors.go
@@ -17,7 +17,6 @@ import (
"github.com/navidrome/navidrome/server/events"
"github.com/navidrome/navidrome/server/nativeapi"
"github.com/navidrome/navidrome/server/public"
- "github.com/navidrome/navidrome/server/shares"
"github.com/navidrome/navidrome/server/subsonic"
)
@@ -27,7 +26,6 @@ var allProviders = wire.NewSet(
subsonic.New,
nativeapi.New,
public.New,
- shares.New,
persistence.New,
lastfm.NewRouter,
listenbrainz.NewRouter,
@@ -61,12 +59,6 @@ func CreatePublicRouter() *public.Router {
))
}
-func CreateSharesRouter() *shares.Router {
- panic(wire.Build(
- allProviders,
- ))
-}
-
func CreateLastFMRouter() *lastfm.Router {
panic(wire.Build(
allProviders,
diff --git a/consts/consts.go b/consts/consts.go
index 2a3f5956b..9bad1ee46 100644
--- a/consts/consts.go
+++ b/consts/consts.go
@@ -34,7 +34,6 @@ const (
URLPathSubsonicAPI = "/rest"
URLPathPublic = "/p"
URLPathPublicImages = URLPathPublic + "/img"
- URLPathShares = "/s"
// DefaultUILoginBackgroundURL uses Navidrome curated background images collection,
// available at https://unsplash.com/collections/20072696/navidrome
diff --git a/core/share.go b/core/share.go
index 6a696a799..736a15772 100644
--- a/core/share.go
+++ b/core/share.go
@@ -35,8 +35,7 @@ func (s *shareService) Load(ctx context.Context, id string) (*model.Share, error
return nil, err
}
share := entity.(*model.Share)
- now := time.Now()
- share.LastVisitedAt = &now
+ share.LastVisitedAt = time.Now()
share.VisitCount++
err = repo.(rest.Persistable).Update(id, share, "last_visited_at", "visit_count")
@@ -112,8 +111,7 @@ func (r *shareRepositoryWrapper) Save(entity interface{}) (string, error) {
}
s.ID = id
if s.ExpiresAt.IsZero() {
- exp := time.Now().Add(365 * 24 * time.Hour)
- s.ExpiresAt = &exp
+ s.ExpiresAt = time.Now().Add(365 * 24 * time.Hour)
}
id, err = r.Persistable.Save(s)
return id, err
diff --git a/model/share.go b/model/share.go
index 40b25e526..b689f1556 100644
--- a/model/share.go
+++ b/model/share.go
@@ -9,16 +9,16 @@ type Share struct {
UserID string `structs:"user_id" json:"userId,omitempty" orm:"column(user_id)"`
Username string `structs:"-" json:"username,omitempty" orm:"-"`
Description string `structs:"description" json:"description,omitempty"`
- ExpiresAt *time.Time `structs:"expires_at" json:"expiresAt,omitempty"`
- LastVisitedAt *time.Time `structs:"last_visited_at" json:"lastVisitedAt,omitempty"`
+ ExpiresAt time.Time `structs:"expires_at" json:"expiresAt,omitempty"`
+ LastVisitedAt time.Time `structs:"last_visited_at" json:"lastVisitedAt,omitempty"`
ResourceIDs string `structs:"resource_ids" json:"resourceIds,omitempty" orm:"column(resource_ids)"`
ResourceType string `structs:"resource_type" json:"resourceType,omitempty"`
Contents string `structs:"contents" json:"contents,omitempty"`
Format string `structs:"format" json:"format,omitempty"`
MaxBitRate int `structs:"max_bit_rate" json:"maxBitRate,omitempty"`
VisitCount int `structs:"visit_count" json:"visitCount,omitempty"`
- CreatedAt *time.Time `structs:"created_at" json:"createdAt,omitempty"`
- UpdatedAt *time.Time `structs:"updated_at" json:"updatedAt,omitempty"`
+ CreatedAt time.Time `structs:"created_at" json:"createdAt,omitempty"`
+ UpdatedAt time.Time `structs:"updated_at" json:"updatedAt,omitempty"`
Tracks []ShareTrack `structs:"-" json:"tracks,omitempty"`
}
diff --git a/persistence/share_repository.go b/persistence/share_repository.go
index 5023c7365..aa0720d12 100644
--- a/persistence/share_repository.go
+++ b/persistence/share_repository.go
@@ -51,8 +51,7 @@ func (r *shareRepository) Update(id string, entity interface{}, cols ...string)
s := entity.(*model.Share)
// TODO Validate record
s.ID = id
- now := time.Now()
- s.UpdatedAt = &now
+ s.UpdatedAt = time.Now()
cols = append(cols, "updated_at")
_, err := r.put(id, s, cols...)
if errors.Is(err, model.ErrNotFound) {
@@ -68,9 +67,8 @@ func (r *shareRepository) Save(entity interface{}) (string, error) {
if s.UserID == "" {
s.UserID = u.ID
}
- now := time.Now()
- s.CreatedAt = &now
- s.UpdatedAt = &now
+ s.CreatedAt = time.Now()
+ s.UpdatedAt = time.Now()
id, err := r.put(s.ID, s)
if errors.Is(err, model.ErrNotFound) {
return "", rest.ErrNotFound
diff --git a/server/public/handle_images.go b/server/public/handle_images.go
new file mode 100644
index 000000000..0b0455331
--- /dev/null
+++ b/server/public/handle_images.go
@@ -0,0 +1,53 @@
+package public
+
+import (
+ "context"
+ "errors"
+ "io"
+ "net/http"
+ "time"
+
+ "github.com/navidrome/navidrome/log"
+ "github.com/navidrome/navidrome/model"
+ "github.com/navidrome/navidrome/utils"
+)
+
+func (p *Router) handleImages(w http.ResponseWriter, r *http.Request) {
+ ctx, cancel := context.WithTimeout(r.Context(), 10*time.Second)
+ defer cancel()
+ id := r.URL.Query().Get(":id")
+ if id == "" {
+ http.Error(w, "invalid id", http.StatusBadRequest)
+ return
+ }
+
+ artId, err := DecodeArtworkID(id)
+ if err != nil {
+ http.Error(w, err.Error(), http.StatusBadRequest)
+ return
+ }
+
+ size := utils.ParamInt(r, "size", 0)
+ imgReader, lastUpdate, err := p.artwork.Get(ctx, artId.String(), size)
+
+ switch {
+ case errors.Is(err, context.Canceled):
+ return
+ case errors.Is(err, model.ErrNotFound):
+ log.Error(r, "Couldn't find coverArt", "id", id, err)
+ http.Error(w, "Artwork not found", http.StatusNotFound)
+ return
+ case err != nil:
+ log.Error(r, "Error retrieving coverArt", "id", id, err)
+ http.Error(w, "Error retrieving coverArt", http.StatusInternalServerError)
+ return
+ }
+
+ defer imgReader.Close()
+ w.Header().Set("Cache-Control", "public, max-age=315360000")
+ w.Header().Set("Last-Modified", lastUpdate.Format(time.RFC1123))
+ cnt, err := io.Copy(w, imgReader)
+ if err != nil {
+ log.Warn(ctx, "Error sending image", "count", cnt, err)
+ }
+}
diff --git a/server/shares/share_endpoint.go b/server/public/handle_shares.go
similarity index 63%
rename from server/shares/share_endpoint.go
rename to server/public/handle_shares.go
index 822b06e33..e0d7dde2d 100644
--- a/server/shares/share_endpoint.go
+++ b/server/public/handle_shares.go
@@ -1,14 +1,9 @@
-package shares
+package public
import (
"errors"
"net/http"
- "path"
- "github.com/go-chi/chi/v5"
- "github.com/navidrome/navidrome/conf"
- "github.com/navidrome/navidrome/consts"
- "github.com/navidrome/navidrome/core"
"github.com/navidrome/navidrome/core/auth"
"github.com/navidrome/navidrome/log"
"github.com/navidrome/navidrome/model"
@@ -16,34 +11,6 @@ import (
"github.com/navidrome/navidrome/ui"
)
-type Router struct {
- http.Handler
- ds model.DataStore
- share core.Share
- assetsHandler http.Handler
- streamer core.MediaStreamer
-}
-
-func New(ds model.DataStore, share core.Share) *Router {
- p := &Router{ds: ds, share: share}
- shareRoot := path.Join(conf.Server.BaseURL, consts.URLPathShares)
- p.assetsHandler = http.StripPrefix(shareRoot, http.FileServer(http.FS(ui.BuildAssets())))
- p.Handler = p.routes()
-
- return p
-}
-
-func (p *Router) routes() http.Handler {
- r := chi.NewRouter()
-
- r.Group(func(r chi.Router) {
- r.Use(server.URLParamsMiddleware)
- r.HandleFunc("/{id}", p.handleShares)
- r.Handle("/*", p.assetsHandler)
- })
- return r
-}
-
func (p *Router) handleShares(w http.ResponseWriter, r *http.Request) {
id := r.URL.Query().Get(":id")
if id == "" {
@@ -82,6 +49,7 @@ func (p *Router) mapShareInfo(s *model.Share) *model.Share {
Tracks: s.Tracks,
}
for i := range s.Tracks {
+ // TODO Use Encode(Artwork)ID?
claims := map[string]any{"id": s.Tracks[i].ID}
if s.Format != "" {
claims["f"] = s.Format
@@ -89,7 +57,7 @@ func (p *Router) mapShareInfo(s *model.Share) *model.Share {
if s.MaxBitRate != 0 {
claims["b"] = s.MaxBitRate
}
- id, _ := auth.CreateExpiringPublicToken(*s.ExpiresAt, claims)
+ id, _ := auth.CreateExpiringPublicToken(s.ExpiresAt, claims)
mapped.Tracks[i].ID = id
}
return mapped
diff --git a/server/public/share_stream.go b/server/public/handle_streams.go
similarity index 100%
rename from server/public/share_stream.go
rename to server/public/handle_streams.go
diff --git a/server/public/public_endpoints.go b/server/public/public_endpoints.go
index 0afab8ecc..e6e2551f5 100644
--- a/server/public/public_endpoints.go
+++ b/server/public/public_endpoints.go
@@ -1,29 +1,32 @@
package public
import (
- "context"
- "errors"
- "io"
"net/http"
- "time"
+ "path"
"github.com/go-chi/chi/v5"
+ "github.com/navidrome/navidrome/conf"
+ "github.com/navidrome/navidrome/consts"
"github.com/navidrome/navidrome/core"
"github.com/navidrome/navidrome/core/artwork"
- "github.com/navidrome/navidrome/log"
"github.com/navidrome/navidrome/model"
"github.com/navidrome/navidrome/server"
- "github.com/navidrome/navidrome/utils"
+ "github.com/navidrome/navidrome/ui"
)
type Router struct {
http.Handler
- artwork artwork.Artwork
- streamer core.MediaStreamer
+ artwork artwork.Artwork
+ streamer core.MediaStreamer
+ share core.Share
+ assetsHandler http.Handler
+ ds model.DataStore
}
-func New(artwork artwork.Artwork, streamer core.MediaStreamer) *Router {
- p := &Router{artwork: artwork, streamer: streamer}
+func New(ds model.DataStore, artwork artwork.Artwork, streamer core.MediaStreamer, share core.Share) *Router {
+ p := &Router{ds: ds, artwork: artwork, streamer: streamer, share: share}
+ shareRoot := path.Join(conf.Server.BaseURL, consts.URLPathPublic)
+ p.assetsHandler = http.StripPrefix(shareRoot, http.FileServer(http.FS(ui.BuildAssets())))
p.Handler = p.routes()
return p
@@ -34,48 +37,12 @@ func (p *Router) routes() http.Handler {
r.Group(func(r chi.Router) {
r.Use(server.URLParamsMiddleware)
- r.HandleFunc("/s/{id}", p.handleStream)
r.HandleFunc("/img/{id}", p.handleImages)
+ if conf.Server.DevEnableShare {
+ r.HandleFunc("/s/{id}", p.handleStream)
+ r.HandleFunc("/{id}", p.handleShares)
+ r.Handle("/*", p.assetsHandler)
+ }
})
return r
}
-
-func (p *Router) handleImages(w http.ResponseWriter, r *http.Request) {
- ctx, cancel := context.WithTimeout(r.Context(), 10*time.Second)
- defer cancel()
- id := r.URL.Query().Get(":id")
- if id == "" {
- http.Error(w, "invalid id", http.StatusBadRequest)
- return
- }
-
- artId, err := DecodeArtworkID(id)
- if err != nil {
- http.Error(w, err.Error(), http.StatusBadRequest)
- return
- }
-
- size := utils.ParamInt(r, "size", 0)
- imgReader, lastUpdate, err := p.artwork.Get(ctx, artId.String(), size)
-
- switch {
- case errors.Is(err, context.Canceled):
- return
- case errors.Is(err, model.ErrNotFound):
- log.Error(r, "Couldn't find coverArt", "id", id, err)
- http.Error(w, "Artwork not found", http.StatusNotFound)
- return
- case err != nil:
- log.Error(r, "Error retrieving coverArt", "id", id, err)
- http.Error(w, "Error retrieving coverArt", http.StatusInternalServerError)
- return
- }
-
- defer imgReader.Close()
- w.Header().Set("Cache-Control", "public, max-age=315360000")
- w.Header().Set("Last-Modified", lastUpdate.Format(time.RFC1123))
- cnt, err := io.Copy(w, imgReader)
- if err != nil {
- log.Warn(ctx, "Error sending image", "count", cnt, err)
- }
-}
diff --git a/ui/public/index.html b/ui/public/index.html
index 2ffa2037b..c78d7e308 100644
--- a/ui/public/index.html
+++ b/ui/public/index.html
@@ -34,7 +34,6 @@
window.__APP_CONFIG__ = {{ .AppConfig }}
</script>
<script>
- // window.__SHARE_INFO__ = "{\"id\":\"MzKLGvbiOh\",\"userId\":\"fa621eba-b7ca-48e0-94f1-02376f9cee58\",\"username\":\"admin\",\"description\":\"\",\"expiresAt\":\"2024-01-20T04:41:48.543684Z\",\"lastVisitedAt\":\"2023-01-20T13:53:54.264234-05:00\",\"resourceIds\":\"9612531e4e693fbedf08053ed388c356\",\"resourceType\":\"album\",\"contents\":\"\",\"format\":\"opus\",\"maxBitRate\":32,\"visitCount\":14,\"createdAt\":\"2023-01-20T03:51:25Z\",\"updatedAt\":\"2023-01-20T13:53:54.264236-05:00\",\"tracks\":[{\"id\":\"eba0074729dd9cc1123e2372c3933ec1\",\"title\":\"I Never Loved a Man (The Way I Love You)\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-29T22:39:04.961548Z\",\"duration\":162.91},{\"id\":\"41fa099a87b2b3dce647c7a59b2c2fb9\",\"title\":\"Respect\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-29T22:40:35.358789Z\",\"duration\":148.13},{\"id\":\"8cbad28a4a768cfcb9883fdfecae81b2\",\"title\":\"Do Right Woman, Do Right Man\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":197.36},{\"id\":\"4f08cc11e93aebf4d1e2eca26b04bdcc\",\"title\":\"Dr. Feelgood\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":202.11},{\"id\":\"8a3a8443f9b84831a6247b1bdfbae16b\",\"title\":\"Save Me\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":141.6},{\"id\":\"b5154a05763f0266261efb78198baa2c\",\"title\":\"Baby I Love You\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":162.09},{\"id\":\"50151518a08cefa17bfe718a599bcb23\",\"title\":\"(You Make Me Feel Like) A Natural Woman\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":165.47},{\"id\":\"2c3b5674bf98f234328c3bf100ae5bea\",\"title\":\"Chain of Fools\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":167.71},{\"id\":\"53e61aa83e36d6fc630dd635ab368d6d\",\"title\":\"Since You've Been Gone\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":145.4},{\"id\":\"1251afdafb5d29353d09c92eee22a320\",\"title\":\"Ain't No Way\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":254.13},{\"id\":\"f248296ad01cd5011aedcd954c5b34ef\",\"title\":\"Think\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":139.69},{\"id\":\"1147408d156711cc67c71e359d00ca21\",\"title\":\"I Say a Little Prayer\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":215.67},{\"id\":\"13440a7fcc10f9ecf63189039d53415e\",\"title\":\"The House That Jack Built\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":141.4},{\"id\":\"b8a052b94a2d59a60d6d950b65ab5684\",\"title\":\"See Saw\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":165.51},{\"id\":\"ac8b2e8d464c1ba250a2e113a8517b28\",\"title\":\"The Weight\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":178.56},{\"id\":\"d12bd164657d38875a959b761f10722d\",\"title\":\"Share Your Love With Me\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":201.07},{\"id\":\"d4279010ca431d340278d4acde9cfc96\",\"title\":\"Eleanor Rigby\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":157.81},{\"id\":\"413c0371ce7753475a013a4433f2f797\",\"title\":\"Call Me\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":237.4},{\"id\":\"e73d290fcaf57bccc858c950d2bb9ca8\",\"title\":\"Spirit in the Dark\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":241.77},{\"id\":\"d6cb0a57be096bdf076cd506d0543136\",\"title\":\"Don't Play That Song\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":179.6},{\"id\":\"e75a137355e263b634657da6e2ac684e\",\"title\":\"You're All I Need to Get By\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":216.47},{\"id\":\"d7609a8c55e54a86d0fc389e14093070\",\"title\":\"Bridge Over Troubled Water\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":333.29},{\"id\":\"437475e69262dac912ef6b35c73f9db9\",\"title\":\"Spanish Harlem\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":212.87},{\"id\":\"ffc40b9d8d1ba3ec728eb7fee8bda91e\",\"title\":\"Rock Steady\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":194.24},{\"id\":\"2d03c79660712d0110236b228e3ba900\",\"title\":\"Oh Me Oh My (I'm a Fool for You Baby)\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":222},{\"id\":\"a6e120388f9a8ac49a0631894a7a4b05\",\"title\":\"Day Dreaming\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":240.07},{\"id\":\"9923621ea00796691912d3a8dbfd1381\",\"title\":\"Wholy Holy\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":172.47},{\"id\":\"628269d09f564bf94544c743a8a6303b\",\"title\":\"Angel\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":215.76},{\"id\":\"95ae528fd862a37865d5e840331e4009\",\"title\":\"Until You Come Back to Me (That's What I'm Gonna Do)\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":207.51},{\"id\":\"428fdb6b9e34263c0fd33c0bef1c7d6a\",\"title\":\"I'm in Love\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":171.64}]}";
// window.__SHARE_INFO__ = "{\"tracks\":[{\"id\":\"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MDU3MjU3MDgsImlhdCI6MTY3NDI1MTk4MiwiaWQiOiJlYmEwMDc0NzI5ZGQ5Y2MxMTIzZTIzNzJjMzkzM2VjMSIsImlzcyI6Ik5EIn0.T-UmYG0B_JD34Wzelx8aw11hSobfhQxdaO-2Y2vBC9g\",\"title\":\"I Never Loved a Man (The Way I Love You)\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-29T22:39:04.961548Z\",\"duration\":162.91},{\"id\":\"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MDU3MjU3MDgsImlhdCI6MTY3NDI1MTk4MiwiaWQiOiI0MWZhMDk5YTg3YjJiM2RjZTY0N2M3YTU5YjJjMmZiOSIsImlzcyI6Ik5EIn0.G3UYIh73pU8AqkUhJ1c6SdKgoX4ezNrYg4cZte004BA\",\"title\":\"Respect\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-29T22:40:35.358789Z\",\"duration\":148.13},{\"id\":\"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MDU3MjU3MDgsImlhdCI6MTY3NDI1MTk4MiwiaWQiOiI4Y2JhZDI4YTRhNzY4Y2ZjYjk4ODNmZGZlY2FlODFiMiIsImlzcyI6Ik5EIn0.YMoGoWrnwwnw2wEAc6YtdDvY_k9cBQA9sx_dSkW3-Pk\",\"title\":\"Do Right Woman, Do Right Man\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":197.36},{\"id\":\"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MDU3MjU3MDgsImlhdCI6MTY3NDI1MTk4MiwiaWQiOiI0ZjA4Y2MxMWU5M2FlYmY0ZDFlMmVjYTI2YjA0YmRjYyIsImlzcyI6Ik5EIn0.zHsYElP-ZQtp2m70eFYBYbzXNuOzHuYfEQOND7pj-Fw\",\"title\":\"Dr. Feelgood\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":202.11},{\"id\":\"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MDU3MjU3MDgsImlhdCI6MTY3NDI1MTk4MiwiaWQiOiI4YTNhODQ0M2Y5Yjg0ODMxYTYyNDdiMWJkZmJhZTE2YiIsImlzcyI6Ik5EIn0.Cxl1qWhVK8VnCCs-W2Vz7JaUv9TijXoBF6PvgDJR7vA\",\"title\":\"Save Me\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":141.6},{\"id\":\"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MDU3MjU3MDgsImlhdCI6MTY3NDI1MTk4MiwiaWQiOiJiNTE1NGEwNTc2M2YwMjY2MjYxZWZiNzgxOThiYWEyYyIsImlzcyI6Ik5EIn0.M-rR8sgvQER1w7dPqMnpJ_WYwzkz1zYuoQzIhy9W-KM\",\"title\":\"Baby I Love You\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":162.09},{\"id\":\"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MDU3MjU3MDgsImlhdCI6MTY3NDI1MTk4MiwiaWQiOiI1MDE1MTUxOGEwOGNlZmExN2JmZTcxOGE1OTliY2IyMyIsImlzcyI6Ik5EIn0.1ADjotHSgMmSZvTJRKit-m_L4bVJ-mMKw7mEiKLPpvU\",\"title\":\"(You Make Me Feel Like) A Natural Woman\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":165.47},{\"id\":\"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MDU3MjU3MDgsImlhdCI6MTY3NDI1MTk4MiwiaWQiOiIyYzNiNTY3NGJmOThmMjM0MzI4YzNiZjEwMGFlNWJlYSIsImlzcyI6Ik5EIn0._2z1sOV2g08tDwwlfJvrsu4uB6t2j6vw2KpI0YX92bM\",\"title\":\"Chain of Fools\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":167.71},{\"id\":\"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MDU3MjU3MDgsImlhdCI6MTY3NDI1MTk4MiwiaWQiOiI1M2U2MWFhODNlMzZkNmZjNjMwZGQ2MzVhYjM2OGQ2ZCIsImlzcyI6Ik5EIn0.yXowVn53gLB8c9zcji5MdlufSiuk5xWhE2GcL3Mr8k8\",\"title\":\"Since You've Been Gone\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":145.4},{\"id\":\"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MDU3MjU3MDgsImlhdCI6MTY3NDI1MTk4MiwiaWQiOiIxMjUxYWZkYWZiNWQyOTM1M2QwOWM5MmVlZTIyYTMyMCIsImlzcyI6Ik5EIn0.ttm1BDXoNtJwBRqvyGEmI7JDrakwNUkg2Z5VFWWh82U\",\"title\":\"Ain't No Way\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":254.13},{\"id\":\"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MDU3MjU3MDgsImlhdCI6MTY3NDI1MTk4MiwiaWQiOiJmMjQ4Mjk2YWQwMWNkNTAxMWFlZGNkOTU0YzViMzRlZiIsImlzcyI6Ik5EIn0.g-_DAutFEU05gL8wfRgRc4t3xJgM6WtzQ-AcO_32k9o\",\"title\":\"Think\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":139.69},{\"id\":\"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MDU3MjU3MDgsImlhdCI6MTY3NDI1MTk4MiwiaWQiOiIxMTQ3NDA4ZDE1NjcxMWNjNjdjNzFlMzU5ZDAwY2EyMSIsImlzcyI6Ik5EIn0.RzRytXu9OwjeWCHtV3a-OCot4O_qMYHJWZtNJOpCaW8\",\"title\":\"I Say a Little Prayer\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":215.67},{\"id\":\"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MDU3MjU3MDgsImlhdCI6MTY3NDI1MTk4MiwiaWQiOiIxMzQ0MGE3ZmNjMTBmOWVjZjYzMTg5MDM5ZDUzNDE1ZSIsImlzcyI6Ik5EIn0.zVQvbFwmydZrotkAmLeG6APSSo6Fg3qYNMpd3C6Jcw8\",\"title\":\"The House That Jack Built\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":141.4},{\"id\":\"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MDU3MjU3MDgsImlhdCI6MTY3NDI1MTk4MiwiaWQiOiJiOGEwNTJiOTRhMmQ1OWE2MGQ2ZDk1MGI2NWFiNTY4NCIsImlzcyI6Ik5EIn0.eOohKhKcrynhlYvXKFrU5m5xmCgP0OjArJ7tP678zWg\",\"title\":\"See Saw\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":165.51},{\"id\":\"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MDU3MjU3MDgsImlhdCI6MTY3NDI1MTk4MiwiaWQiOiJhYzhiMmU4ZDQ2NGMxYmEyNTBhMmUxMTNhODUxN2IyOCIsImlzcyI6Ik5EIn0.6JHJS7xvvmOj_80UkBWm3yyUsaBUB1CrdRzSmKXP_Bk\",\"title\":\"The Weight\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":178.56},{\"id\":\"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MDU3MjU3MDgsImlhdCI6MTY3NDI1MTk4MiwiaWQiOiJkMTJiZDE2NDY1N2QzODg3NWE5NTliNzYxZjEwNzIyZCIsImlzcyI6Ik5EIn0.l8Sk4FcRi-Vc9zAjpIqnyasDKUDXrzAwsVPDRBCd-8E\",\"title\":\"Share Your Love With Me\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":201.07},{\"id\":\"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MDU3MjU3MDgsImlhdCI6MTY3NDI1MTk4MiwiaWQiOiJkNDI3OTAxMGNhNDMxZDM0MDI3OGQ0YWNkZTljZmM5NiIsImlzcyI6Ik5EIn0.wX_TO_Si2-Ih8g2FohqNjBBA_RH-muDalUn3ENJ4uP0\",\"title\":\"Eleanor Rigby\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":157.81},{\"id\":\"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MDU3MjU3MDgsImlhdCI6MTY3NDI1MTk4MiwiaWQiOiI0MTNjMDM3MWNlNzc1MzQ3NWEwMTNhNDQzM2YyZjc5NyIsImlzcyI6Ik5EIn0.SS3_wvpdULpTU1DIkz88JJoqJ3u4y2hf16p6WGtl8IY\",\"title\":\"Call Me\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":237.4},{\"id\":\"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MDU3MjU3MDgsImlhdCI6MTY3NDI1MTk4MiwiaWQiOiJlNzNkMjkwZmNhZjU3YmNjYzg1OGM5NTBkMmJiOWNhOCIsImlzcyI6Ik5EIn0.KAAqPLUznbwHYR91a8XCwJhc7irpUbdPSQrqRZyfJJw\",\"title\":\"Spirit in the Dark\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":241.77},{\"id\":\"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MDU3MjU3MDgsImlhdCI6MTY3NDI1MTk4MiwiaWQiOiJkNmNiMGE1N2JlMDk2YmRmMDc2Y2Q1MDZkMDU0MzEzNiIsImlzcyI6Ik5EIn0.1Cb9NkuQi5WAgWfgEP8zg83qqhhSbzfvvDorh4-eytU\",\"title\":\"Don't Play That Song\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":179.6},{\"id\":\"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MDU3MjU3MDgsImlhdCI6MTY3NDI1MTk4MiwiaWQiOiJlNzVhMTM3MzU1ZTI2M2I2MzQ2NTdkYTZlMmFjNjg0ZSIsImlzcyI6Ik5EIn0.Yy6oenTOxz1iEYSbImhb3TA9MB6Q2b3g2nnyVfsDPHk\",\"title\":\"You're All I Need to Get By\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":216.47},{\"id\":\"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MDU3MjU3MDgsImlhdCI6MTY3NDI1MTk4MiwiaWQiOiJkNzYwOWE4YzU1ZTU0YTg2ZDBmYzM4OWUxNDA5MzA3MCIsImlzcyI6Ik5EIn0.ubcMhAtZqo5l4iqJD3ofQvoRbXwrAXG3FN3PFjEuO3g\",\"title\":\"Bridge Over Troubled Water\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":333.29},{\"id\":\"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MDU3MjU3MDgsImlhdCI6MTY3NDI1MTk4MiwiaWQiOiI0Mzc0NzVlNjkyNjJkYWM5MTJlZjZiMzVjNzNmOWRiOSIsImlzcyI6Ik5EIn0.vuKd3XNvjXLSi5L2BB-veURLDbgYzmqGa8194TdHO4I\",\"title\":\"Spanish Harlem\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":212.87},{\"id\":\"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MDU3MjU3MDgsImlhdCI6MTY3NDI1MTk4MiwiaWQiOiJmZmM0MGI5ZDhkMWJhM2VjNzI4ZWI3ZmVlOGJkYTkxZSIsImlzcyI6Ik5EIn0.VAiB4Oqb3wc9-VQlFYgr1kqSZWvI_XER6YJ0dIxoApA\",\"title\":\"Rock Steady\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":194.24},{\"id\":\"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MDU3MjU3MDgsImlhdCI6MTY3NDI1MTk4MiwiaWQiOiIyZDAzYzc5NjYwNzEyZDAxMTAyMzZiMjI4ZTNiYTkwMCIsImlzcyI6Ik5EIn0.wi20JOY3_yp_RUhKirLe6A5qLXOYB8PoNNQPdjBS-uo\",\"title\":\"Oh Me Oh My (I'm a Fool for You Baby)\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":222},{\"id\":\"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MDU3MjU3MDgsImlhdCI6MTY3NDI1MTk4MiwiaWQiOiJhNmUxMjAzODhmOWE4YWM0OWEwNjMxODk0YTdhNGIwNSIsImlzcyI6Ik5EIn0.QvrAYqBkxlJOXich5XQAm6LMwJFy4w53AVShrRYc5fM\",\"title\":\"Day Dreaming\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":240.07},{\"id\":\"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MDU3MjU3MDgsImlhdCI6MTY3NDI1MTk4MiwiaWQiOiI5OTIzNjIxZWEwMDc5NjY5MTkxMmQzYThkYmZkMTM4MSIsImlzcyI6Ik5EIn0.xWLcjNfjxThSLDkYqRJNwFaFHyIkU8MdjqK5M6tGDwE\",\"title\":\"Wholy Holy\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":172.47},{\"id\":\"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MDU3MjU3MDgsImlhdCI6MTY3NDI1MTk4MiwiaWQiOiI2MjgyNjlkMDlmNTY0YmY5NDU0NGM3NDNhOGE2MzAzYiIsImlzcyI6Ik5EIn0.afimu1Ttdz9uWlINSo6e-rjhX6y57bbQEP3zC7wVSkM\",\"title\":\"Angel\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":215.76},{\"id\":\"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MDU3MjU3MDgsImlhdCI6MTY3NDI1MTk4MiwiaWQiOiI5NWFlNTI4ZmQ4NjJhMzc4NjVkNWU4NDAzMzFlNDAwOSIsImlzcyI6Ik5EIn0.Wxh2zBfIyJMwNV9uar1TxCqrkZoxp6Es-mC4ZwtsR54\",\"title\":\"Until You Come Back to Me (That's What I'm Gonna Do)\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":207.51},{\"id\":\"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MDU3MjU3MDgsImlhdCI6MTY3NDI1MTk4MiwiaWQiOiI0MjhmZGI2YjllMzQyNjNjMGZkMzNjMGJlZjFjN2Q2YSIsImlzcyI6Ik5EIn0.00oiVtiZyngq14Xe6jKDZPNwLJocy1HtV33UgtKhg08\",\"title\":\"I'm in Love\",\"artist\":\"Aretha Franklin\",\"album\":\"30 Greatest Hits\",\"updatedAt\":\"2021-10-02T15:09:21Z\",\"duration\":171.64}]}"
window.__SHARE_INFO__ = {{ .ShareInfo }}
</script>
diff --git a/ui/src/App.js b/ui/src/App.js
index 77ef41751..db2fe06d2 100644
--- a/ui/src/App.js
+++ b/ui/src/App.js
@@ -36,7 +36,7 @@ import config, { shareInfo } from './config'
import { setDispatch, startEventStream, stopEventStream } from './eventStream'
import { keyMap } from './hotkeys'
import useChangeThemeColor from './useChangeThemeColor'
-import ShareApp from './ShareApp'
+import SharePlayer from './SharePlayer'
const history = createHashHistory()
@@ -141,7 +141,7 @@ const Admin = (props) => {
const AppWithHotkeys = () => {
if (config.devEnableShare && shareInfo) {
- return <ShareApp />
+ return <SharePlayer />
}
return (
<HotKeys keyMap={keyMap}>
diff --git a/ui/src/ShareApp.js b/ui/src/SharePlayer.js
similarity index 75%
rename from ui/src/ShareApp.js
rename to ui/src/SharePlayer.js
index fa6980558..74df7b95b 100644
--- a/ui/src/ShareApp.js
+++ b/ui/src/SharePlayer.js
@@ -2,12 +2,12 @@ import ReactJkMusicPlayer from 'navidrome-music-player'
import config, { shareInfo } from './config'
import { baseUrl } from './utils'
-const ShareApp = (props) => {
+const SharePlayer = () => {
const list = shareInfo?.tracks.map((s) => {
return {
name: s.title,
musicSrc: baseUrl(config.publicBaseUrl + '/s/' + s.id),
- cover: baseUrl(config.publicBaseUrl + '/img/' + s.id),
+ cover: baseUrl(config.publicBaseUrl + '/img/' + s.id + '?size=300'),
singer: s.artist,
duration: s.duration,
}
@@ -19,8 +19,10 @@ const ShareApp = (props) => {
showDownload: false,
showReload: false,
showMediaSession: true,
+ theme: 'auto',
+ showThemeSwitch: false,
}
return <ReactJkMusicPlayer {...options} />
}
-export default ShareApp
+export default SharePlayer
diff --git a/ui/src/album/AlbumActions.js b/ui/src/album/AlbumActions.js
index 62875c16b..c6593f578 100644
--- a/ui/src/album/AlbumActions.js
+++ b/ui/src/album/AlbumActions.js
@@ -133,6 +133,7 @@ const AlbumActions = ({
close={shareDialog.close}
ids={[record.id]}
resource={'album'}
+ title={`Share album '${record.name}'`}
/>
</TopToolbar>
)
@@ -146,7 +147,6 @@ AlbumActions.propTypes = {
AlbumActions.defaultProps = {
record: {},
selectedIds: [],
- onUnselectItems: () => null,
}
export default AlbumActions
diff --git a/ui/src/config.js b/ui/src/config.js
index cb01f98d3..1692e5792 100644
--- a/ui/src/config.js
+++ b/ui/src/config.js
@@ -28,7 +28,6 @@ const defaultConfig = {
enableCoverAnimation: true,
devShowArtistPage: true,
enableReplayGain: true,
- shareBaseUrl: '/s',
publicBaseUrl: '/p',
}
diff --git a/ui/src/dialogs/ShareDialog.js b/ui/src/dialogs/ShareDialog.js
index bd6b63e98..ef751db76 100644
--- a/ui/src/dialogs/ShareDialog.js
+++ b/ui/src/dialogs/ShareDialog.js
@@ -4,6 +4,8 @@ import {
DialogActions,
DialogContent,
DialogTitle,
+ FormControlLabel,
+ Switch,
} from '@material-ui/core'
import {
SelectInput,
@@ -14,12 +16,12 @@ import {
} from 'react-admin'
import { useMemo, useState } from 'react'
import { shareUrl } from '../utils'
-import Typography from '@material-ui/core/Typography'
-export const ShareDialog = ({ open, close, onClose, ids, resource }) => {
+export const ShareDialog = ({ open, close, onClose, ids, resource, title }) => {
const notify = useNotify()
const [format, setFormat] = useState('')
const [maxBitRate, setMaxBitRate] = useState(0)
+ const [originalFormat, setUseOriginalFormat] = useState(true)
const { data: formats, loading } = useGetList(
'transcoding',
{
@@ -39,6 +41,17 @@ export const ShareDialog = ({ open, close, onClose, ids, resource }) => {
[formats, loading]
)
+ const handleOriginal = (e) => {
+ const original = e.target.checked
+
+ setUseOriginalFormat(original)
+
+ if (original) {
+ setFormat('')
+ setMaxBitRate(0)
+ }
+ }
+
const [createShare] = useCreate(
'share',
{
@@ -78,47 +91,50 @@ export const ShareDialog = ({ open, close, onClose, ids, resource }) => {
open={open}
onClose={onClose}
onBackdropClick={onClose}
- aria-labelledby="info-dialog-album"
+ aria-labelledby="share-dialog"
fullWidth={true}
maxWidth={'sm'}
>
- <DialogTitle id="info-dialog-album">
- Create a link to share your music with friends
- </DialogTitle>
+ <DialogTitle id="share-dialog">{title}</DialogTitle>
<DialogContent>
<SimpleForm toolbar={null} variant={'outlined'}>
- <Typography variant="body1">Select transcoding options:</Typography>
- <Typography variant="caption">
- (Leave options empty for original quality)
- </Typography>
- <SelectInput
- source="format"
- choices={formatOptions}
- resettable
- onChange={(event) => {
- setFormat(event.target.value)
- }}
- />
- <SelectInput
- source="bitrate"
- choices={[
- { id: 32, name: '32' },
- { id: 48, name: '48' },
- { id: 64, name: '64' },
- { id: 80, name: '80' },
- { id: 96, name: '96' },
- { id: 112, name: '112' },
- { id: 128, name: '128' },
- { id: 160, name: '160' },
- { id: 192, name: '192' },
- { id: 256, name: '256' },
- { id: 320, name: '320' },
- ]}
- resettable
- onChange={(event) => {
- setMaxBitRate(event.target.value)
- }}
+ <FormControlLabel
+ control={<Switch checked={originalFormat} />}
+ label={'Share in original format'}
+ onChange={handleOriginal}
/>
+ {!originalFormat && (
+ <SelectInput
+ source="format"
+ choices={formatOptions}
+ resettable
+ onChange={(event) => {
+ setFormat(event.target.value)
+ }}
+ />
+ )}
+ {!originalFormat && (
+ <SelectInput
+ source="bitrate"
+ choices={[
+ { id: 32, name: '32' },
+ { id: 48, name: '48' },
+ { id: 64, name: '64' },
+ { id: 80, name: '80' },
+ { id: 96, name: '96' },
+ { id: 112, name: '112' },
+ { id: 128, name: '128' },
+ { id: 160, name: '160' },
+ { id: 192, name: '192' },
+ { id: 256, name: '256' },
+ { id: 320, name: '320' },
+ ]}
+ resettable
+ onChange={(event) => {
+ setMaxBitRate(event.target.value)
+ }}
+ />
+ )}
</SimpleForm>
</DialogContent>
<DialogActions>
diff --git a/ui/src/share/ShareList.js b/ui/src/share/ShareList.js
index 54244a350..0c3f5e470 100644
--- a/ui/src/share/ShareList.js
+++ b/ui/src/share/ShareList.js
@@ -33,6 +33,9 @@ const ShareList = (props) => {
label="URL"
target="_blank"
rel="noopener noreferrer"
+ onClick={(e) => {
+ e.stopPropagation()
+ }}
>
{r.id}
</Link>
diff --git a/ui/src/utils/shareUrl.js b/ui/src/utils/shareUrl.js
index 0b481ce88..d93add9ce 100644
--- a/ui/src/utils/shareUrl.js
+++ b/ui/src/utils/shareUrl.js
@@ -1,6 +1,6 @@
import config from '../config'
export const shareUrl = (path) => {
- const url = new URL(config.shareBaseUrl + '/' + path, window.location.href)
+ const url = new URL(config.publicBaseUrl + '/' + path, window.location.href)
return url.href
}