X-Git-Url: https://projects.mako.cc/source/pyblosxom-markdown2/blobdiff_plain/eda9dfa5fda0ddc342099b8178b259d75f642ac7..HEAD:/markdown-plugin.py

diff --git a/markdown-plugin.py b/markdown-plugin.py
index 6b03ed9..ba46a65 100644
--- a/markdown-plugin.py
+++ b/markdown-plugin.py
@@ -1,105 +1,47 @@
 #!/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/
+	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
-        ... <-- (any other pyblosxom plugins)
+	plugins/ <-- your pyblosxom plugins dir
+		markdown-plugin.py <-- this file
+		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
+Copyright (C) 2005, 2011 Benjamin Mako Hill
+Copyright (c) 2009, 2010, seanh
 
-This program is free software; you can redistribute it and/or modify
+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
-the Free Software Foundation; either version 2 of the License, or (at
-your option) any later versi
-
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-USA.
+the Free Software Foundation, either version 3 of the License, or (at
+your option) any later version.
 
 """
-PREFORMATTER_ID = 'markdown'
-FILE_EXT = 'mkdn'
-_version__ = '0.2'
+_version__ = '0.3'
 __author__ = 'Benjamin Mako Hill <mako@atdot.cc>'
-__author__ = 'seanh'
-
-import re,codecs
-import markdown
-from Pyblosxom import tools
+__author__ = 'seanh <snhmnd@gmail.com>'
 
-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'
-               ]
-)
+FILENAME_EXTENSIONS = ('.mdwn', '.txt','.text','.mkdn','.markdown','.md','.mdown','.markdn','.mkd')
 
-def cb_entryparser(args):
-    args[FILE_EXT] = readfile
-    return args
-
-def cb_preformat(args):
-    if args['parser'] == PREFORMATTER_ID:
-        return parse(''.join(args['story']))
-
-def to_ascii(char):
-    """Return char if char is an ASCII character, '?' otherwise."""
-    if ord(char) < 128:
-        return char
-    else:
-        return '?'
+import markdown
+import os
 
-def parse(story):
-    # Replace any non-ascii characters in the story with '?', so that
-    # python-markdown doesn't crash.
-    ascii = "".join([to_ascii(x) for x in story])
-    # Convert the ASCII text to HTML with python-markdown.
-    html = md.convert(ascii)
-    # Reset python-markdown ready for next time.
-    md.reset()
-    return html
+md = markdown.Markdown(output_format='html4',extensions=['extra',])
 
-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
+def cb_story(args):
+	entry = args['entry']
+	if os.path.splitext(entry['filename'])[1] in FILENAME_EXTENSIONS:
+		entry['body'] = md.convert(u''.join(entry['body'].decode("utf-8")))
+		md.reset()
+	return args