1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
|
# IVLE - Informatics Virtual Learning Environment
# Copyright (C) 2007-2009 The University of Melbourne
#
# 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 version.
#
# 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# Author: David Coles, Will Grant
'''Components of the webapp for diffing user files.'''
import os
import re
import cgi
import cjson
import genshi
import ivle.conf
import ivle.interpret
from ivle.webapp.base.xhtml import XHTMLView
from ivle.webapp.base.plugins import ViewPlugin, MediaPlugin
from ivle.webapp.errors import NotFound, BadRequest
class DiffView(XHTMLView):
'''A view to present a nice XHTML Subversion diff from a user's jail.'''
template = 'template.html'
def __init__(self, req, path):
self.path = path
def authorize(self, req):
return req.user is not None
def populate(self, req, ctx):
self.plugin_styles[Plugin] = ['diff.css']
revfields = req.get_fieldstorage().getlist("r")
if len(revfields) > 2:
raise BadRequest('A maximum of two revisions can be given.')
revs = [revfield.value for revfield in revfields]
jail_dir = os.path.join(ivle.conf.jail_base, req.user.login)
(out, err) = ivle.interpret.execute_raw(req.user, jail_dir, '/home',
os.path.join(ivle.conf.share_path, 'services/diffservice'),
[self.path] + revs)
assert not err
response = cjson.decode(out)
if 'error' in response:
if response['error'] == 'notfound':
raise NotFound()
else:
raise AssertionError('Unknown error from diffservice: %s' %
response['error'])
# No error. We must be safe.
diff = response['diff']
# Split up the udiff into individual files
diff_matcher = re.compile(
r'^Index: (.*)\n\=+\n((?:[^I].*\n)*)',re.MULTILINE
)
# Create a dict with (name, HTMLdiff) pairs for each non-empty diff.
ctx['files'] = dict([(fd[0], genshi.XML(htmlfy_diff(fd[1])))
for fd in diff_matcher.findall(diff)
if fd[1]])
def htmlfy_diff(difftext):
"""Adds HTML markup to a udiff string"""
output = cgi.escape(difftext)
subs = {
r'^([\+\-]{3})\s(\S+)\s\((.+)\)$':
r'<span class="diff-files">\1 \2 <em>(\3)</em></span>',
r'^\@\@ (.*) \@\@$':
r'<span class="diff-range">@@ \1 @@</span>',
r'^\+(.*)$':
r'<span class="diff-add">+\1</span>',
r'^\-(.*)$':
r'<span class="diff-sub">-\1</span>',
r'^\\(.*)$':
r'<span class="diff-special">\\\1</span>'
}
for match in subs:
output = re.compile(match, re.MULTILINE).sub(subs[match], output)
return '<pre class="diff">%s</pre>' % output
class Plugin(ViewPlugin, MediaPlugin):
'''Registration class for diff components.'''
urls = [
('diff/', DiffView, {'path': ''}),
('diff/*(path)', DiffView),
]
media = 'media'
|