From 3b766f380ed8c5d0d1eb673562f7469c1efbb404 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Sat, 28 Nov 2020 12:50:32 -0500 Subject: [PATCH] Improve direct stream chunk key url methods --- fHDHR/device/tuners/stream/direct_stream.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/fHDHR/device/tuners/stream/direct_stream.py b/fHDHR/device/tuners/stream/direct_stream.py index 665a0aa..706baef 100644 --- a/fHDHR/device/tuners/stream/direct_stream.py +++ b/fHDHR/device/tuners/stream/direct_stream.py @@ -103,7 +103,7 @@ class Direct_Stream(): for segment, key in zip(segments, keys): chunkurl = segment.absolute_uri - if chunkurl not in played_chunk_urls: + if chunkurl and chunkurl not in played_chunk_urls: played_chunk_urls.append(chunkurl) if (not self.stream_args["duration"] == 0 and @@ -116,9 +116,10 @@ class Direct_Stream(): break # raise TunerError("807 - No Video Data") if key: - keyfile = self.fhdhr.web.session.get(key["url"]).content - cryptor = AES.new(keyfile, AES.MODE_CBC, keyfile) - chunk = cryptor.decrypt(chunk) + if key["url"]: + keyfile = self.fhdhr.web.session.get(key["url"]).content + cryptor = AES.new(keyfile, AES.MODE_CBC, keyfile) + chunk = cryptor.decrypt(chunk) self.fhdhr.logger.info("Passing Through Chunk: %s" % chunkurl) yield chunk