From 6b762c363224860833ea20c9ba8109c0c210d419 Mon Sep 17 00:00:00 2001 From: Jannis Pohlmann Date: Wed, 18 Apr 2012 17:14:11 +0100 Subject: Add untested support for bundles. --- morph-cache-server | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'morph-cache-server') diff --git a/morph-cache-server b/morph-cache-server index 60c3105..5554481 100755 --- a/morph-cache-server +++ b/morph-cache-server @@ -20,12 +20,14 @@ import cliapp import logging import urllib -from bottle import Bottle, request, response, run +from bottle import Bottle, request, response, run, static_file + from morphcacheserver.repocache import RepoCache defaults = { 'repo-dir': '/var/cache/morph-cache-server/gits', + 'bundle-dir': '/var/cache/morph-cache-server/bundles', } @@ -36,11 +38,17 @@ class MorphCacheServer(cliapp.Application): 'path to the repository cache directory', metavar='PATH', default=defaults['repo-dir']) + self.settings.string(['bundle-dir'], + 'path to the bundle cache directory', + metavar='PATH', + default=defaults['bundle-dir']) def process_args(self, args): app = Bottle() - repo_cache = RepoCache(self, self.settings['repo-dir']) + repo_cache = RepoCache(self, + self.settings['repo-dir'], + self.settings['bundles']) @app.get('/sha1s') def sha1(): @@ -70,6 +78,12 @@ class MorphCacheServer(cliapp.Application): except Exception, e: response.status = 404 logging.debug('%s' % e) + + @app.get('/bundles') + def bundle(): + repo = self._unescape_parameter(request.query.repo) + filename = repo_cache.get_bundle_filename(repo) + return static_file(filename, download=True) root = Bottle() root.mount(app, '/1.0') -- cgit v1.2.1