Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor(playout): rename input_check_auth handlers

This commit is contained in:
jo 2023-02-22 17:25:59 +01:00 committed by Kyle Robbertze
parent 2f9f60e639
commit cd2cd66bdf
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
playout/libretime_playout/liquidsoap/1.4/ls_script.liq
View File

@ -120,7 +120,7 @@ def input_show_on_disconnect() update_source_status("live_dj", false) end
# @param user Username to check against LibreTime API # @param user Username to check against LibreTime API
# @param password Password to check against LibreTime API # @param password Password to check against LibreTime API
# @param ~type Type of password to check, "dj" or "master, default: "master" # @param ~type Type of password to check, "dj" or "master, default: "master"
def check_auth(user="", password="", ~type="master") = def input_check_auth(user="", password="", ~type="master") =
log("#{type} user #{user} connected",label="#{type}_source") log("#{type} user #{user} connected",label="#{type}_source")
# Check auth based on return value from auth script # Check auth based on return value from auth script
@ -135,20 +135,11 @@ def check_auth(user="", password="", ~type="master") =
ret ret
end end
# Check master source auth def make_input_auth_handler(source_name)
# @Category LiveStream def auth_handler(user, password) =
# @param user Username to check against LibreTime API input_check_auth(user, password, type=source_name)
# @param password Password to check against LibreTime API end
def check_master_dj_client(user, password) = auth_handler
check_auth(user, password)
end
# Check dj/show source auth
# @Category LiveStream
# @param user Username to check against LibreTime API
# @param password Password to check against LibreTime API
def check_dj_client(user, password) =
check_auth(user, password, type="dj")
end end
s = switch(id="schedule_noise_switch", s = switch(id="schedule_noise_switch",
@ -163,7 +154,7 @@ s = if input_show_port != 0 and input_show_mount != "" then
input.harbor(id="input_show_harbor", input.harbor(id="input_show_harbor",
input_show_mount, input_show_mount,
port=input_show_port, port=input_show_port,
auth=check_dj_client, auth=make_input_auth_handler("dj"),
max=40., max=40.,
on_connect=input_show_on_connect, on_connect=input_show_on_connect,
on_disconnect=input_show_on_disconnect)) on_disconnect=input_show_on_disconnect))
@ -185,7 +176,7 @@ s = if input_main_port != 0 and input_main_mount != "" then
input.harbor(id="input_main_harbor", input.harbor(id="input_main_harbor",
input_main_mount, input_main_mount,
port=input_main_port, port=input_main_port,
auth=check_master_dj_client, auth=make_input_auth_handler("master"),
max=40., max=40.,
on_connect=input_main_on_connect, on_connect=input_main_on_connect,
on_disconnect=input_main_on_disconnect)) on_disconnect=input_main_on_disconnect))