diff options
author | Britney Fransen <brfransen@gmail.com> | 2019-03-19 20:11:10 (GMT) |
---|---|---|
committer | Britney Fransen <brfransen@gmail.com> | 2019-03-19 20:11:10 (GMT) |
commit | 73cfb83a5baecfe0529fda59ca57233d8843f783 (patch) | |
tree | 2dba2103a6f6e43912fc645ca8b48a85ab500ad2 /abs/core/LinHES-system/myth_status.py | |
parent | 7b41a9288f5d1332c8136df798bb8ca2465bc21c (diff) | |
parent | 448cb8d0708224d78c24ce3615dc7eef44d4689b (diff) | |
download | linhes_pkgbuild-73cfb83a5baecfe0529fda59ca57233d8843f783.zip linhes_pkgbuild-73cfb83a5baecfe0529fda59ca57233d8843f783.tar.gz linhes_pkgbuild-73cfb83a5baecfe0529fda59ca57233d8843f783.tar.bz2 |
Merge branch 'testing'
Diffstat (limited to 'abs/core/LinHES-system/myth_status.py')
-rw-r--r-- | abs/core/LinHES-system/myth_status.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/abs/core/LinHES-system/myth_status.py b/abs/core/LinHES-system/myth_status.py index cd541ca..63328d0 100644 --- a/abs/core/LinHES-system/myth_status.py +++ b/abs/core/LinHES-system/myth_status.py @@ -144,11 +144,12 @@ class tuner_recording_status: a=self.be.getRecorderList() for i in a: outline='' - cmd="select cardtype,hostname from capturecard where cardid=%s;" %i + cmd="select cardtype,hostname,displayname from capturecard where cardid=%s;" %i self.cursor.execute(cmd) results=self.cursor.fetchall() type = results[0][0] hostname = results[0][1] + displayname = results[0][2] id = i try: c=self.be.getCurrentRecording(i) @@ -156,10 +157,10 @@ class tuner_recording_status: current_recording = "Idle" else: current_recording = "Recording %s" %c.title - outline = " Tuner %s (%s) on %s : %s " %(id, type, hostname, current_recording) + outline = " Tuner %s - %s (%s) on %s : %s " %(id, displayname, type, hostname, current_recording) self.tuner_status_list.append(outline) except: - outline = " Tuner %s (%s) on %s : %s " %(id, type, hostname, "Tuner Error") + outline = " Tuner %s - %s (%s) on %s : %s " %(id, displayname, type, hostname, "Tuner Error") self.tuner_status_list.append(outline) def get_tuner_status(self): |