From 5211b30fbeab9533f21e3d320ca1d8494d50a86b Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 27 Jan 2013 14:43:45 -0600
Subject: LinHES-config, supplimental-web: Fix proxy numbering for Ceton
infiniTV
refs #899
---
abs/core/LinHES-config/PKGBUILD | 4 ++--
abs/core/LinHES-config/autocard.py | 14 +++++++++-----
abs/core/supplemental-web/PKGBUILD | 2 +-
abs/core/supplemental-web/contents/list_cardmap.py | 8 +++++++-
4 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index df3bbb6..e1e78cb 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=2.3
-pkgrel=211
+pkgrel=216
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'
@@ -152,7 +152,7 @@ md5sums=('32fc2b52809231d75a72492b91eeed74'
'ab2aa42c2947148c2b1cac0ade6d1d55'
'd429b59d3cfb37b0624c6a4a71a7c2c0'
'f6a935c35123fdc7c259c01cbc794a64'
- 'd318046ff657ddec6f701bb9f52e9cce'
+ '5e865cc04fe5de8a39d9c1e377fc4ebe'
'd3490e93f313bbbcbc6c3693c56b9c17'
'3d1e4a119f38cff0498bf8a67e94e4b3'
'71fd2d0d448fc2fcd15415a1beed7109'
diff --git a/abs/core/LinHES-config/autocard.py b/abs/core/LinHES-config/autocard.py
index 48b6e06..c461714 100644
--- a/abs/core/LinHES-config/autocard.py
+++ b/abs/core/LinHES-config/autocard.py
@@ -556,6 +556,7 @@ class dvb_tuners():
class infinitv_tuner():
def __init__(self, tuner_number,ip):
self.tuner_number = tuner_number
+ self.ceton_defined_tuner = tuner_number + 1
self.ip = ip
self.serial_num = self.find_serial()
self.connection = self.find_connection()
@@ -590,7 +591,7 @@ class infinitv_tuner():
def find_description(self):
desc="Ceton InfiniTV %s Tuner %s" %(self.connection,
- self.tuner_number)
+ self.ceton_defined_tuner)
return desc
def do_insert(self):
@@ -762,7 +763,7 @@ def gather_ceton(tuner_list):
for iface in ceton_network_list:
#command="cat /tmp/find_ceton.txt"
print "Scanning %s network for ceton infinitv" %iface
- command="/root/discover_infinitv.py %s" %iface
+ command="/usr/MythVantage/bin/discover_infinitv.py %s" %iface
results=os.popen(command,'r')
lines=results.readlines()
#try:
@@ -774,7 +775,7 @@ def gather_ceton(tuner_list):
#cetondevice = line.strip().split()[0]
cetonip = line.strip().split("/")[2]
- tuners = [1,2,3,4]
+ tuners = [0,1,2,3]
for t in tuners:
tuner_list.append(infinitv_tuner(t,cetonip))
#except:
@@ -1008,6 +1009,7 @@ def main(argv):
if "insertdb" in argv:
insertdb = True
udev = True
+ write_proxy = True
if "write_proxy" in argv:
write_proxy = True
@@ -1022,11 +1024,11 @@ def main(argv):
rule_list = []
#setting the proxy port for ceton webpage
- ceton_proxy = 0
+ ceton_proxy = 1
for i in tuner_list:
if i.get_card_type() == "infinitv":
- ceton_proxy = ceton_proxy + 1
i.set_proxy(ceton_proxy)
+ ceton_proxy = ceton_proxy + 1
#setting the hostname for each tuner
i.set_hostname(localhostname)
@@ -1050,6 +1052,8 @@ def main(argv):
restart_proxy=True
if restart_proxy == True:
+ command="add_service.sh cetonproxy"
+ os.system(command)
print" Restarting ceton proxy"
command="sv restart cetonproxy"
os.system(command)
diff --git a/abs/core/supplemental-web/PKGBUILD b/abs/core/supplemental-web/PKGBUILD
index e5c192f..bf0dd75 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=42
+pkgrel=43
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 cca2b8c..4e2c1a9 100755
--- a/abs/core/supplemental-web/contents/list_cardmap.py
+++ b/abs/core/supplemental-web/contents/list_cardmap.py
@@ -109,7 +109,13 @@ for statictuner in mbelist:
hdhr_url = statictuner[1].split("-")[-1]
elif statictuner[0] == "infinitv":
ceton_port = statictuner[3].strip()
- ceton_url = "http://%s:%s" %(hostname,ceton_port)
+ #Services/1/Status.html
+ #print statictuner
+ ceton_tuner=statictuner[2].strip()[-1]
+ ceton_tuner = int(ceton_tuner) + 1
+ ceton_url = "http://%s:%s/Services/%s/Status.html" %(hostname,
+ ceton_port,
+ ceton_tuner)
#print "<li> %s  %s" %(statictuner[1] ,statictuner[0])
print "<li> %s  " %(statictuner[1])
--
cgit v0.12