From f849631ebbff9f495d5ea51dfa201faa13ecf625 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Wed, 20 Jan 2010 12:37:49 +1030 Subject: [PATCH 1/1] Fix browser support. --- Makefile-web | 6 +- web/bzrbrowse/bzrbrowse.cgi | 225 ++++++++++++++++++++++++++++++++++++ web/bzrbrowse/file.png | Bin 0 -> 361 bytes web/bzrbrowse/folder.png | Bin 0 -> 498 bytes 4 files changed, 230 insertions(+), 1 deletion(-) create mode 100755 web/bzrbrowse/bzrbrowse.cgi create mode 100644 web/bzrbrowse/file.png create mode 100644 web/bzrbrowse/folder.png diff --git a/Makefile-web b/Makefile-web index 2258584f..8d1f0c69 100644 --- a/Makefile-web +++ b/Makefile-web @@ -13,7 +13,7 @@ upload: check webpages bzr push send-web # Rusty's upload script. -webpages: $(WEB_SUBDIRS) $(WEBDIR)/junkcode $(WEBDIR)/list.html $(WEBDIR)/index.html $(WEBDIR)/upload.html $(WEBDIR)/uploader.php $(WEBDIR)/example-config.h $(WEBDIR)/ccan.jpg $(DIRECT_TARBALLS) $(DEPEND_TARBALLS) $(WEBDIR)/ccan.tar.bz2 $(WEBDIR)/Makefile-ccan $(ALL_PAGES) $(JUNKPAGES) $(JUNKBALLS) +webpages: $(WEB_SUBDIRS) $(WEBDIR)/junkcode $(WEBDIR)/list.html $(WEBDIR)/index.html $(WEBDIR)/upload.html $(WEBDIR)/uploader.php $(WEBDIR)/example-config.h $(WEBDIR)/ccan.jpg $(BZRBROWSE) $(DIRECT_TARBALLS) $(DEPEND_TARBALLS) $(WEBDIR)/ccan.tar.bz2 $(WEBDIR)/Makefile-ccan $(ALL_PAGES) $(JUNKPAGES) $(JUNKBALLS) $(WEB_SUBDIRS): mkdir -p $@ @@ -53,6 +53,10 @@ $(WEBDIR)/Makefile-ccan: Makefile-ccan $(WEBDIR)/ccan.jpg: web/ccan.jpg cp $< $@ +BZRBROWSE=$(WEBDIR)/bzrbrowse.cgi $(WEBDIR)/file.png $(WEBDIR)/folder.png +$(BZRBROWSE): %: web/bzrbrowse/% + cp $< $@ + $(WEBDIR)/info/%.html: $(WEBDIR)/tarballs/%.tar.bz2 $(WEBDIR)/tarballs/with-deps/%.tar.bz2 @URLPREFIX=../ php5 web/staticmoduleinfo.php ccan/$* > $@ diff --git a/web/bzrbrowse/bzrbrowse.cgi b/web/bzrbrowse/bzrbrowse.cgi new file mode 100755 index 00000000..334ce50c --- /dev/null +++ b/web/bzrbrowse/bzrbrowse.cgi @@ -0,0 +1,225 @@ +#!/usr/bin/env python + +# Copyright (C) 2008 Lukas Lalinsky +# +# 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +# CHANGE THIS: +config = { + 'root': '/home/lukas/projects', + 'base_url': '/~lukas/bzrbrowse.cgi', + 'images_url': '/~lukas/bzrbrowse', + 'branch_url': 'http://bzr.oxygene.sk', +} + +import os, sys +from bzrlib.branch import Branch +from bzrlib.errors import NotBranchError +from bzrlib import urlutils, osutils + +__version__ = '0.0.1' + + +class HTTPError(Exception): + + def __init__(self, code, message): + self.code = code + self.message = message + + +class NotFound(HTTPError): + + def __init__(self, message): + super(NotFound, self).__init__('404 Not Found', message) + + +def escape_html(text): + return text.replace('&', '&').replace('<', '<').replace('>', '>').replace("\n", '
') + + +class BzrBrowse(object): + + icons = { + 'file': 'file.png', + 'directory': 'folder.png', + } + + page_tmpl = ''' +%(title)s + +

%(header)s

%(contents)s

+ +''' + + def __init__(self, config): + self.config = config + self.base_url = None + + def list_to_html(self, entries): + content = [] + for entry in entries: + line = '

%(name)s
' % { + 'base_url': self.config['base_url'], + 'images_url': self.config['images_url'], + 'path': entry['path'], + 'name': entry['name'], + 'icon': self.icons.get(entry['kind'], self.icons['file']) + } + content.append(line) + return ''.join(content) + + def list_fs_directory(self, path): + entries = [] + if path: + entries.append({ + 'name': '..', + 'path': os.path.dirname(path), + 'kind': 'directory', + }) + if path: + prefix = path + '/' + else: + prefix = '' + try: + filelist = os.listdir(os.path.join(self.config['root'], path)) + except OSError: + raise NotFound('Path not found: ' + path) + for name in sorted(filelist): + if name.startswith('.'): + continue + abspath = os.path.join(path, name) + if os.path.isdir(os.path.join(self.config['root'], abspath)): + entries.append({ + 'name': name, + 'path': prefix + name, + 'kind': 'directory', + }) + return self.list_to_html(entries) + + def view_branch_file(self, tree, ie): + if ie.text_size > 1024 * 1024: + return 'File too big. (%d bytes)' % (ie.text_size) + tree.lock_read() + try: + text = tree.get_file_text(ie.file_id) + finally: + tree.unlock() + if '\0' in text: + return 'Binary file. (%d bytes)' % (ie.text_size) + try: + text = text.decode('utf-8') + except UnicodeDecodeError: + text = text.decode('latin-1') + linenumbers = [] + for i in range(1, text.count('\n') + 1): + linenumbers.append('%d' % (i, i, i)) + linenumbers = '\n'.join(linenumbers) + return ('

' +
+                linenumbers + '

' + escape_html(text) +
+                '

') + + def list_branch_directory(self, branch, path, relpath): + tree = branch.basis_tree() + file_id = tree.path2id(relpath) + ie = tree.inventory[file_id] + if ie.kind == 'file': + return self.view_branch_file(tree, ie) + entries = [] + if path: + entries.append({ + 'name': '..', + 'path': urlutils.dirname(path), + 'kind': 'directory', + }) + if path: + prefix = path + '/' + else: + prefix = '' + for name, child in sorted(ie.children.iteritems()): + entries.append({ + 'name': name, + 'path': prefix + name, + 'kind': child.kind, + }) + html = self.list_to_html(entries) + base = self.config['branch_url'] + '/' + osutils.relpath(self.config['root'], urlutils.local_path_from_url(branch.base)) + html = ('

This is a Bazaar branch. ' + + 'Use bzr branch ' + base + ' to download it.

' + html) + return html + + def request(self, path): + abspath = os.path.join(self.config['root'], path) + try: + branch, relpath = Branch.open_containing(abspath) + except NotBranchError: + return self.list_fs_directory(path) + return self.list_branch_directory(branch, path, relpath) + + def title(self, path): + return '/' + path + + def header(self, path): + title = [] + p = '' + title.append('root' % (self.config['base_url'], p)) + for name in path.split('/'): + p += '/' + name + title.append('%s' % (self.config['base_url'], p, name)) + return '/'.join(title) + + def __call__(self, environ, start_response): + try: + path = '/'.join(filter(bool, environ.get('PATH_INFO', '').split('/'))) + contents = self.page_tmpl % { + 'title': self.title(path), + 'header': self.header(path), + 'contents': self.request(path), + 'version': __version__ + } + contents = contents.encode('utf-8') + headers = [('Content-type','text/html; charset=UTF-8')] + start_response('200 OK', headers) + return [contents] + except HTTPError, e: + headers = [('Content-type','text/html; charset=UTF-8')] + start_response(e.code, headers) + return [e.message] + except: + import cgitb, sys + traceback_html = cgitb.html(sys.exc_info()) + headers = [('Content-type','text/html; charset=UTF-8')] + start_response('200 OK', headers) + return [traceback_html] + + +from wsgiref.handlers import CGIHandler +CGIHandler().run(BzrBrowse(config)) diff --git a/web/bzrbrowse/file.png b/web/bzrbrowse/file.png new file mode 100644 index 0000000000000000000000000000000000000000..df545eb91dfa2f7e8eba37c4178b1fcf0e723bb0 GIT binary patch literal 361 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4^n7 BkMaNj literal 0 HcmV?d00001 diff --git a/web/bzrbrowse/folder.png b/web/bzrbrowse/folder.png new file mode 100644 index 0000000000000000000000000000000000000000..901edc9624a23d92a9fcbc0c9c450bf37409da18 GIT binary patch literal 498 zcmV

T` z=fK?B+ueUcgw&mTx8?fP8#5oZ_IS4UlwPlQrCO;yj|7yQi?lwqqD*+(cr$(Vs9LE# z0Eh#m(;1HB@{s`NLMd=l3Z)da7uEYf05Hbjc`mO%_Gxx9%%#H)XKp%DNa@dEf@UYf zg64HNtq;9mzz z0TxYQt&biCWrx3zi1`R0A}FO05k$Zj!CGNxeauK0j4VSdL!1G*==LU59h96xI zMByWh2N4hikuew;S(yNSb=sUhdyWrZ|BROccMMviB*Wb(P{I#8i on>e<%XnEP;xA*VLo2x9V1Hy;2%BQg6_y7O^07*qoM6N<$g5ayrIRF3v literal 0 HcmV?d00001 -- 2.39.2