Make the cached() decorator take into account all arguments

[software/blitiri.git] / blitiri.cgi

diff --git a/blitiri.cgi b/blitiri.cgi
index c54480ce57c730998cad5843cfbef218706526dd..347d27a86eebcbd933a1e4cde226cf967be55a93 100755 (executable)
--- a/blitiri.cgi
+++ b/blitiri.cgi
@@ -24,6 +24,12 @@ comments_path = "/tmp/blog/comments"
 # default templates. If they're not found, the built-in ones will be used.
 templates_path = "/tmp/blog/templates"
 
 # 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);
+# 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"
 
 # URL to the blog, including the name. Can be a full URL or just the path.
 blog_url = "/blog/blitiri.cgi"
 


@@ -404,26 +410,53 @@ 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):
+       # 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
 # helper functions

-def rst_to_html(rst):
+def rst_to_html(rst, secure = True):

        settings = {
                'input_encoding': encoding,
                'output_encoding': 'utf8',
                'halt_level': 1,
                'traceback':  1,
        settings = {
                'input_encoding': encoding,
                'output_encoding': 'utf8',
                'halt_level': 1,
                'traceback':  1,

+               'file_insertion_enabled': secure,
+               'raw_enabled': secure,

        }
        parts = publish_parts(rst, settings_overrides = settings,
                                writer_name = "html")
        return parts['body'].encode('utf8')
        }
        parts = publish_parts(rst, settings_overrides = settings,
                                writer_name = "html")
        return parts['body'].encode('utf8')

+rst_to_html = cached(rst_to_html)

 
 

-def validate_rst(rst):
+def validate_rst(rst, secure = True):

        try:
        try:

-               rst_to_html(rst)
+               rst_to_html(rst, secure)

                return None
        except SystemMessage, e:
                desc = e.args[0].encode('utf-8') # the error string
                desc = desc[9:] # remove "<string>:"
                return None
        except SystemMessage, e:
                desc = e.args[0].encode('utf-8') # the error string
                desc = desc[9:] # remove "<string>:"

-               line = int(desc[:desc.find(':')]) # get just the line number
+               line = int(desc[:desc.find(':')] or 0) # get the line number

                desc = desc[desc.find(')')+2:-1] # remove (LEVEL/N)
                try:
                        desc, context = desc.split('\n', 1)
                desc = desc[desc.find(')')+2:-1] # remove (LEVEL/N)
                try:
                        desc, context = desc.split('\n', 1)


@@ -1054,6 +1087,7 @@ def handle_cgi():
        atom = False
        style = False
        post = False
        atom = False
        style = False
        post = False

+       post_preview = False

        artlist = False
        comment = False
 
        artlist = False
        comment = False
 


@@ -1063,10 +1097,11 @@ def handle_cgi():
                atom = path_info == '/atom'
                tag = path_info.startswith('/tag/')
                post = path_info.startswith('/post/')
                atom = path_info == '/atom'
                tag = path_info.startswith('/tag/')
                post = path_info.startswith('/post/')

+               post_preview = path_info.startswith('/preview/post/')

                artlist = path_info.startswith('/list')
                comment = path_info.startswith('/comment/') and enable_comments
                artlist = path_info.startswith('/list')
                comment = path_info.startswith('/comment/') and enable_comments

-               if not style and not atom and not post and not tag \
-                               and not comment and not artlist:
+               if not style and not atom and not post and not post_preview \
+                               and not tag and not comment and not artlist:

                        date = path_info.split('/')[1:]
                        try:
                                if len(date) > 1 and date[0]:
                        date = path_info.split('/')[1:]
                        try:
                                if len(date) > 1 and date[0]:


@@ -1080,6 +1115,15 @@ def handle_cgi():
                elif post:
                        uuid = path_info.replace('/post/', '')
                        uuid = uuid.replace('/', '')
                elif post:
                        uuid = path_info.replace('/post/', '')
                        uuid = uuid.replace('/', '')

+               elif post_preview:
+                       art_path = path_info.replace('/preview/post/', '')
+                       art_path = urllib.unquote_plus(art_path)
+                       art_path = os.path.join(data_path, art_path)
+                       art_path = os.path.realpath(art_path)
+                       common = os.path.commonprefix([data_path, art_path])
+                       if common != data_path: # something nasty happened
+                               post_preview = False
+                       art_path = art_path[len(data_path)+1:]

                elif tag:
                        t = path_info.replace('/tag/', '')
                        t = t.replace('/', '')
                elif tag:
                        t = path_info.replace('/tag/', '')
                        t = t.replace('/', '')


@@ -1103,6 +1147,10 @@ def handle_cgi():
                render_style()
        elif post:
                render_html( [db.get_article(uuid)], db, year, enable_comments )
                render_style()
        elif post:
                render_html( [db.get_article(uuid)], db, year, enable_comments )

+       elif post_preview:
+               article = Article(art_path, datetime.datetime.now(),
+                                       datetime.datetime.now())
+               render_html( [article], db, year, enable_comments )

        elif artlist:
                articles = db.get_articles()
                articles.sort(cmp = Article.title_cmp)
        elif artlist:
                articles = db.get_articles()
                articles.sort(cmp = Article.title_cmp)


@@ -1133,11 +1181,14 @@ def handle_cgi():
                        form_data.body_error = 'please, write a comment'
                        valid = False
                else:
                        form_data.body_error = 'please, write a comment'
                        valid = False
                else:

-                       error = validate_rst(form_data.body)
+                       error = validate_rst(form_data.body, secure=False)

                        if error is not None:
                                (line, desc, ctx) = error
                        if error is not None:
                                (line, desc, ctx) = error

-                               form_data.body_error = 'error at line %d: %s' \
-                                               % (line, desc)
+                               at = ''
+                               if line:
+                                       at = ' at line %d' % line
+                               form_data.body_error = 'error%s: %s' \
+                                               % (at, desc)

                                valid = False
                if valid:
                        c = article.add_comment(form_data.author,
                                valid = False
                if valid:
                        c = article.add_comment(form_data.author,


@@ -1232,7 +1283,10 @@ def handle_cmd():
 
 
 if os.environ.has_key('GATEWAY_INTERFACE'):
 
 
 if os.environ.has_key('GATEWAY_INTERFACE'):

+       i = datetime.datetime.now()

        handle_cgi()
        handle_cgi()

+       f = datetime.datetime.now()
+       print '<!-- render time: %s -->' % (f-i)

 else:
        sys.exit(handle_cmd())
 
 else:
        sys.exit(handle_cmd())