From c7e1f059551350bb10d89ec71071328954902e98 Mon Sep 17 00:00:00 2001 From: DYefremov Date: Sun, 3 Nov 2019 18:11:49 +0300 Subject: [PATCH] added play to the request types --- app/connections.py | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/app/connections.py b/app/connections.py index 7ffa6cb7..3dee2a09 100644 --- a/app/connections.py +++ b/app/connections.py @@ -37,6 +37,7 @@ class HttpRequestType(Enum): SIGNAL = "tunersignal" STREAM = "streamcurrentm3u" STATUS = "statusinfo" + PLAY = "mediaplayerplay?file=4097:0:1:0:0:0:0:0:0:0:" class TestException(Exception): @@ -269,25 +270,21 @@ def telnet(host, port=23, user="", password="", timeout=5): yield -# ***************** http api *******************# +# ***************** HTTP API *******************# def http_request(host, port, user, password): + print(host, port, user, password) base_url = "http://{}:{}/api/".format(host, port) init_auth(user, password, base_url) while True: req_type, ref = yield - url = base_url + url = base_url + req_type.value + if req_type is HttpRequestType.ZAP: - url = base_url + "zap?sRef={}".format(urllib.parse.quote(ref)) - elif req_type is HttpRequestType.INFO: - url = base_url + HttpRequestType.INFO.value - elif req_type is HttpRequestType.SIGNAL: - url = base_url + HttpRequestType.SIGNAL.value - elif req_type is HttpRequestType.STREAM: - url = base_url + HttpRequestType.STREAM.value - elif req_type is HttpRequestType.STATUS: - url = base_url + HttpRequestType.STATUS.value + url += urllib.parse.quote(ref) + elif req_type is HttpRequestType.PLAY: + url += urllib.parse.quote(ref).replace("%3A", "%253A") yield from get_json(req_type, url)