fHDHR/fHDHR_NextPVR
1
0
Fork 0
mirror of https://github.com/fHDHR/fHDHR_NextPVR.git synced 2025-12-06 17:56:57 -05:00
Code Issues Releases Wiki Activity

Merge pull request #68 from deathbybandaid/dev

Browse Source 
Tuner Numbers should start at 0
This commit is contained in:
Deathbybandaid 2020-11-30 14:58:46 -05:00 committed by GitHub
commit e763874a62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fHDHR/device/tuners/__init__.py
View File

@ -17,17 +17,17 @@ class Tuners():
self.fhdhr.logger.info("Creating %s tuners." % str(self.max_tuners)) self.fhdhr.logger.info("Creating %s tuners." % str(self.max_tuners))
for i in range(1, self.max_tuners + 1): for i in range(0, self.max_tuners):
self.tuners[i] = Tuner(fhdhr, i, epg) self.tuners[str(i)] = Tuner(fhdhr, i, epg)
def tuner_grab(self, tuner_number): def tuner_grab(self, tuner_number):
if int(tuner_number) not in list(self.tuners.keys()): if str(tuner_number) not in list(self.tuners.keys()):
self.fhdhr.logger.error("Tuner %s does not exist." % str(tuner_number)) self.fhdhr.logger.error("Tuner %s does not exist." % str(tuner_number))
raise TunerError("806 - Tune Failed") raise TunerError("806 - Tune Failed")
# TunerError will raise if unavailable # TunerError will raise if unavailable
self.tuners[int(tuner_number)].grab() self.tuners[str(tuner_number)].grab()
return tuner_number return tuner_number
@ -38,7 +38,7 @@ class Tuners():
for tunernum in list(self.tuners.keys()): for tunernum in list(self.tuners.keys()):
try: try:
self.tuners[int(tunernum)].grab() self.tuners[str(tunernum)].grab()
except TunerError: except TunerError:
continue continue
else: else:
@ -47,18 +47,18 @@ class Tuners():
raise TunerError("805 - All Tuners In Use") raise TunerError("805 - All Tuners In Use")
def tuner_close(self, tunernum): def tuner_close(self, tunernum):
self.tuners[int(tunernum)].close() self.tuners[str(tunernum)].close()
def status(self): def status(self):
all_status = {} all_status = {}
for tunernum in list(self.tuners.keys()): for tunernum in list(self.tuners.keys()):
all_status[tunernum] = self.tuners[int(tunernum)].get_status() all_status[tunernum] = self.tuners[str(tunernum)].get_status()
return all_status return all_status
def available_tuner_count(self): def available_tuner_count(self):
available_tuners = 0 available_tuners = 0
for tunernum in list(self.tuners.keys()): for tunernum in list(self.tuners.keys()):
tuner_status = self.tuners[int(tunernum)].get_status() tuner_status = self.tuners[str(tunernum)].get_status()
if tuner_status["status"] == "Inactive": if tuner_status["status"] == "Inactive":
available_tuners += 1 available_tuners += 1
return available_tuners return available_tuners
@ -66,7 +66,7 @@ class Tuners():
def inuse_tuner_count(self): def inuse_tuner_count(self):
inuse_tuners = 0 inuse_tuners = 0
for tunernum in list(self.tuners.keys()): for tunernum in list(self.tuners.keys()):
tuner_status = self.tuners[int(tunernum)].get_status() tuner_status = self.tuners[str(tunernum)].get_status()
if tuner_status["status"] == "Active": if tuner_status["status"] == "Active":
inuse_tuners += 1 inuse_tuners += 1
return inuse_tuners return inuse_tuners

6
fHDHR/http/api/watch.py
View File

@ -80,7 +80,7 @@ class Watch():
response.headers["X-fHDHR-Error"] = str(e) response.headers["X-fHDHR-Error"] = str(e)
self.fhdhr.logger.error(response.headers["X-fHDHR-Error"]) self.fhdhr.logger.error(response.headers["X-fHDHR-Error"])
abort(response) abort(response)
tuner = self.fhdhr.device.tuners.tuners[int(tunernum)] tuner = self.fhdhr.device.tuners.tuners[str(tunernum)]
try: try:
stream_args = self.fhdhr.device.tuners.get_stream_info(stream_args) stream_args = self.fhdhr.device.tuners.get_stream_info(stream_args)
@ -103,10 +103,10 @@ class Watch():
elif method == "close": elif method == "close":
if not tuner_number or int(tuner_number) not in list(self.fhdhr.device.tuners.tuners.keys()): if not tuner_number or str(tuner_number) not in list(self.fhdhr.device.tuners.tuners.keys()):
return "%s Invalid tuner" % str(tuner_number) return "%s Invalid tuner" % str(tuner_number)
tuner = self.fhdhr.device.tuners.tuners[int(tuner_number)] tuner = self.fhdhr.device.tuners.tuners[str(tuner_number)]
tuner.close() tuner.close()
else: else: