opt lastfm, docs

Author: defsub

config/config.go

@@ -306,8 +306,8 @@ func configDefaults(v *viper.Viper) {
 
 	v.SetDefault("Fanart.ProjectKey", "93ede276ba6208318031727060b697c8")
 
-	v.SetDefault("LastFM.Key", "none")
-	v.SetDefault("LastFM.Secret", "none")
+	v.SetDefault("LastFM.Key", "")
+	v.SetDefault("LastFM.Secret", "")
 
 	v.SetDefault("Music.ArtistRadioBreadth", "10")
 	v.SetDefault("Music.ArtistRadioDepth", "3")

doc/actions.md

@@ -1,7 +1,7 @@
 # Actions
 
 Note - this will stop working June 13, 2023 due to
-(Converstational Actions Sunset)[https://developers.google.com/assistant/ca-sunset]
+[Converstational Actions Sunset](https://developers.google.com/assistant/ca-sunset)
 
 Takeout optionally supports a Google Assistant webhook to play music using the
 Google Assistant app, Nest Audio, Nest Hub, Google Home, and related products

doc/setup.md

@@ -4,8 +4,8 @@
 
 This setup assumes the use of a UNIX system such as Linux. Takeout is written
 in Go, so most systems will work just fine. Please adjust commands below as
-needed. You can setup on a virtual system in the cloud such as EC2, GCE,
-Digital Ocean, Linode, or use your spiffy computer at home.
+needed. You can setup on a virtual private server (VPS) in the cloud such as
+EC2, GCE, Digital Ocean, Linode, or use your spiffy computer at home.
 
 You need to have media stored in an S3 bucket somewhere. Some common services
 are AWS S3, Wasabi, Backblaze, and Minio. And if you're using that spiffy home
@@ -14,15 +14,25 @@ available via S3 to your home network. The other bucket services cost money,
 however you have the added benefit of having your media securely available
 wherever you go.
 
+General VPS requirements:
+* Network - monthly 8GB in / 300MB out (depends on usage)
+* Storage - 500MB for databases and search index
+* CPU - Shared CPU with 1 core, 1GB RAM
+
+A recommended cloud setup would be:
+* Linode (Nanode 1GB $5/mo) for running Takeout
+* Wasabi ($5.99 TB/mo) for S3 media
+
+Remember that Takeout indirectly streams media and instead redirects
+clients/apps to the S3 bucket using pre-signed time-based URLs for
+streaming. Any media streaming network costs are only related to the S3 bucket
+provider and not the VPS.
+
 Please see [bucket.md](bucket.md) for further details on how you should
 organize your media in S3. [rclone](https://rclone.org) is an excellent tool to
 manage S3 buckets from the command line. Once that's all done, proceed with the
 steps below.
 
-One recommended cloud setup would be:
-* Linode (Nanode 1GB $5/mo) for running Takeout
-* Wasabi ($5.99 TB/mo) for S3 media
-
 ## Steps
 
 Download and install Go from [https://go.dev/](https://go.dev/) as needed. Run

lib/lastfm/lastfm.go

@@ -48,6 +48,10 @@ type TopTrack struct {
 }
 
 func (m *Lastfm) ArtistTopTracks(arid string) []TopTrack {
+	if m.config.LastFM.Key == "" || m.config.LastFM.Secret == "" {
+		return make([]TopTrack, 0)
+	}
+
 	client.RateLimit("last.fm")
 	api := lfm.New(m.config.LastFM.Key, m.config.LastFM.Secret)
 
@@ -68,6 +72,10 @@ func (m *Lastfm) ArtistTopTracks(arid string) []TopTrack {
 }
 
 func (m *Lastfm) SimilarArtists(arid string) map[string]float64 {
+	if m.config.LastFM.Key == "" || m.config.LastFM.Secret == "" {
+		return make(map[string]float64)
+	}
+
 	client.RateLimit("last.fm")
 	api := lfm.New(m.config.LastFM.Key, m.config.LastFM.Secret)
 	result, _ := api.Artist.GetSimilar(lfm.P{"mbid": arid})
@@ -94,6 +102,10 @@ func (m *Lastfm) SimilarArtists(arid string) map[string]float64 {
 }
 
 func (m *Lastfm) ArtistSearch(name string) (string, string) {
+	if m.config.LastFM.Key == "" || m.config.LastFM.Secret == "" {
+		return "", ""
+	}
+
 	client.RateLimit("last.fm")
 	api := lfm.New(m.config.LastFM.Key, m.config.LastFM.Secret)
 	result, _ := api.Artist.Search(lfm.P{"artist": name})