X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Futil.py;h=c8b7b2c0cbf42a16b28007f0ecae11f1095c269f;hb=3414365c207c42f3a2d26edac5b5a1d0bd782d7a;hp=09b9e36cd98ab3ff09f68835c7fe587909e6d5d8;hpb=241bc38a0e4d0a33cc885f318f0a5ef6f02c42f0;p=wrw.git

diff --git a/wrw/util.py b/wrw/util.py
index 09b9e36..c8b7b2c 100644
--- a/wrw/util.py
+++ b/wrw/util.py
@@ -1,10 +1,33 @@
-import req, dispatch, session
+import inspect
+from . import req, dispatch, session, form
 
 def wsgiwrap(callable):
     def wrapper(env, startreq):
         return dispatch.handle(req.origrequest(env), startreq, callable)
     return wrapper
 
+def stringwrap(charset):
+    def dec(callable):
+        def wrapper(*args, **kwargs):
+            bk = callable(*args, **kwargs)
+            for string in bk:
+                yield string.encode(charset)
+        return wrapper
+    return dec
+
+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):
@@ -19,3 +42,59 @@ def persession(data = None):
             return sess[callable].handle(req)
         return wrapper
     return dec
+
+class sessiondata(object):
+    @classmethod
+    def get(cls, req, create = True):
+        sess = cls.sessdb().get(req)
+        with sess.lock:
+            try:
+                return sess[cls]
+            except KeyError:
+                if not create:
+                    return None
+                ret = cls(req, sess)
+                sess[cls] = ret
+                return ret
+
+    @classmethod
+    def sessdb(cls):
+        return session.default.val
+
+class autodirty(sessiondata):
+    @classmethod
+    def get(cls, req):
+        ret = super().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().__setattr__(name, value)
+        if "_is_dirty" in self.__dict__:
+            self.__dict__["_is_dirty"] = True
+
+    def __delattr__(self, name):
+        super().__delattr__(name, value)
+        if "_is_dirty" in self.__dict__:
+            self.__dict__["_is_dirty"] = True
+
+class manudirty(object):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.__dirty = False
+
+    def sessfrozen(self):
+        self.__dirty = False
+
+    def sessdirty(self):
+        return self.__dirty
+
+    def dirty(self):
+        self.__dirty = True