Upd: small improvements

jcorporation · May 26, 2024 · 09693a9 · 09693a9
1 parent 316da17
commit 09693a9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 16 deletions.
diff --git a/ListenBrainz/ListenBrainz-Scrobbler.lua b/ListenBrainz/ListenBrainz-Scrobbler.lua
@@ -12,12 +12,10 @@ if rc ~= 0 then
   return
 end
 
-if result.webradio then
-  return
-end
-
-if string.sub(result.uri, 1, 8) == "https://" or
-   string.sub(result.uri, 1, 7) == "http://" then
+if result.webradio or
+   string.sub(result.uri, 1, 8) == "https://" or
+   string.sub(result.uri, 1, 7) == "http://"
+then
   return
 end
 

diff --git a/last.fm/lastfm_player.lua b/last.fm/lastfm_player.lua
@@ -8,21 +8,19 @@ local play_state = mympd_state.play_state
 local elapsed_time = mympd_state.elapsed_time
 
 if play_state ~= 2 or elapsed_time > 5 then
-  return "not now playing"
+  return "Now Playing: Not Playing"
 end
 
 local rc, result = mympd.api("MYMPD_API_PLAYER_CURRENT_SONG")
 if rc ~= 0 then
   return "Now Playing: Not Playing"
 end
 
-if result.webradio then
-  return "web radio"
-end
-
-if string.sub(result.uri, 1, 8) == "https://" or
-   string.sub(result.uri, 1, 7) == "http://" then
-  return "web radio"
+if result.webradio or
+   string.sub(result.uri, 1, 8) == "https://" or
+   string.sub(result.uri, 1, 7) == "http://"
+then
+  return
 end
 
 local artist = result.Artist[1]

diff --git a/last.fm/lastfm_scrobble.lua b/last.fm/lastfm_scrobble.lua
@@ -1,6 +1,4 @@
 -- {"order":1,"arguments":[]}
-mympd.init()
-
 local lastfm_lib = require "scripts/lastfm_lib"
 
 -- main