Very alpha bbcode support (markdown removed)

boards/mdx_neboard.py

@@ -1,8 +1,7 b''
 # coding=utf-8
 
-import markdown
-from markdown.inlinepatterns import Pattern
-from markdown.util import etree
+import re
+import bbcode
 
 import boards
 
@@ -10,13 +9,7 b' import boards'
 __author__ = 'neko259'
 
 
-AUTOLINK_PATTERN = r'(https?://\S+)'
-QUOTE_PATTERN = r'^(?<!>)(>[^>].*)$'
-REFLINK_PATTERN = r'((>>)(\d+))'
-SPOILER_PATTERN = r'%%([^(%%)]+)%%'
-COMMENT_PATTERN = r'^(//(.+))'
-STRIKETHROUGH_PATTERN = r'~(.+)~'
-DASH_PATTERN = r'--'
+REFLINK_PATTERN = re.compile(r'\d+')
 
 
 class TextFormatter():
@@ -38,7 +31,7 b' class TextFormatter():'
     format_right = ''
 
 
-class AutolinkPattern(Pattern):
+class AutolinkPattern():
     def handleMatch(self, m):
         link_element = etree.Element('a')
         href = m.group(2)
@@ -48,44 +41,22 b' class AutolinkPattern(Pattern):'
         return link_element
 
 
-class QuotePattern(Pattern, TextFormatter):
-    name = ''
-    preview_left = '<span class="quote">&gt; '
+class QuotePattern(TextFormatter):
+    name = 'q'
+    preview_left = '<span class="multiquote">'
     preview_right = '</span>'
 
-    format_left = '&gt;'
-
-    def handleMatch(self, m):
-        quote_element = etree.Element('span')
-        quote_element.set('class', 'quote')
-        quote_element.text = m.group(2)
-
-        return quote_element
+    format_left = '[quote]'
+    format_right = '[/quote]'
 
 
-class ReflinkPattern(Pattern):
-    def handleMatch(self, m):
-        post_id = m.group(4)
-
-        posts = boards.models.Post.objects.filter(id=post_id)
-        if posts.count() > 0:
-            ref_element = etree.Element('a')
-
-            post = posts[0]
-
-            ref_element.set('href', post.get_url())
-            ref_element.text = m.group(2)
-
-            return ref_element
-
-
-class SpoilerPattern(Pattern, TextFormatter):
-    name = 's'
+class SpoilerPattern(TextFormatter):
+    name = 'spoiler'
     preview_left = '<span class="spoiler">'
     preview_right = '</span>'
 
-    format_left = '%%'
-    format_right = '%%'
+    format_left = '[spoiler]'
+    format_right = '[/spoiler]'
 
     def handleMatch(self, m):
         quote_element = etree.Element('span')
@@ -95,35 +66,22 b' class SpoilerPattern(Pattern, TextFormat'
         return quote_element
 
 
-class CommentPattern(Pattern, TextFormatter):
+class CommentPattern(TextFormatter):
     name = ''
     preview_left = '<span class="comment">// '
     preview_right = '</span>'
 
-    format_left = '//'
-
-    def handleMatch(self, m):
-        quote_element = etree.Element('span')
-        quote_element.set('class', 'comment')
-        quote_element.text = '//' + m.group(3)
-
-        return quote_element
+    format_left = '[comment]'
+    format_right = '[/comment]'
 
 
-class StrikeThroughPattern(Pattern, TextFormatter):
+class StrikeThroughPattern(TextFormatter):
     name = 's'
     preview_left = '<span class="strikethrough">'
     preview_right = '</span>'
 
-    format_left = '~'
-    format_right = '~'
-
-    def handleMatch(self, m):
-        quote_element = etree.Element('span')
-        quote_element.set('class', 'strikethrough')
-        quote_element.text = m.group(2)
-
-        return quote_element
+    format_left = '[s]'
+    format_right = '[/s]'
 
 
 class ItalicPattern(TextFormatter):
@@ -131,8 +89,8 b' class ItalicPattern(TextFormatter):'
     preview_left = '<i>'
     preview_right = '</i>'
 
-    format_left = '_'
-    format_right = '_'
+    format_left = '[i]'
+    format_right = '[/i]'
 
 
 class BoldPattern(TextFormatter):
@@ -140,8 +98,8 b' class BoldPattern(TextFormatter):'
     preview_left = '<b>'
     preview_right = '</b>'
 
-    format_left = '__'
-    format_right = '__'
+    format_left = '[b]'
+    format_right = '[/b]'
 
 
 class CodePattern(TextFormatter):
@@ -149,52 +107,39 b' class CodePattern(TextFormatter):'
     preview_left = '<code>'
     preview_right = '</code>'
 
-    format_left = '    '
-
-
-class DashPattern(Pattern):
-    def handleMatch(self, m):
-        return u'—'
+    format_left = '[code]'
+    format_right = '[/code]'
 
 
-class NeboardMarkdown(markdown.Extension):
-    def extendMarkdown(self, md, md_globals):
-        self._add_neboard_patterns(md)
-        self._delete_patterns(md)
+def render_reflink(tag_name, value, options, parent, context):
+    if not REFLINK_PATTERN.match(value):
+        return u'>>%s' % value
 
-    def _delete_patterns(self, md):
-        del md.parser.blockprocessors['quote']
-
-        del md.inlinePatterns['image_link']
-        del md.inlinePatterns['image_reference']
+    post_id = int(value)
 
-    def _add_neboard_patterns(self, md):
-        autolink = AutolinkPattern(AUTOLINK_PATTERN, md)
-        quote = QuotePattern(QUOTE_PATTERN, md)
-        reflink = ReflinkPattern(REFLINK_PATTERN, md)
-        spoiler = SpoilerPattern(SPOILER_PATTERN, md)
-        comment = CommentPattern(COMMENT_PATTERN, md)
-        strikethrough = StrikeThroughPattern(STRIKETHROUGH_PATTERN, md)
-        dash = DashPattern(DASH_PATTERN, md)
+    posts = boards.models.Post.objects.filter(id=post_id)
+    if posts.exists():
+        post = posts[0]
 
-        md.inlinePatterns[u'autolink_ext'] = autolink
-        md.inlinePatterns[u'spoiler'] = spoiler
-        md.inlinePatterns[u'strikethrough'] = strikethrough
-        md.inlinePatterns[u'comment'] = comment
-        md.inlinePatterns[u'reflink'] = reflink
-        md.inlinePatterns[u'quote'] = quote
-        md.inlinePatterns[u'dash'] = dash
+        return u'<a href=%s>&gt;&gt;%s</a>' % (post.get_url(), post_id)
+    else:
+        return u'>>%s' % value
 
 
-def make_extension(configs=None):
-    return NeboardMarkdown(configs=configs)
-
-neboard_extension = make_extension()
-
-
-def markdown_extended(markup):
-    return markdown.markdown(markup, [neboard_extension, 'nl2br'],
-                             safe_mode='escape')
+def bbcode_extended(markup):
+    parser = bbcode.Parser()
+    parser.add_formatter('post', render_reflink, strip=True)
+    parser.add_simple_formatter('quote',
+            u'<span class="multiquote">%(value)s</span>')
+    parser.add_simple_formatter('comment',
+            u'<span class="comment">//%(value)s</span>')
+    parser.add_simple_formatter('spoiler',
+            u'<span class="spoiler">%(value)s</span>')
+    parser.add_simple_formatter('s',
+            u'<span class="strikethrough">%(value)s</span>')
+    parser.add_simple_formatter('code',
+            u'<pre><code>%(value)s</pre></code>')
+    return parser.format(markup)
 
 formatters = [
     QuotePattern,

boards/models/post.py

@@ -28,7 +28,7 b' IMAGE_THUMB_SIZE = (200, 150)'
 
 TITLE_MAX_LENGTH = 200
 
-DEFAULT_MARKUP_TYPE = 'markdown'
+DEFAULT_MARKUP_TYPE = 'bbcode'
 
 # TODO This should be removed
 NO_IP = '0.0.0.0'
@@ -346,4 +346,4 b' class Post(models.Model, Viewable):'
 
         self.images.all().delete()
 
-        super(Post, self).delete(using)
  No newline at end of file
+        super(Post, self).delete(using)

boards/static/css/md/base_page.css

@@ -225,6 +225,14 b' blockquote {'
     font-style: italic;
 }
 
+.multiquote {
+    color: #92cf38;
+    font-style: italic;
+    border-left: solid 3px #00aa00;
+    padding-left: 3px;
+    display: inline-block;
+}
+
 .spoiler {
     background: white;
     color: white;

boards/static/js/thread.js

@@ -35,10 +35,10 b' function moveCaretToEnd(el) {'
 }
 
 function addQuickReply(postId) {
-    var textToAdd = '>>' + postId + '\n\n';
+    var textToAdd = '[post]' + postId + '[/post]\n\n';
     var selection = window.getSelection().toString();
     if (selection.length > 0) {
-        textToAdd += '> ' + selection + '\n\n';
+        textToAdd += '[quote]' + selection + '[/quote]\n\n';
     }
 
     var textAreaId = 'textarea';

boards/templates/boards/staticpages/help.html

@@ -8,13 +8,11 b''
 
 {% block staticcontent %}
     <h2>{% trans 'Syntax' %}</h2>
-    <p>{% trans '2 line breaks for a new line.' %}</p>
-    <p>_<i>{% trans 'Italic text' %}</i>_</p>
-    <p>__<b>{% trans 'Bold text' %}</b>__</p>
-    <p>%%<span class="spoiler">{% trans 'Spoiler' %}</span>%%</p>
-    <p><a>>>123</a> -- {% trans 'Link to a post' %}</p>
-    <p>~<span class="strikethrough">{% trans 'Strikethrough text' %}</span>~</p>
-    <p>{% trans 'You need to new line before:' %}</p>
-    <p><span class="comment">//{% trans 'Comment' %}</span></p>
-    <p><span class="quote">> {% trans 'Quote' %}</span></p>
+    <p>[i]<i>{% trans 'Italic text' %}</i>[/i]</p>
+    <p>[b]<b>{% trans 'Bold text' %}</b>[/b]</p>
+    <p>[spoiler]<span class="spoiler">{% trans 'Spoiler' %}</span>[/spoiler]</p>
+    <p>[post]123[/post] -- {% trans 'Link to a post' %}</p>
+    <p>[s]<span class="strikethrough">{% trans 'Strikethrough text' %}</span>[/s]</p>
+    <p>[comment]<span class="comment">{% trans 'Comment' %}</span>[/comment]</p>
+    <p>[quote]<span class="multiquote">{% trans 'Quote' %}</span>[/quote]</p>
 {% endblock %}

neboard/settings.py

@@ -1,6 +1,6 b''
 # Django settings for neboard project.
 import os
-from boards.mdx_neboard import markdown_extended
+from boards.mdx_neboard import bbcode_extended
 
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
@@ -217,7 +217,7 b' HAYSTACK_CONNECTIONS = {'
 }
 
 MARKUP_FIELD_TYPES = (
-    ('markdown', markdown_extended),
+    ('bbcode', bbcode_extended),
 )
 
 THEMES = [

requirements.txt

@@ -5,6 +5,6 b' pillow'
 django>=1.6
 django_cleanup
 django-markupfield
-markdown
 django-simple-captcha
 line-profiler
+bbcode