Skip to content

Commit

Permalink
Upd: compatibility with recent myMPD v16.1.0 changes
Browse files Browse the repository at this point in the history
  • Loading branch information
jcorporation committed May 26, 2024
1 parent 27d987a commit 316da17
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 21 deletions.
5 changes: 2 additions & 3 deletions ListenBrainz/ListenBrainz-Feedback.lua
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
-- {"order":1,"arguments":["uri","vote","type"]}
mympd.init()
if mympd_state.var_listenbrainz_token == nil then
if mympd_env.var_listenbrainz_token == nil then
return "No ListenBrainz token set"
end

local uri = "https://api.listenbrainz.org/1/feedback/recording-feedback"
local headers = "Content-type: application/json\r\n"..
"Authorization: Token "..mympd_state["var_listenbrainz_token"].."\r\n"
"Authorization: Token " .. mympd_env.var_listenbrainz_token .. "\r\n"

local vote
if mympd_arguments.type == "like" then
Expand Down
5 changes: 2 additions & 3 deletions ListenBrainz/ListenBrainz-Pin.lua
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
-- {"order":1,"arguments":["uri","blurb_content","pinned_until"]}
mympd.init()
if mympd_state.var_listenbrainz_token == nil then
if mympd_env.var_listenbrainz_token == nil then
return "No ListenBrainz token set"
end

local pin_uri = "https://api.listenbrainz.org/1/pin"
local unpin_uri = "https://api.listenbrainz.org/1/pin/unpin"
local headers = "Content-type: application/json\r\n"..
"Authorization: Token "..mympd_state["var_listenbrainz_token"].."\r\n"
"Authorization: Token " .. mympd_env.var_listenbrainz_token .. "\r\n"
local payload = ""
local uri = ""

Expand Down
5 changes: 2 additions & 3 deletions ListenBrainz/ListenBrainz-Scrobbler.lua
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
-- {"order":1,"arguments":[]}
mympd.init()
if mympd_state.var_listenbrainz_token == nil then
if mympd_env.var_listenbrainz_token == nil then
return "No ListenBrainz token set"
end

local uri = "https://api.listenbrainz.org/1/submit-listens"
local headers = "Content-type: application/json\r\n"..
"Authorization: Token "..mympd_state["var_listenbrainz_token"].."\r\n"
"Authorization: Token " .. mympd_env.var_listenbrainz_token .. "\r\n"

local rc, result = mympd.api("MYMPD_API_PLAYER_CURRENT_SONG")
if rc ~= 0 then
Expand Down
6 changes: 2 additions & 4 deletions last.fm/lastfm_feedback.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
-- {"order":1,"arguments":["uri","vote","type"]}
mympd.init()

local lastfm_lib = require "scripts/lastfm_lib"

-- main
Expand All @@ -24,10 +22,10 @@ local title = result.Title

local data = {
method = "track.love",
api_key = mympd_state.var_lastfm_api_key,
api_key = mympd_env.var_lastfm_api_key,
track = title,
artist = artist,
sk = mympd_state.var_lastfm_session_key,
sk = mympd_env.var_lastfm_session_key,
}

local body
Expand Down
4 changes: 1 addition & 3 deletions last.fm/lastfm_get_session_key.lua
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
-- {"order":1,"arguments":["username", "password"]}
mympd.init()

local lastfm_lib = require "scripts/lastfm_lib"

local data = {
method = "auth.getMobileSession",
username = mympd_arguments.username,
password = mympd_arguments.password,
api_key = mympd_state.var_lastfm_api_key,
api_key = mympd_env.var_lastfm_api_key,
}

local rc, body = lastfm_lib.sendData(data)
Expand Down
2 changes: 1 addition & 1 deletion last.fm/lastfm_lib.lua
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ end

lastfm_lib.sendData = function(data)
local headers = 'Content-type: application/x-www-form-urlencoded\r\n'
local hash = hashRequest(data, mympd_state.var_lastfm_secret)
local hash = hashRequest(data, mympd_env.var_lastfm_secret)
data["api_sig"] = hash
data = urlencode_data(data)
local rc, code, header, body = mympd.http_client("POST", "https://ws.audioscrobbler.com/2.0/?format=json", headers, data)
Expand Down
4 changes: 2 additions & 2 deletions last.fm/lastfm_player.lua
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ local albumArtist = result.AlbumArtist[1]

local data = {
method = "track.updateNowPlaying",
api_key = mympd_state.var_lastfm_api_key,
api_key = mympd_env.var_lastfm_api_key,
track = title,
artist = artist,
album = album,
albumArtist = albumArtist,
sk = mympd_state.var_lastfm_session_key,
sk = mympd_env.var_lastfm_session_key,
}

local body
Expand Down
4 changes: 2 additions & 2 deletions last.fm/lastfm_scrobble.lua
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ local albumArtist = result.AlbumArtist[1]

local data = {
method = "track.scrobble",
api_key = mympd_state.var_lastfm_api_key,
api_key = mympd_env.var_lastfm_api_key,
timestamp = tostring(os.time()-30),
track = title,
artist = artist,
album = album,
albumArtist = albumArtist,
sk = mympd_state.var_lastfm_session_key,
sk = mympd_env.var_lastfm_session_key,
}

local body
Expand Down

0 comments on commit 316da17

Please sign in to comment.