deathbybandaid/fHDHR_LocalNow
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

test

Browse Source
This commit is contained in:
deathbybandaid 2021-01-21 09:45:03 -05:00
parent 70c7e21335
commit 80c8a81bb1
5 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fHDHR/device/tuners/stream/direct_m3u8_stream.py
View File

@ -23,6 +23,9 @@ class Direct_M3U8_Stream():
self.fhdhr.logger.info("Detected stream of m3u8 URL: %s" % self.stream_args["stream_info"]["url"]) self.fhdhr.logger.info("Detected stream of m3u8 URL: %s" % self.stream_args["stream_info"]["url"])
if self.stream_args["transcode_quality"]:
self.fhdhr.logger.info("Client requested a %s transcode for stream. Direct Method cannot transcode." % self.stream_args["transcode_quality"])
def generate(): def generate():
try: try:

3
fHDHR/device/tuners/stream/direct_stream.py
View File

@ -20,6 +20,9 @@ class Direct_Stream():
self.fhdhr.logger.info("Direct Stream of %s URL: %s" % (self.stream_args["true_content_type"], self.stream_args["stream_info"]["url"])) self.fhdhr.logger.info("Direct Stream of %s URL: %s" % (self.stream_args["true_content_type"], self.stream_args["stream_info"]["url"]))
if self.stream_args["transcode_quality"]:
self.fhdhr.logger.info("Client requested a %s transcode for stream. Direct Method cannot transcode." % self.stream_args["transcode_quality"])
if self.stream_args["stream_info"]["headers"]: if self.stream_args["stream_info"]["headers"]:
req = self.fhdhr.web.session.get(self.stream_args["stream_info"]["url"], stream=True, headers=self.stream_args["stream_info"]["headers"]) req = self.fhdhr.web.session.get(self.stream_args["stream_info"]["url"], stream=True, headers=self.stream_args["stream_info"]["headers"])
else: else:

11
fHDHR_web/api/tuners.py
View File

@ -16,10 +16,6 @@ class Tuners():
def __init__(self, fhdhr): def __init__(self, fhdhr):
self.fhdhr = fhdhr self.fhdhr = fhdhr
self.quality = self.fhdhr.config.dict["streaming"]["quality"]
if self.quality:
self.quality = str(self.quality).lower()
def __call__(self, *args): def __call__(self, *args):
return self.get(*args) return self.get(*args)
@ -56,12 +52,12 @@ class Tuners():
duration = request.args.get('duration', default=0, type=int) duration = request.args.get('duration', default=0, type=int)
transcode = request.args.get('transcode', default=self.quality, type=str) transcode_quality = request.args.get('transcode', default=None, type=str)
valid_transcode_types = [ valid_transcode_types = [
None, "high", "medium", "low" None, "high", "medium", "low"
"heavy", "mobile", "internet720", "internet480", "internet360", "internet240" "heavy", "mobile", "internet720", "internet480", "internet360", "internet240"
] ]
if transcode not in valid_transcode_types: if transcode_quality not in valid_transcode_types:
response = Response("Service Unavailable", status=503) response = Response("Service Unavailable", status=503)
response.headers["X-fHDHR-Error"] = "802 - Unknown Transcode Profile" response.headers["X-fHDHR-Error"] = "802 - Unknown Transcode Profile"
self.fhdhr.logger.error(response.headers["X-fHDHR-Error"]) self.fhdhr.logger.error(response.headers["X-fHDHR-Error"])
@ -71,7 +67,8 @@ class Tuners():
"channel": channel_number, "channel": channel_number,
"method": method, "method": method,
"duration": duration, "duration": duration,
"transcode": transcode, "origin_quality": self.fhdhr.config.dict["streaming"]["origin_quality"],
"transcode_quality": transcode_quality,
"accessed": accessed_url, "accessed": accessed_url,
"client": client_address, "client": client_address,
"client_id": session["session_id"] "client_id": session["session_id"]

6
fHDHR_web/hdhr/auto.py
View File

@ -36,9 +36,9 @@ class Auto():
if duration: if duration:
redirect_url += "&duration=%s" % str(duration) redirect_url += "&duration=%s" % str(duration)
transcode = request.args.get('transcode', default=None, type=str) transcode_quality = request.args.get('transcode', default=None, type=str)
if transcode: if transcode_quality:
redirect_url += "&transcode=%s" % str(transcode) redirect_url += "&transcode=%s" % str(transcode_quality)
redirect_url += "&accessed=%s" % urllib.parse.quote(request.url) redirect_url += "&accessed=%s" % urllib.parse.quote(request.url)

6
fHDHR_web/hdhr/tuner.py
View File

@ -38,9 +38,9 @@ class Tuner():
if duration: if duration:
redirect_url += "&duration=%s" % str(duration) redirect_url += "&duration=%s" % str(duration)
transcode = request.args.get('transcode', default=None, type=str) transcode_quality = request.args.get('transcode', default=None, type=str)
if transcode: if transcode_quality:
redirect_url += "&transcode=%s" % str(transcode) redirect_url += "&transcode=%s" % str(transcode_quality)
redirect_url += "&accessed=%s" % urllib.parse.quote(request.url) redirect_url += "&accessed=%s" % urllib.parse.quote(request.url)