Put validation behind more abstraction.

[invirt/packages/invirt-web.git] / code / webcommon.py

diff --git a/code/webcommon.py b/code/webcommon.py
index 4b58e6b..5911787 100644 (file)
--- a/code/webcommon.py
+++ b/code/webcommon.py
@@ -1,5 +1,6 @@
 """Exceptions for the web interface."""
 
+import time
 from sipb_xen_database import Machine, MachineAccess
 
 class MyException(Exception):
@@ -35,16 +36,18 @@ def cachedproperty(func):
             return value
     return property(getter)
 
-class Global(object):
-    """Global state of the system, to avoid duplicate remctls to get state"""
+class State(object):
+    """State for a request"""
     def __init__(self, user):
-        self.user = user
-    
-    machines = cachedproperty(lambda self: 
-                             [ma.machine for ma in 
-                              MachineAccess.select_by(user=self.user)])
-    uptimes = cachedproperty(lambda self: 
-                             controls.getUptimes(self.machines))
+        self.username = user
+
+    machines = cachedproperty(lambda self:
+                                  Machine.query().join('acl').select_by(user=self.username))
+    xmlist_raw = cachedproperty(lambda self: controls.getList())
+    xmlist = cachedproperty(lambda self:
+                                dict((m, self.xmlist_raw[m.name])
+                                     for m in self.machines
+                                     if m.name in self.xmlist_raw))
 
     def clear(self):
         """Clear the state so future accesses reload it."""
@@ -52,4 +55,4 @@ class Global(object):
             if attr.startswith('__cache_'):
                 delattr(self, attr)
 
-g = Global(None)
+state = State(None)