Make the cached() decorator take into account all arguments

[software/blitiri.git] / blitiri.cgi

diff --git a/blitiri.cgi b/blitiri.cgi
index fdefadbdcbd9fe6d9827ea5f5f81bb97ecbc5513..347d27a86eebcbd933a1e4cde226cf967be55a93 100755 (executable)
--- a/blitiri.cgi
+++ b/blitiri.cgi
@@ -24,9 +24,11 @@ comments_path = "/tmp/blog/comments"
 # default templates. If they're not found, the built-in ones will be used.
 templates_path = "/tmp/blog/templates"
 
-# Path where the cache is stored (must be writeable by the web server)
-# If None is specified, cache is disabled
-cache_path = "/tmp/blog/cache"
+# Path where the cache is stored (must be writeable by the web server);
+# set to None to disable. When enabled, you must take care of cleaning it up
+# every once in a while.
+#cache_path = "/tmp/blog/cache"
+cache_path = None
 
 # URL to the blog, including the name. Can be a full URL or just the path.
 blog_url = "/blog/blitiri.cgi"
@@ -408,22 +410,30 @@ div.section h1 {
 
 """
 
+
 # Cache decorator
+# It only works if the function is pure (that is, its return value depends
+# only on its arguments), and if all the arguments are hash()eable.
 def cached(f):
-       def decorate(obj, *args, **kwargs):
-               if cache_path is None: # cache disabled
-                       s = f(obj, *args, **kwargs)
-               else:
-                       cache_file = os.path.join(cache_path,
-                                       'blitiri.cache.%s.html' % hash(obj))
-                       try:
-                               s = open(cache_file).read()
-                       except:
-                               s = f(obj, *args, **kwargs)
-                               open(cache_file, 'w').write(s)
+       # do not decorate if the cache is disabled
+       if cache_path is None:
+               return f
+
+       def decorate(*args, **kwargs):
+               hashes = '-'.join( str(hash(x)) for x in args +
+                               tuple(kwargs.items()) )
+               fname = 'blitiri.%s.%s.cache' % (f.__name__, hashes)
+               cache_file = os.path.join(cache_path, fname)
+               try:
+                       s = open(cache_file).read()
+               except:
+                       s = f(*args, **kwargs)
+                       open(cache_file, 'w').write(s)
                return s
+
        return decorate
 
+
 # helper functions
 def rst_to_html(rst, secure = True):
        settings = {
@@ -1177,7 +1187,8 @@ def handle_cgi():
                                at = ''
                                if line:
                                        at = ' at line %d' % line
-                               form_data.body_error = 'error%s: %s' % (at, desc)
+                               form_data.body_error = 'error%s: %s' \
+                                               % (at, desc)
                                valid = False
                if valid:
                        c = article.add_comment(form_data.author,