jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-28 13:16:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

hdhomerun: get tuner id from /var/log/messages instead of /var/log/dvbhdhomerun.log

Browse Source 
logging is disabled by default
This commit is contained in:
vpeter4 2013-07-18 08:50:21 +02:00
parent 3d3b39378c
commit e9360ffd63
3 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/addons/driver/hdhomerun/changelog.txt
View File

@ -1,3 +1,5 @@
3.1.4
get tuner id from /var/log/messages
3.1.3 3.1.3
fixed parsing dvbhdhomerun.log file with timestamp fixed parsing dvbhdhomerun.log file with timestamp
3.1.2 3.1.2

2
packages/addons/driver/hdhomerun/meta
View File

@ -20,7 +20,7 @@
PKG_NAME="hdhomerun" PKG_NAME="hdhomerun"
PKG_VERSION="3.2" PKG_VERSION="3.2"
PKG_REV="3" PKG_REV="4"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"
PKG_SITE="http://www.silicondust.com/products/hdhomerun/dvbt/" PKG_SITE="http://www.silicondust.com/products/hdhomerun/dvbt/"

31
packages/addons/driver/hdhomerun/source/resources/lib/functions.py
View File

@ -20,6 +20,8 @@
import os import os
import sys import sys
import re
import subprocess
import shutil import shutil
import xmlpp import xmlpp
from xml.dom import minidom from xml.dom import minidom
@ -47,31 +49,22 @@ def settings_restore(settings_xml):
def get_devices_hdhomerun(hdhomerun_log): def get_devices_hdhomerun(hdhomerun_log):
tuners = [] tuners = []
try: try:
for line in open(hdhomerun_log, 'r'): for line in open('/var/log/messages', 'r'):
if line.find('HDHomeRun'):
line = line.strip() line = line.strip()
# 'Tue Jul 16 21:26:31 2013 Registered tuner, id from kernel: 0 name: 12345678-0' #Jul 17 19:22:46 user user.info kernel: [ 10.587811] HDHomeRun HDHomeRun.0: DVB: registering adapter 0 frontend 0 (HDHomeRun DVB-C 12345678-0)...
if not line.startswith('Registered tuner'): match = re.search(r'.*\[.+\] HDHomeRun .+ registering adapter .+ \(HDHomeRun .+ (.+)\).+', line)
line = line[25:] if match:
name = match.group(1)
# 'Registered tuner, id from kernel: 0 name: 12345678-0'
if line.startswith('Registered tuner'):
name = line.split(':');
name = name[2].strip()
tuners.append(name) tuners.append(name)
except IOError: except IOError:
print 'Error reading hdhomerun log file', hdhomerun_log print 'Error reading hdhomerun log file /var/log/messages'
return tuners return tuners
""" """
root ~ # grep "Registered tuner" /var/log/dvbhdhomerun.log root ~ # grep HDHomeRun /var/log/messages
Registered tuner, id from kernel: 0 name: 101ADD2B-0 Jul 17 19:22:46 user user.info kernel: [ 10.587811] HDHomeRun HDHomeRun.0: DVB: registering adapter 0 frontend 0 (HDHomeRun DVB-C 12345678-0)...
Registered tuner, id from kernel: 1 name: 101ADD2B-1 Jul 17 19:22:46 user user.info kernel: [ 10.588602] HDHomeRun HDHomeRun.1: DVB: registering adapter 1 frontend 0 (HDHomeRun DVB-C 12345678-1)...
Registered tuner, id from kernel: 2 name: 1031D75A-0
Registered tuner, id from kernel: 3 name: 1031D75A-1
root ~ # grep "Registered tuner" /var/log/dvbhdhomerun.log
Tue Jul 16 21:26:31 2013 Registered tuner, id from kernel: 0 name: 12345678-0
Tue Jul 16 21:26:31 2013 Registered tuner, id from kernel: 1 name: 12345678-1
""" """
###################################################################################################### ######################################################################################################