From 1143b158da5ff3e8ca50ab87dbee0ee7d8ff0838 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 15 Dec 2020 11:27:41 -0500 Subject: [PATCH 1/3] Add Channel Import Logging --- fHDHR/device/channels/__init__.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/fHDHR/device/channels/__init__.py b/fHDHR/device/channels/__init__.py index 9d8cf01..fa2a658 100644 --- a/fHDHR/device/channels/__init__.py +++ b/fHDHR/device/channels/__init__.py @@ -1,7 +1,7 @@ import datetime import time -from fHDHR.tools import hours_between_datetime +from fHDHR.tools import hours_between_datetime, humanized_time from .channel import Channel from .chan_ident import Channel_IDs @@ -83,7 +83,10 @@ class Channels(): channel_dict_list = self.origin.get_channels() self.fhdhr.logger.info("Found %s channels for %s." % (len(channel_dict_list), self.fhdhr.config.dict["main"]["servicename"])) + self.fhdhr.logger.info("Performing Channel Import, This can take some time, Please wait.") + newchan = 0 + chan_scan_start = time.time() for channel_info in channel_dict_list: chan_existing = False @@ -99,6 +102,8 @@ class Channels(): self.list[channel_id] = channel_obj newchan += 1 + self.fhdhr.logger.info("Channel Import took %s" % humanized_time(time.time() - chan_scan_start)) + if not newchan: newchan = "no" self.fhdhr.logger.info("Found %s NEW channels." % newchan) From 61779991cae49e9603e77585fe0fd20aa4cad4cd Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 15 Dec 2020 11:33:51 -0500 Subject: [PATCH 2/3] Change Default Logging Level to INFO --- data/internal_config/logging.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/internal_config/logging.json b/data/internal_config/logging.json index 87b53ec..5bed05c 100644 --- a/data/internal_config/logging.json +++ b/data/internal_config/logging.json @@ -1,7 +1,7 @@ { "logging":{ "level":{ - "value": "WARNING", + "value": "INFO", "config_file": true, "config_web": true } From 73c5f23ed7cd1d85a3a1cdba932334b7d3e0d072 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 15 Dec 2020 11:43:34 -0500 Subject: [PATCH 3/3] Add Tweak for future UDP variants --- fHDHR/device/tuners/__init__.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/fHDHR/device/tuners/__init__.py b/fHDHR/device/tuners/__init__.py index 7ddbb8d..86b651f 100644 --- a/fHDHR/device/tuners/__init__.py +++ b/fHDHR/device/tuners/__init__.py @@ -95,12 +95,17 @@ class Tuners(): if not stream_args["channelUri"]: raise TunerError("806 - Tune Failed") - channelUri_headers = self.fhdhr.web.session.head(stream_args["channelUri"]).headers - stream_args["true_content_type"] = channelUri_headers['Content-Type'] - - if stream_args["true_content_type"].startswith(tuple(["application/", "text/"])): + if stream_args["channelUri"].startswith("udp://"): + stream_args["true_content_type"] = "video/mpeg" stream_args["content_type"] = "video/mpeg" else: - stream_args["content_type"] = stream_args["true_content_type"] + + channelUri_headers = self.fhdhr.web.session.head(stream_args["channelUri"]).headers + stream_args["true_content_type"] = channelUri_headers['Content-Type'] + + if stream_args["true_content_type"].startswith(tuple(["application/", "text/"])): + stream_args["content_type"] = "video/mpeg" + else: + stream_args["content_type"] = stream_args["true_content_type"] return stream_args