Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

This commit is contained in:
Stephan Raue 2013-07-17 14:40:24 +02:00
commit d53501b3bc
3 changed files with 12 additions and 1 deletions

View File

@ -1,3 +1,5 @@
3.1.3
fixed parsing dvbhdhomerun.log file with timestamp
3.1.2
new addon settings option to enable suspend/resume driver actions
new addon settings option to enable logging

View File

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

View File

@ -49,6 +49,11 @@ def get_devices_hdhomerun(hdhomerun_log):
try:
for line in open(hdhomerun_log, 'r'):
line = line.strip()
# 'Tue Jul 16 21:26:31 2013 Registered tuner, id from kernel: 0 name: 12345678-0'
if not line.startswith('Registered tuner'):
line = line[25:]
# 'Registered tuner, id from kernel: 0 name: 12345678-0'
if line.startswith('Registered tuner'):
name = line.split(':');
name = name[2].strip()
@ -63,6 +68,10 @@ Registered tuner, id from kernel: 0 name: 101ADD2B-0
Registered tuner, id from kernel: 1 name: 101ADD2B-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
"""
######################################################################################################