From 8535c8a04075454c676a548dbec40673b0ad62e0 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Fri, 4 Jan 2013 20:40:34 -0600 Subject: supplemental-web: Two major additions here. 1) introduce the static dev node mapping as produced by autocard. Currently located under system->List static dev nodes for tuners. This link will pull in mappings from the MBE and all SLAVE boxes. The query will pull the data from the host each time it's requested, so the slave machines must be on to see the mapping. The data is pulled over http from the slave box by calling cardlist.cgi, which will read in /etc/udev/mv-persisten-video.description. 2) Add the ability to upload and download system backup files from the MBE. Also reworked the css to make it a tad prettier. refs #893 refs #892 --- abs/core/supplemental-web/PKGBUILD | 4 +- abs/core/supplemental-web/cgi/cardlist.cgi | 16 +++ abs/core/supplemental-web/contents/cardmap.shtml | 11 ++ abs/core/supplemental-web/contents/frame.css | 20 +++- abs/core/supplemental-web/contents/header.html | 1 + abs/core/supplemental-web/contents/list_cardmap.py | 132 +++++++++++++++++++++ abs/core/supplemental-web/contents/process.py | 124 +++++++++++++++---- abs/core/supplemental-web/supplemental-web.install | 1 + abs/core/supplemental-web/supplemental_web.rules | 1 + 9 files changed, 283 insertions(+), 27 deletions(-) create mode 100755 abs/core/supplemental-web/cgi/cardlist.cgi create mode 100755 abs/core/supplemental-web/contents/cardmap.shtml create mode 100755 abs/core/supplemental-web/contents/list_cardmap.py diff --git a/abs/core/supplemental-web/PKGBUILD b/abs/core/supplemental-web/PKGBUILD index d3f82d7..257abdd 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=36 +pkgrel=39 arch=('i686' 'x86_64') backup=('extra.cfg.txt') @@ -79,4 +79,4 @@ md5sums=('521714803b5a3df529f0fc5f853c0d55' '26598fd1dfaf5d36d7b1f9620da5543c' 'fabf825ca07502db40d78f0aae15f90b' 'b41eeb0f0aa67ea06aedff61e53fa774' - 'c90d7a015783316af2256a37bece62ce') + 'd7be6bc265b2b9e775b090b6ac2448da') diff --git a/abs/core/supplemental-web/cgi/cardlist.cgi b/abs/core/supplemental-web/cgi/cardlist.cgi new file mode 100755 index 0000000..5ba7343 --- /dev/null +++ b/abs/core/supplemental-web/cgi/cardlist.cgi @@ -0,0 +1,16 @@ +#!/usr/bin/env python2 +print "Content-type: text/html" +print +exportfile = '/etc/udev/mv-persistent-video.description' +try: + f = open(exportfile,"r") + for line in f.readlines(): + if line.startswith("#"): + continue + item = line.split(":") + if len(item) <= 1 : + continue + print line +except : + print "" + print "Couldn't read static tuner map" diff --git a/abs/core/supplemental-web/contents/cardmap.shtml b/abs/core/supplemental-web/contents/cardmap.shtml new file mode 100755 index 0000000..89013c0 --- /dev/null +++ b/abs/core/supplemental-web/contents/cardmap.shtml @@ -0,0 +1,11 @@ + + + + + +

List of detected cards and static device path.

+
+ + + + diff --git a/abs/core/supplemental-web/contents/frame.css b/abs/core/supplemental-web/contents/frame.css index eb6db98..42877dd 100644 --- a/abs/core/supplemental-web/contents/frame.css +++ b/abs/core/supplemental-web/contents/frame.css @@ -22,7 +22,7 @@ body { //-o-background-size: 1000px 10000px; //-moz-background-size: 1000px 10000px, 500px, 500px; //-webkit-background-size: 1000px 10000px, 500px 500px; - + margin: 10; margin-left:40px; padding: 10; @@ -55,11 +55,29 @@ body { /*background: #D9D9D9;*/ margin-left:60px; } + #column { float: right; /* Our column is going to be right aligned */ width: 320px; /* Our total width - content width is 260px */ /*background: #8A8AE6;*/ } + +#resultbox { + width: 700px ; + margin-left: auto ; + margin-right: auto ; + border-width: .2em; + border-style: dotted; + border-color: #900; + text-align: left; + padding-left: 30; + padding-right: 30; + padding-top: 10; + padding-bottom: 10; + +} + + #footer { clear: both; /* We have to clear our floats */ width: 760px; /* We need to set the width on the footer since it's outside the mainContainer, and therefor isn't controlled by it */ diff --git a/abs/core/supplemental-web/contents/header.html b/abs/core/supplemental-web/contents/header.html index a75d57c..e08cbda 100644 --- a/abs/core/supplemental-web/contents/header.html +++ b/abs/core/supplemental-web/contents/header.html @@ -40,6 +40,7 @@ function remyth()
  • System »