diff --git a/fHDHR/device/tuners/tuner.py b/fHDHR/device/tuners/tuner.py index d1aa593..785e8af 100644 --- a/fHDHR/device/tuners/tuner.py +++ b/fHDHR/device/tuners/tuner.py @@ -65,14 +65,15 @@ class Tuner(): self.tuner_lock.release() self.fhdhr.logger.info("Tuner #" + str(self.number) + " Released.") - def get_status(self): + def get_status(self, getepg=True): current_status = self.status.copy() if current_status["status"] == "Active": current_status["Play Time"] = str( humanized_time( int((datetime.datetime.utcnow() - current_status["time_start"]).total_seconds()))) current_status["time_start"] = str(current_status["time_start"]) - current_status["epg"] = self.epg.whats_on_now(current_status["channel"]) + if getepg: + current_status["epg"] = self.epg.whats_on_now(current_status["channel"]) return current_status def set_off_status(self): diff --git a/fHDHR_web/api/tuners.py b/fHDHR_web/api/tuners.py index 4a73d66..ab37538 100644 --- a/fHDHR_web/api/tuners.py +++ b/fHDHR_web/api/tuners.py @@ -122,7 +122,7 @@ class Tuners(): if not tuner_number: tuner_status = self.fhdhr.device.tuners.status() elif str(tuner_number) in list(self.fhdhr.device.tuners.tuners.keys()): - tuner_status = self.fhdhr.device.tuners.tuners[str(tuner_number)].get_status() + tuner_status = self.fhdhr.device.tuners.tuners[str(tuner_number)].get_status(getepg=False) else: tuner_status = ["Invalid Tuner %s" % tuner_number]