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

test

Browse Source
This commit is contained in:
deathbybandaid 2020-12-15 13:25:18 -05:00
parent 8564bd40fd
commit 7ce2b531f7
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fHDHR/device/tuners/tuner.py
View File

@ -65,14 +65,15 @@ class Tuner():
self.tuner_lock.release() self.tuner_lock.release()
self.fhdhr.logger.info("Tuner #" + str(self.number) + " Released.") self.fhdhr.logger.info("Tuner #" + str(self.number) + " Released.")
def get_status(self): def get_status(self, getepg=True):
current_status = self.status.copy() current_status = self.status.copy()
if current_status["status"] == "Active": if current_status["status"] == "Active":
current_status["Play Time"] = str( current_status["Play Time"] = str(
humanized_time( humanized_time(
int((datetime.datetime.utcnow() - current_status["time_start"]).total_seconds()))) int((datetime.datetime.utcnow() - current_status["time_start"]).total_seconds())))
current_status["time_start"] = str(current_status["time_start"]) 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 return current_status
def set_off_status(self): def set_off_status(self):

2
fHDHR_web/api/tuners.py
View File

@ -122,7 +122,7 @@ class Tuners():
if not tuner_number: if not tuner_number:
tuner_status = self.fhdhr.device.tuners.status() tuner_status = self.fhdhr.device.tuners.status()
elif str(tuner_number) in list(self.fhdhr.device.tuners.tuners.keys()): 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: else:
tuner_status = ["Invalid Tuner %s" % tuner_number] tuner_status = ["Invalid Tuner %s" % tuner_number]