Rewrite markdown-plugin as a cb_story plugin.

[pyblosxom-markdown2] / markdown-plugin.py

diff --git a/markdown-plugin.py b/markdown-plugin.py
index a7c3b95407670676871188eb8d5ac07edcff7681..8a262b051b86cb586a0ead05b936a32a6f176256 100644 (file)
--- a/markdown-plugin.py
+++ b/markdown-plugin.py
@@ -1,25 +1,26 @@
 #!/usr/bin/env python
 """
-markdown-plugin.py -- A Python-Markdown v2.x plugin for PyBlosxom.
+markdown-plugin.py -- A Python Markdown v2.x plugin for PyBlosxom.
 
-This plugin requires Python-Markdown v2.x, which you can download from:
+This plugin requires Python Markdown v2.x, which you can download from:
 
        http://www.freewisdom.org/projects/python-markdown/
 
-Extract python-markdown into your pyblosxom plugins dir alongside this
-plugin. Your plugins dir should look like this:
+Extract the 'markdown' directory from the Python Markdown tarball (the
+directory containing __init__.py, not the Markdown-2.x.y directory)  into your
+pyblosxom plugins dir alongside this plugin. Your plugins dir should look like
+this:
 
        plugins/ <-- your pyblosxom plugins dir
                markdown-plugin.py <-- this file
-               markdown.py <-- the python-markdown command line script
-               markdown/ <-- directory containing python-markdown's files
+               markdown/ <-- the Python Markdown module
                ... <-- (any other pyblosxom plugins)
 
-Now any posts with filenames ending in `.mkdn` will be passed through
-python-markdown.
+Now any posts with filenames ending in one of the FILENAME_EXTENSIONS defined
+below will be passed through python-markdown.
 
 Copyright (C) Benjamin Mako Hill, 2005
-Updated for python-markdown 2 by seanh 2009
+Updated for Python Markdown 2 by seanh 2009
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -37,60 +38,20 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 USA.
 
 """
-PREFORMATTER_ID = 'markdown'
-FILENAME_EXTENSIONS = ('txt','text','mkdn','markdown','md','mdown','markdn','mkd')
-_version__ = '0.2'
+_version__ = '0.3'
 __author__ = 'Benjamin Mako Hill <mako@atdot.cc>'
-__author__ = 'seanh'
+__author__ = 'seanh <snhmnd@gmail.com>'
+
+FILENAME_EXTENSIONS = ('.txt','.text','.mkdn','.markdown','.md','.mdown','.markdn','.mkd')
 
-import re,codecs
 import markdown
-from Pyblosxom import tools
+import os
 
-md = markdown.Markdown(
-       #safe_mode=True,
-       output_format='html4',
-       extensions=[ 'codehilite', # Requires python-pygments
-                                'extra', # Abbreviations, definition lists, fenced code blocks,
-                                                 # footnotes, headerid and tables.
-                                #'html_tidy', # Enable this if you have libtidy and uTidylib
-                                #'imagelinks', # Broken?
-                                #'meta',
-                                #'rss',
-                                'toc',
-                                #'wikilinks'
-                          ]
-)
+md = markdown.Markdown(output_format='html4',extensions=['extra',])
 
-def cb_entryparser(args):
-       for FILENAME_EXTENSION in FILENAME_EXTENSIONS:
-               args[FILENAME_EXTENSION] = readfile
+def cb_story(args):
+       entry = args['entry']
+       if os.path.splitext(entry['filename'])[1] in FILENAME_EXTENSIONS:
+               entry['body'] = md.convert(''.join(entry['body']))
+               md.reset()
        return args
-
-def cb_preformat(args):
-       if args['parser'] == PREFORMATTER_ID:
-               return parse(''.join(args['story']))
-
-def parse(story):
-       # Convert the ASCII text to HTML with python-markdown.
-       html = md.convert(story)
-       # Reset python-markdown ready for next time.
-       md.reset()
-       return html
-
-def readfile(filename, request):
-       entryData = {}
-       lines = codecs.open(filename, mode="r", encoding="utf8").readlines()
-       title = lines.pop(0).strip()
-       while lines and lines[0].startswith("#"):
-               meta = lines.pop(0)
-               meta = meta[1:].strip()
-               meta = meta.split(" ", 1)
-               entryData[meta[0].strip()] = meta[1].strip()
-       entryData['title'] = title
-       entryData['body'] = parse(''.join(lines))
-       # Call the postformat callbacks
-       tools.run_callback('postformat',
-                       {'request': request,
-                        'entry_data': entryData})
-       return entryData