diff options
Diffstat (limited to 'src/qlistener.lua')
| -rw-r--r-- | src/qlistener.lua | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/src/qlistener.lua b/src/qlistener.lua index 8a696fe..a80dbac 100644 --- a/src/qlistener.lua +++ b/src/qlistener.lua @@ -33,28 +33,26 @@ conf = require "conf" local cnf = {} function init(conffile) cnf = conf.load(conffile) - if cnf.music_carts_lo == nil then - cnf.music_carts_lo = 400000 - end - if cnf.music_carts_hi == nil then - cnf.music_carts_hi = 499999 - end - cnf.music_carts_lo = tonumber(cnf.music_carts_lo) - cnf.music_carts_hi = tonumber(cnf.music_carts_hi) end function handle_now(timestamp, nowcart, nowlen) - local results, err = rddb:getCartInfo(nowcart); + local results, err = rddb:getCartInfo(nowcart) if results == nil then io.stderr:write("ERROR: can't fetch cart info: " .. err .. "\n") return nil else --- print(timestamp .. " Info: '" .. results.TITLE .. "' von '" .. results.ARTIST .. "' aus '" .. results.ALBUM .. "'") - local ret, err = playlog:insertNowMusic(timestamp, nowcart, nowlen, results.TITLE, results.ARTIST, results.ALBUM) - if ret == nil then - io.stderr:write("ERROR: can't insert music info: " .. err .. "\n") + -- print(timestamp .. " Info: '" .. results.TITLE .. "' von '" .. results.ARTIST .. "' aus '" .. results.ALBUM .. "'") + local showtitle, isMusic, err = rddb:getCartShowName(nowcart) + if showtitle == nil then + io.stderr:write("ERROR: can't fetch show/pool name: " .. err .. "\n") + return nil else - pipe.signal(timestamp) + local ret, err = playlog:insertNow(timestamp, nowcart, nowlen, showtitle, results.TITLE, results.ARTIST, results.ALBUM, isMusic) + if ret == nil then + io.stderr:write("ERROR: can't insert cart info: " .. err .. "\n") + else + pipe.signal(timestamp) + end end end @@ -68,7 +66,7 @@ function handle_message(msg, q) else nowcart = tonumber(nowcart) nowlen = tonumber(nowlen) - if last_cart ~= nowcart and nowcart >= cnf.music_carts_lo and nowcart <= cnf.music_carts_hi and nowlen > 0 then + if last_cart ~= nowcart and nowlen > 0 then last_cart = nowcart local ret = handle_now(timestamp, nowcart, nowlen) if ret == nil then |