X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Futil.py;h=7a29ea8c20571bf0543a17af9f0e57be5554ddeb;hb=bbdebbab6c98d8611bc8faa197df226d29e4cb2b;hp=22131eae2b60208cefe2e591897a5a87931d0ceb;hpb=b409a33843abb3221edd27016558c39cf33a6510;p=wrw.git

diff --git a/wrw/util.py b/wrw/util.py
index 22131ea..7a29ea8 100644
--- a/wrw/util.py
+++ b/wrw/util.py
@@ -1,6 +1,89 @@
-import req, dispatch
+import inspect
+import req, dispatch, session, form
 
 def wsgiwrap(callable):
     def wrapper(env, startreq):
-        return dispatch.handle(req.request(env), startreq, callable)
+        return dispatch.handle(req.origrequest(env), startreq, callable)
     return wrapper
+
+def formparams(callable):
+    def wrapper(req):
+        data = form.formdata(req)
+        spec = inspect.getargspec(callable)
+        args = dict(data.items())
+        args["req"] = req
+        if not spec.keywords:
+            for arg in list(args):
+                if arg not in spec.args:
+                    del args[arg]
+        return callable(**args)
+    return wrapper
+
+def persession(data = None):
+    def dec(callable):
+        def wrapper(req):
+            sess = session.get(req)
+            if callable not in sess:
+                if data is None:
+                    sess[callable] = callable()
+                else:
+                    if data not in sess:
+                        sess[data] = data()
+                    sess[callable] = callable(data)
+            return sess[callable].handle(req)
+        return wrapper
+    return dec
+
+class sessiondata(object):
+    @classmethod
+    def get(cls, req):
+        sess = cls.sessdb().get(req)
+        with sess.lock:
+            try:
+                return sess[cls]
+            except KeyError:
+                ret = cls(req)
+                sess[cls] = ret
+                return ret
+
+    @classmethod
+    def sessdb(cls):
+        return session.default
+
+class autodirty(sessiondata):
+    @classmethod
+    def get(cls, req):
+        ret = super(autodirty, cls).get(req)
+        if "_is_dirty" not in ret.__dict__:
+            ret.__dict__["_is_dirty"] = False
+        return ret
+
+    def sessfrozen(self):
+        self.__dict__["_is_dirty"] = False
+
+    def sessdirty(self):
+        return self._is_dirty
+
+    def __setattr__(self, name, value):
+        super(autodirty, self).__setattr__(name, value)
+        if "_is_dirty" in self.__dict__:
+            self.__dict__["_is_dirty"] = True
+
+    def __delattr__(self, name):
+        super(autodirty, self).__delattr__(name, value)
+        if "_is_dirty" in self.__dict__:
+            self.__dict__["_is_dirty"] = True
+
+class manudirty(object):
+    def __init__(self, *args, **kwargs):
+        super(manudirty, self).__init__(*args, **kwargs)
+        self.__dirty = False
+
+    def sessfrozen(self):
+        self.__dirty = False
+
+    def sessdirty(self):
+        return self.__dirty
+
+    def dirty(self):
+        self.__dirty = True