From 4e0ed14b738b9989d4360be63f472323cfda3305 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Wed, 16 Jan 2013 12:54:45 -0600
Subject: linhes-config:  list the ip of network tuners, and provide a link on
 the supplemental webpage

refs #898
---
 abs/core/LinHES-config/PKGBUILD                    |  4 ++--
 abs/core/LinHES-config/autocard.py                 | 15 ++++++++++++---
 abs/core/supplemental-web/PKGBUILD                 |  2 +-
 abs/core/supplemental-web/contents/list_cardmap.py |  8 ++++++++
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index f4ab4d0..2c4999c 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-config
 pkgver=2.3
-pkgrel=207
+pkgrel=208
 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
 pkgdesc="Install and configure your system"
 depends=('bc' 'libstatgrab'  'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
@@ -150,7 +150,7 @@ md5sums=('32fc2b52809231d75a72492b91eeed74'
          'ab2aa42c2947148c2b1cac0ade6d1d55'
          'd429b59d3cfb37b0624c6a4a71a7c2c0'
          'f6a935c35123fdc7c259c01cbc794a64'
-         'd36d2e1a363e94bb8ba1e724c8d982fc'
+         'cd03c0f179f756665ff7750e234ac02a'
          'd3490e93f313bbbcbc6c3693c56b9c17'
          '3d1e4a119f38cff0498bf8a67e94e4b3'
          '71fd2d0d448fc2fcd15415a1beed7109'
diff --git a/abs/core/LinHES-config/autocard.py b/abs/core/LinHES-config/autocard.py
index 3d11fe0..8b70465 100644
--- a/abs/core/LinHES-config/autocard.py
+++ b/abs/core/LinHES-config/autocard.py
@@ -317,10 +317,12 @@ class v4l_tuners():
     def get_static_device(self):
         return self.staticdevice
 
+
 #-----
 class hdhr_tuners():
-    def __init__(self, device):
+    def __init__(self, device,ip):
         self.device = device
+        self.ip = ip
         self.description = self.find_description()
         self.staticdevice = device
 
@@ -369,6 +371,7 @@ class hdhr_tuners():
         #only used by dvb, but here to be complete
         self.tuner_index = index
 
+
     def get_dev_node(self):
         return self.device
 
@@ -376,7 +379,8 @@ class hdhr_tuners():
         return "hdhr"
 
     def get_description(self):
-        return self.description
+        desc = "%s -  %s"  %(self.description,self.ip)
+        return desc
 
     def get_udev_rule(self):
         return
@@ -386,6 +390,10 @@ class hdhr_tuners():
 
     def get_static_device(self):
         return self.staticdevice
+
+
+
+
 #-----
 
 class dvb_tuners():
@@ -589,9 +597,10 @@ def gather_hdhr(tuner_list):
         else:
             for line in lines:
                 hdhrdevice=line.strip().split()[2]
+                hdhrip = line.strip().split()[5]
                 tuners = find_hdhr_tuner(hdhrdevice)
                 for t in tuners:
-                    tuner_list.append(hdhr_tuners(t))
+                    tuner_list.append(hdhr_tuners(t,hdhrip))
     except:
         print "Error finding HDHOMERUN"
     return tuner_list
diff --git a/abs/core/supplemental-web/PKGBUILD b/abs/core/supplemental-web/PKGBUILD
index 4d8d984..3cd3196 100644
--- a/abs/core/supplemental-web/PKGBUILD
+++ b/abs/core/supplemental-web/PKGBUILD
@@ -1,7 +1,7 @@
 pkgbase=supplemental-web
 pkgname=('supplemental-web' 'supplemental-web-slave')
 pkgver=1.0
-pkgrel=40
+pkgrel=41
 arch=('i686' 'x86_64')
 
 backup=('extra.cfg.txt')
diff --git a/abs/core/supplemental-web/contents/list_cardmap.py b/abs/core/supplemental-web/contents/list_cardmap.py
index 0c28e0e..16349b7 100755
--- a/abs/core/supplemental-web/contents/list_cardmap.py
+++ b/abs/core/supplemental-web/contents/list_cardmap.py
@@ -98,13 +98,21 @@ print '''
 '''
 
 for statictuner in mbelist:
+    hdhr_url = None
     if statictuner[1].find("notfound") > -1 :
         print "Couldn't open tuner map"
         print "</br>"
     else:
+        if statictuner[0] == "hdhr":
+            hdhr_url = statictuner[1].split("-")[-1]
+
         print "<li> %s&nbsp;&nbsp;&nbsp%s" %(statictuner[1] ,statictuner[0])
         print "</br>"
         print "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;static device node: %s"  %statictuner[2]
+
+        if hdhr_url:
+            print "</br>"
+            print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;device webpage: <a href="http://%s">http://%s</a> '  %(hdhr_url.strip(),hdhr_url.strip())
         print "</br>"
         print "</br>"
 
-- 
cgit v0.12