''')
+ if display_as_image:
+ req.write('''
')
+ def stop_code():
+ req.write('')
+ def text():
+ start_code()
+ req.write(hq(contents))
+ stop_code()
+ def enscript():
+ command = config.enscript_path + ' -o - --color --language=html'
+ command += ' --highlight=%s' % (pipes.quote(filter))
+ result = run_command(command, to_child=contents)
+ if result['exitcode'] != 0:
+ raise Exception('Error running enscript (%s) : "%s".' % (hq(command), hq(result['childerr'])))
+ in_contents = False
+ for line in result['fromchild'].split('\n'):
+ if line.startswith('
''')
============================================================
--- file.psp 9cafbcda1e0ea426893d5fc02adfed2af5bc8c4e
+++ file.psp 4577435a443e0b52f428b215c5856853f631b76d
@@ -12,6 +12,7 @@
from enscriptlangs import enscript_langs
from html import get_icon, TableWriter
from utility import run_command
+from common import colourise_code
# file.psp ; provide information about a file
# if possible, display it (with syntax highlighting, etc.)
@@ -49,87 +50,15 @@
}
req.write(template.header(info))
-contents = mt.file(matching_file_id)
-
-%>
-
-<%
-
-# is it binary?
-def is_binary():
- nontext_chars = "\x01\x02\x03\x04\x05\x06\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1c\x1d\x1e\x1f"
- check = {}
- for char in nontext_chars:
- check[char] = True
- for i in contents:
- if check.has_key(i): return True
- return False
-
-mime_type = mimetypes.guess_type(path)[0]
-if mime_type == None: mime_type = 'text/plain'
-if mime_type == 'image/png' or mime_type == 'image/jpeg' or mime_type == 'image/gif':
- display_as_image = True
-else: display_as_image = False
-# okay; can we guess a valid enscript filter to run this through?
-tsp = mime_type.split('/', 1)
-filter = None
-if tsp[0] == 'text':
- candidate = tsp[1]
- if candidate.startswith('x-'): candidate = candidate[2:]
- if candidate.endswith('src'): candidate = candidate[:-3]
- if candidate.endswith('hdr'): candidate = candidate[:-3]
- if candidate == 'c++': candidate = 'cpp' # ugly
- if candidate in enscript_langs: filter = candidate
-if filter == None:
- # heh, will at least work for lua files
- last_dot = path.rfind('.')
- if last_dot == -1: last_dot = 0
- candidate = path[last_dot:]
- if candidate in enscript_langs: filter = candidate
-
-# if no filter then let's check if it's binary or not; if not binary
-# we'll just treat it as text; otherwise display a warning and a download
-# link
-if filter == None and not is_binary():
- filter = 'text'
-
req.write(''):
+ in_contents = True
+ start_code()
+ elif line.startswith(''):
+ in_contents = False
+ stop_code()
+ elif in_contents:
+ req.write(line + '\r\n')
+ if filter == "text": text()
+ else: enscript()
+ else:
+ req.write('''This file seems to binary and not suitable for display in the browser. You must %s the file and use a suitable viewer.
''' % (link("download", [matching_file_id, path], "download"))) + req.write('''For more information about the revision containing this file, see its %s page. For other files contained in this revision, see the %s.
' % (link("revision", id, "revision"), link("manifest", id, "manifest"))) req.write('You can also %s the file verbatim.
' % link("download", [matching_file_id, path], "download")) -req.write('''''')
-if display_as_image:
- req.write('''')
- def stop_code():
- req.write('')
- def text():
- start_code()
- req.write(hq(contents))
- stop_code()
- def enscript():
- command = config.enscript_path + ' -o - --color --language=html'
- command += ' --highlight=%s' % (pipes.quote(filter))
- result = run_command(command, to_child=contents)
- if result['exitcode'] != 0:
- raise Exception('Error running enscript (%s) : "%s".' % (hq(command), hq(result['childerr'])))
- in_contents = False
- for line in result['fromchild'].split('\n'):
- if line.startswith('
''')
+### FIXME FIXME
+### this means having _the entire file_ in memory
+### which is pointless and dumb.
+contents = mt.file(matching_file_id)
+colourise_code(req, hq, path, contents)
req.write(template.footer(info))
'):
- in_contents = True
- start_code()
- elif line.startswith(''):
- in_contents = False
- stop_code()
- elif in_contents:
- req.write(line + '\r\n')
- if filter == "text": text()
- else: enscript()
-else:
- req.write('''This file seems to binary and not suitable for display in the browser. You must %s the file and use a suitable viewer.
''' % (link("download", [matching_file_id, path], "download"))) -req.write('''