Merge pull request #141 from deathbybandaid/dev

Dev

fHDHR/device/tuners/__init__.py

@@ -129,8 +129,12 @@ class Tuners():
         quality_profile = stream_args["origin_quality"]
 
         if not quality_profile:
-            quality_profile = "high"
-            self.fhdhr.logger.info("Origin Quality not set in config. Defaulting to Highest Quality")
+            if stream_args["method"] == "direct":
+                quality_profile = "high"
+                self.fhdhr.logger.info("Origin Quality not set in config. Direct Method set and will default to Highest Quality")
+            else:
+                self.fhdhr.logger.info("Origin Quality not set in config. %s Method will select the Quality Automatically" % stream_args["method"])
+                return m3u8_url
         else:
             quality_profile = quality_profile.lower()
             self.fhdhr.logger.info("Origin Quality set in config to %s" % (quality_profile))

fHDHR/device/tuners/stream/direct_m3u8_stream.py

@@ -23,6 +23,9 @@ class Direct_M3U8_Stream():
 
         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():
 
             try:

fHDHR/device/tuners/stream/direct_stream.py

@@ -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"]))
 
+        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"]:
             req = self.fhdhr.web.session.get(self.stream_args["stream_info"]["url"], stream=True, headers=self.stream_args["stream_info"]["headers"])
         else: