Changeset 113 for trunk

Timestamp:

15-01-2008 23:52:28 (12 months ago)

Author:

s0undt3ch

Message:

Implemented rudimentary unidiff between pastes, and allow users to download pastes(No download for diffs yet, should we enabled that?).

Location:

trunk/pastie

Files:

• config/routing.py (modified) (1 diff)
• controllers/pasties.py (modified) (1 diff)
• lib/highlight.py (modified) (3 diffs)
• model/pasties.py (modified) (2 diffs)
• public/css/main.css (modified) (1 diff)
• templates/paste/diff.html (added)
• templates/paste/show.html (modified) (1 diff)

trunk/pastie/config/routing.py

@@ -26 +26 @@
     map.connect('tagcloud', '/tags', controller='pastetags', action='index')
     map.connect('paste', '/:id', controller="pasties", action='show')
-    map.connect('pastetree', '', controller='pasties', action='tree')
+    map.connect('pastetree', '/tree/:id', controller='pasties', action='tree')
+    map.connect('rawpaste', '/download/:id', controller='pasties', action='download')
+    map.connect('diffpaste', '/diff/:id/:parent', controller='pasties', action='diff')
+    map.connect('replypaste', '/reply/:id', controller='pasties', action='new')
 
 

trunk/pastie/controllers/pasties.py

@@ -89 +89 @@
         c.id = int(id)
         return render('paste.tree')
+
+    def download(self, id):
+        if not id:
+            redirect_to('list')
+        paste = Session.query(Paste).get(int(id))
+        if not paste:
+            abort(404)
+
+        mimetype = h.get_lexer_by_name(paste.language or 'text').mimetypes[0]
+        response.content_type__set(mimetype)
+        response.charset__set('utf-8')
+        response.write(paste.code)
+        return
+
+    def diff(self, id, parent):
+        c.langdict = langdict
+        c.paste = Session.query(Paste).get(int(id))
+        c.parent = Session.query(Paste).get(int(parent))
+#        c.diff = c.paste.compare_to(c.other)
+#        c.diff.language = 'diff'
+        return render('paste.diff')

trunk/pastie/lib/highlight.py

@@ -6 +6 @@
 import StringIO
 
-__all__ = ['code_highlight', 'get_lexers']
+__all__ = ['code_highlight', 'get_lexers', 'get_lexer_by_name']
 
 langdict = {}
@@ -96 +96 @@
                                 lineanchorlinks=True, linenospecial=10)
 
-def code_highlight(code, truncate_lines=None):
+def code_highlight(code, truncate_lines=None, diff_to=None):
     source = code.code
+    if diff_to:
+        source = code.compare_to(diff_to)
+        print source
     if truncate_lines:
         split_source = source.split('\n')
@@ -104 +107 @@
             source.append('...')
             source = ''.join(source)
+
     lexer = get_lexer_by_name(code.language or 'text', stripall=True)
+    if diff_to:
+        lexex = get_lexer_by_name('diff')
     return XML(highlight(source, lexer, formatter).decode('utf-8'))
 

trunk/pastie/model/pasties.py

@@ -2 +2 @@
 from datetime import datetime
 import math
+import difflib
 
 from sqlalchemy import desc, Column, ForeignKey, func, select, Table, types
@@ -84 +85 @@
             paste_id = paste.parent_id
 
+    def compare_to(self, other, context_lines=4):
+        if not isinstance(other, Paste):
+            other = Session.query(Paste).get(int(other))
+        udiff = u'\n'.join(difflib.unified_diff(
+            self.code.splitlines(),
+            other.code.splitlines(),
+            fromfile='Paste #%d' % self.id,
+            tofile='Paste #%d' % other.id,
+            lineterm='',
+            n=context_lines)
+        )
+        return udiff
+
 mapper(Paste, paste_table,
     properties=dict(

trunk/pastie/public/css/main.css

@@ -173 +173 @@
   float: right;
   background: url(../img/cell_bg.png) no-repeat left bottom;
-  font-weight: bold;
+  /*font-weight: bold;*/
   font-size: 0.6em;
 }

trunk/pastie/templates/paste/show.html

@@ -29 +29 @@
     <div id="paste">
     <div id="paste_menu"><ul>
+      <li>
+        <a href="${h.url_for('replypaste', id=c.paste.id)}">Reply To Paste</a>
+      </li>
+      <li>
+        <a href="${h.url_for('rawpaste', id=c.paste.id)}">Download Paste</a>
+      </li>
+      <li py:if="c.paste.parent_id">
+        <a href="${h.url_for('diffpaste', parent=c.paste.parent.id, id=c.paste.id)}"
+           title="Diferences between current and parent paste">Diff With Parent</a>
+      </li>
       <li py:if="c.paste.children or c.paste.parent_id">
         <a href="${h.url_for('pastetree', id=c.paste.id)}">Show Tree</a>
-      </li>
-      <li>
-        <a href="${h.url_for('newpaste', id=c.paste.id)}">Reply To Paste</a>
       </li>
       <li style="display:none;"><a class="toggle_linenumbers"