diff -r 706972d09f05 -r e6bca452ce72 pvl/verkko/hosts.py
--- a/pvl/verkko/hosts.py Sat Jan 26 19:40:24 2013 +0200
+++ b/pvl/verkko/hosts.py Sat Jan 26 21:06:00 2013 +0200
@@ -1,4 +1,4 @@
-from pvl.verkko import web, db
+from pvl.verkko import web, db, table
from pvl.verkko.utils import parse_timedelta, IPv4Network
from pvl.web import html
@@ -143,92 +143,56 @@
))
## Controller
-def column (attr, title, column, rowhtml=None, sort=True, filter=True, colcss=True, rowfilter=True, rowtitle=None, rowcss=None) :
+class HostsTable (table.Table) :
"""
- web.Table column spec.
+ Table of hosts.
"""
- return (attr, title, column, sort, filter, colcss, rowhtml, rowfilter, rowtitle, rowcss)
-
-class BaseHandler (web.DatabaseHandler) :
- """
- Common controller stuff for DHCP hosts
- """
-
- CSS = (
- "/static/dhcp/hosts.css",
- )
- JS = (
- #"/static/jquery/jquery.js"
+ COLUMNS = (
+ table.Column('ip', "IP", Host.ip,
+ rowfilter = True,
+ ),
+ table.Column('mac', "MAC", Host.mac, Host.render_mac,
+ rowfilter = True,
+ ),
+ table.Column('name', "Hostname", Host.name, Host.render_name, ),
+ table.Column('gw', "Network", Host.gw, Host.network, ),
+ table.Column('seen', "Seen", Host.last_seen, Host.seen, ),
+ table.Column('state', "State", Host.count,
+ rowtitle = Host.state_title,
+ rowcss = Host.state_class,
+ ),
)
- TABLE = Host
- TABLE_COLUMNS = (
- #column('id', "#", Host.id ),
- column('ip', "IP", Host.ip, ),
- column('mac', "MAC", Host.mac, Host.render_mac),
- column('name', "Hostname", Host.name, Host.render_name, rowfilter=False),
- column('gw', "Network", Host.gw, Host.network, rowfilter=False),
- column('seen', "Seen", Host.last_seen, Host.seen, rowfilter=False),
- column('state', "State", Host.count, rowtitle=Host.state_title, rowcss=Host.state_class, rowfilter=False),
+ # XXX: have to set again
+ ATTRS = dict((col.attr, col) for col in COLUMNS)
+
+ # XXX: set later
+ TABLE_URL = ITEM_URL = None
+
+ # default
+ SORT = Host.last_seen.desc()
+ PAGE = 10
+
+class HostsHandler (table.TableHandler, web.DatabaseHandler) :
+ """
+ Combined database +
+ """
+
+ CSS = web.DatabaseHandler.CSS + table.TableHandler.CSS + (
+ "/static/dhcp/hosts.css",
)
- # attr -> column
- TABLE_ATTRS = dict((attr, column) for attr, title, column, sort, filter, colcss, rowhtml, rowfilter, rowtitle, rowcss in TABLE_COLUMNS)
-
- # default sort
- TABLE_SORT = Host.last_seen.desc()
-
- # items per page
- TABLE_PAGE = 10
-
- # target for items
- TABLE_URL = None
- TABLE_ITEM_URL = None
+ # model
+ TABLE = HostsTable
def query (self) :
"""
Database SELECT query.
"""
- return self.db.query(self.TABLE)
-
- def sort (self, query, default=TABLE_SORT) :
- """
- Apply ?sort= from requset args to query.
-
- Return { attr: sort }, query
- """
-
- sort = self.request.args.get('sort')
-
- if sort :
- name = sort.lstrip('+-')
- else :
- name = None
+ return self.db.query(Host)
- if name :
- order_by = self.TABLE_ATTRS[name]
- else :
- order_by = default
-
- # prefix -> ordering
- if not sort :
- pass
- elif sort.startswith('+') :
- order_by = order_by.asc()
- elif sort.startswith('-') :
- order_by = order_by.desc()
- else :
- pass
-
- # apply
- log.debug("sort: %s", order_by)
-
- query = query.order_by(order_by)
-
- return sort, query
-
def filter_seen (self, value) :
"""
Return filter expression for given attr == value
@@ -269,325 +233,7 @@
def filter_mac (self, value) :
return self.filter_attr('mac', Host.normalize_mac(value))
- def filter_attr (self, attr, value) :
- """
- Return filter expression for given attr == value
- """
-
- # preprocess
- like = False
-
- if value.endswith('*') :
- like = value.replace('*', '%')
-
- # filter
- column = self.TABLE_ATTRS[attr]
-
- if like :
- return (column.like(like))
- else :
- return (column == value)
-
- def _filter (self, attr, values) :
- """
- Apply filters for given attr -> (value, expression)
- """
-
- for value in values :
- value = value.strip()
-
- # ignore empty fields
- if not value :
- continue
-
- # lookup attr-specific filter
- filter = getattr(self, 'filter_{attr}'.format(attr=attr), None)
-
- if filter :
- filter = filter(value)
- else :
- # use generic
- filter = self.filter_attr(attr, value)
-
- log.debug("%s: %s: %s", attr, value, filter)
-
- yield value, filter
-
- def filter (self, query) :
- """
- Apply filters from request.args against given hosts.
-
- Returns (filters, hosts).
- """
-
- # filter?
- filters = {}
-
- for attr in self.TABLE_ATTRS :
- # from request args
- values = self.request.args.getlist(attr)
-
- # lookup attr filters as expressions
- value_filters = list(self._filter(attr, values))
-
- # ignore empty fields
- if not value_filters :
- continue
-
- # filtering values, and filter expressions
- values, expressions = zip(*value_filters)
-
- # apply
- query = query.filter(db.or_(*expressions))
- filters[attr] = values
-
- return filters, query
-
- def filters_title (self) :
- """
- Return a string representing the applied filters.
- """
-
- return ', '.join(value for values in self.filters.itervalues() for value in values)
-
- def render_table (self, query, caption=None, sort=None, filters=None, page=None, hilight=None) :
- """
- Return