Mercurial > hg > decoupage
annotate decoupage/web.py @ 59:07cf168aa98c
make formats classes that can take arguments
author | Jeff Hammel <jhammel@mozilla.com> |
---|---|
date | Sun, 21 Nov 2010 13:23:34 -0800 |
parents | 0cc1af24602b |
children | f5ca54558292 |
rev | line source |
---|---|
0
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
1 """ |
33
e384d4569ac3
include components necessary to make decoupage feel almost like a framework
k0s <k0scist@gmail.com>
parents:
26
diff
changeset
|
2 decoupage: a view with webob to index and serve static content |
0
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
3 """ |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
4 |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
5 import os |
43
8621a6e2fe38
actual sane error handling that human beings can read and decipher
Jeff Hammel <jhammel@mozilla.com>
parents:
42
diff
changeset
|
6 import sys |
0
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
7 |
26
f306089d6def
now use contenttransformer to serve files if /transformer in directory configuration; TODO: cache on a per-directory basis
k0s <k0scist@gmail.com>
parents:
25
diff
changeset
|
8 from contenttransformer.app import FileTypeTransformer |
40
89f7a8ca965c
add arguments to transformers....configparser is somewhat retarded about capitalization so im going to be somewhat retarded here rather than google for how to fix right now. lame
Jeff Hammel <jhammel@mozilla.com>
parents:
35
diff
changeset
|
9 from contenttransformer.app import transformers |
48
af73a3fda723
add more metadata to files: modification time, type
Jeff Hammel <jhammel@mozilla.com>
parents:
43
diff
changeset
|
10 from datetime import datetime |
10 | 11 from formatters import formatters |
0
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
12 from genshi.builder import Markup |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
13 from genshi.template import TemplateLoader |
21 | 14 from genshi.template.base import TemplateError |
43
8621a6e2fe38
actual sane error handling that human beings can read and decipher
Jeff Hammel <jhammel@mozilla.com>
parents:
42
diff
changeset
|
15 from genshi.template.base import TemplateSyntaxError |
0
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
16 from martini.config import ConfigMunger |
2 | 17 from paste.fileapp import FileApp |
49
ac693b8df32c
add idea of formats and json format
Jeff Hammel <jhammel@mozilla.com>
parents:
48
diff
changeset
|
18 from pkg_resources import iter_entry_points |
ac693b8df32c
add idea of formats and json format
Jeff Hammel <jhammel@mozilla.com>
parents:
48
diff
changeset
|
19 from pkg_resources import load_entry_point |
0
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
20 from pkg_resources import resource_filename |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
21 from webob import Request, Response, exc |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
22 |
40
89f7a8ca965c
add arguments to transformers....configparser is somewhat retarded about capitalization so im going to be somewhat retarded here rather than google for how to fix right now. lame
Jeff Hammel <jhammel@mozilla.com>
parents:
35
diff
changeset
|
23 transformers = [i.lower() for i in transformers()] |
89f7a8ca965c
add arguments to transformers....configparser is somewhat retarded about capitalization so im going to be somewhat retarded here rather than google for how to fix right now. lame
Jeff Hammel <jhammel@mozilla.com>
parents:
35
diff
changeset
|
24 |
0
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
25 class Decoupage(object): |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
26 |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
27 ### class level variables |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
28 defaults = { 'auto_reload': 'False', |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
29 'configuration': None, |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
30 'directory': None, # directory to serve |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
31 'cascade': 'True', # whether to cascade configuration |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
32 'template': 'index.html', # XXX see below |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
33 'template_directories': '' # list of directories to look for templates |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
34 } |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
35 |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
36 def __init__(self, **app_conf): |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
37 |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
38 # set defaults from app configuration |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
39 kw = self.app_conf('decoupage', app_conf) |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
40 for key in self.defaults: |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
41 setattr(self, key, kw.get(key, self.defaults[key])) |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
42 |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
43 # configure defaults |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
44 self.auto_reload = self.auto_reload.lower() == 'true' |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
45 self.cascade = self.cascade.lower() == 'true' |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
46 self.directory = self.directory.rstrip(os.path.sep) |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
47 assert os.path.isdir(self.directory) |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
48 self.template_directories = self.template_directories.split() # no spaces in directory names, for now |
30 | 49 |
50 for directory in self.template_directories: | |
51 assert os.path.isdir(directory), "Decoupage template directory %s does not exist!" % directory | |
0
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
52 |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
53 # static file server |
40
89f7a8ca965c
add arguments to transformers....configparser is somewhat retarded about capitalization so im going to be somewhat retarded here rather than google for how to fix right now. lame
Jeff Hammel <jhammel@mozilla.com>
parents:
35
diff
changeset
|
54 self.fileserver = FileApp # XXX still used?!? |
49
ac693b8df32c
add idea of formats and json format
Jeff Hammel <jhammel@mozilla.com>
parents:
48
diff
changeset
|
55 |
ac693b8df32c
add idea of formats and json format
Jeff Hammel <jhammel@mozilla.com>
parents:
48
diff
changeset
|
56 # pluggable formats |
59
07cf168aa98c
make formats classes that can take arguments
Jeff Hammel <jhammel@mozilla.com>
parents:
56
diff
changeset
|
57 s = 'decoupage.format.' |
07cf168aa98c
make formats classes that can take arguments
Jeff Hammel <jhammel@mozilla.com>
parents:
56
diff
changeset
|
58 _format_args = [ (i.split(s, 1)[-1], j) for i, j in app_conf.items() |
07cf168aa98c
make formats classes that can take arguments
Jeff Hammel <jhammel@mozilla.com>
parents:
56
diff
changeset
|
59 if i.startswith(s) ] |
07cf168aa98c
make formats classes that can take arguments
Jeff Hammel <jhammel@mozilla.com>
parents:
56
diff
changeset
|
60 format_args = {} |
07cf168aa98c
make formats classes that can take arguments
Jeff Hammel <jhammel@mozilla.com>
parents:
56
diff
changeset
|
61 for i, j in _format_args: |
07cf168aa98c
make formats classes that can take arguments
Jeff Hammel <jhammel@mozilla.com>
parents:
56
diff
changeset
|
62 assert i.count('.') == 1, 'Illegal string or something' |
07cf168aa98c
make formats classes that can take arguments
Jeff Hammel <jhammel@mozilla.com>
parents:
56
diff
changeset
|
63 format_name, var_name = i.split('.') |
07cf168aa98c
make formats classes that can take arguments
Jeff Hammel <jhammel@mozilla.com>
parents:
56
diff
changeset
|
64 format_args.setdefault(format_name, {})[var_name] = j |
49
ac693b8df32c
add idea of formats and json format
Jeff Hammel <jhammel@mozilla.com>
parents:
48
diff
changeset
|
65 self.formats = {} |
ac693b8df32c
add idea of formats and json format
Jeff Hammel <jhammel@mozilla.com>
parents:
48
diff
changeset
|
66 for _format in iter_entry_points('decoupage.formats'): |
ac693b8df32c
add idea of formats and json format
Jeff Hammel <jhammel@mozilla.com>
parents:
48
diff
changeset
|
67 try: |
59
07cf168aa98c
make formats classes that can take arguments
Jeff Hammel <jhammel@mozilla.com>
parents:
56
diff
changeset
|
68 _cls = _format.load() |
07cf168aa98c
make formats classes that can take arguments
Jeff Hammel <jhammel@mozilla.com>
parents:
56
diff
changeset
|
69 _instance = _cls(self, **format_args.get(_format.name, {})) |
49
ac693b8df32c
add idea of formats and json format
Jeff Hammel <jhammel@mozilla.com>
parents:
48
diff
changeset
|
70 except Exception, e: |
ac693b8df32c
add idea of formats and json format
Jeff Hammel <jhammel@mozilla.com>
parents:
48
diff
changeset
|
71 # record the error, but persist |
ac693b8df32c
add idea of formats and json format
Jeff Hammel <jhammel@mozilla.com>
parents:
48
diff
changeset
|
72 print >> sys.stderr, "Couldn't load format: %s" % _format |
ac693b8df32c
add idea of formats and json format
Jeff Hammel <jhammel@mozilla.com>
parents:
48
diff
changeset
|
73 print >> sys.stderr, e |
ac693b8df32c
add idea of formats and json format
Jeff Hammel <jhammel@mozilla.com>
parents:
48
diff
changeset
|
74 continue |
59
07cf168aa98c
make formats classes that can take arguments
Jeff Hammel <jhammel@mozilla.com>
parents:
56
diff
changeset
|
75 self.formats[_format.name] = _instance |
0
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
76 |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
77 # pluggable index data formatters |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
78 self.formatters = {} |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
79 for formatter in iter_entry_points('decoupage.formatters'): |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
80 try: |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
81 _formatter = formatter.load() |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
82 template_dir = resource_filename(formatter.module_name, 'templates') |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
83 if template_dir not in self.template_directories and os.path.isdir(template_dir): |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
84 self.template_directories.append(template_dir) |
49
ac693b8df32c
add idea of formats and json format
Jeff Hammel <jhammel@mozilla.com>
parents:
48
diff
changeset
|
85 except Exception, e: |
ac693b8df32c
add idea of formats and json format
Jeff Hammel <jhammel@mozilla.com>
parents:
48
diff
changeset
|
86 # record the error, but persist |
ac693b8df32c
add idea of formats and json format
Jeff Hammel <jhammel@mozilla.com>
parents:
48
diff
changeset
|
87 print >> sys.stderr, "Couldn't load formatter: %s" % formatter |
ac693b8df32c
add idea of formats and json format
Jeff Hammel <jhammel@mozilla.com>
parents:
48
diff
changeset
|
88 print >> sts.stderr, e |
42
e0e1a339070c
print which formmaters werent available
Jeff Hammel <jhammel@mozilla.com>
parents:
40
diff
changeset
|
89 continue |
0
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
90 self.formatters[formatter.name] = _formatter |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
91 |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
92 # template loader |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
93 self.loader = TemplateLoader(self.template_directories, |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
94 auto_reload=self.auto_reload) |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
95 |
26
f306089d6def
now use contenttransformer to serve files if /transformer in directory configuration; TODO: cache on a per-directory basis
k0s <k0scist@gmail.com>
parents:
25
diff
changeset
|
96 |
f306089d6def
now use contenttransformer to serve files if /transformer in directory configuration; TODO: cache on a per-directory basis
k0s <k0scist@gmail.com>
parents:
25
diff
changeset
|
97 |
0
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
98 ### methods dealing with HTTP |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
99 def __call__(self, environ, start_response): |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
100 request = Request(environ) |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
101 filename = request.path_info.strip('/') |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
102 path = os.path.join(self.directory, filename) |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
103 if os.path.exists(path): |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
104 if os.path.isdir(path): |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
105 |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
106 if not request.path_info.endswith('/'): |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
107 raise exc.HTTPMovedPermanently(add_slash=True) |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
108 |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
109 res = self.get(request) |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
110 return res(environ, start_response) |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
111 else: |
26
f306089d6def
now use contenttransformer to serve files if /transformer in directory configuration; TODO: cache on a per-directory basis
k0s <k0scist@gmail.com>
parents:
25
diff
changeset
|
112 conf = self.conf(request.path_info.rsplit('/',1)[0]) |
f306089d6def
now use contenttransformer to serve files if /transformer in directory configuration; TODO: cache on a per-directory basis
k0s <k0scist@gmail.com>
parents:
25
diff
changeset
|
113 if '/transformer' in conf: |
f306089d6def
now use contenttransformer to serve files if /transformer in directory configuration; TODO: cache on a per-directory basis
k0s <k0scist@gmail.com>
parents:
25
diff
changeset
|
114 args = [i.split('=', 1) for i in conf['/transformer'].split(',') if '=' in i] |
40
89f7a8ca965c
add arguments to transformers....configparser is somewhat retarded about capitalization so im going to be somewhat retarded here rather than google for how to fix right now. lame
Jeff Hammel <jhammel@mozilla.com>
parents:
35
diff
changeset
|
115 kwargs = {} |
89f7a8ca965c
add arguments to transformers....configparser is somewhat retarded about capitalization so im going to be somewhat retarded here rather than google for how to fix right now. lame
Jeff Hammel <jhammel@mozilla.com>
parents:
35
diff
changeset
|
116 for i in conf: |
89f7a8ca965c
add arguments to transformers....configparser is somewhat retarded about capitalization so im going to be somewhat retarded here rather than google for how to fix right now. lame
Jeff Hammel <jhammel@mozilla.com>
parents:
35
diff
changeset
|
117 if i.startswith('/'): |
89f7a8ca965c
add arguments to transformers....configparser is somewhat retarded about capitalization so im going to be somewhat retarded here rather than google for how to fix right now. lame
Jeff Hammel <jhammel@mozilla.com>
parents:
35
diff
changeset
|
118 name = i[1:].lower() |
89f7a8ca965c
add arguments to transformers....configparser is somewhat retarded about capitalization so im going to be somewhat retarded here rather than google for how to fix right now. lame
Jeff Hammel <jhammel@mozilla.com>
parents:
35
diff
changeset
|
119 if name in transformers: |
89f7a8ca965c
add arguments to transformers....configparser is somewhat retarded about capitalization so im going to be somewhat retarded here rather than google for how to fix right now. lame
Jeff Hammel <jhammel@mozilla.com>
parents:
35
diff
changeset
|
120 kwargs[name] = dict([j.split('=', 1) for j in conf[i].split(',') if '=' in j]) |
89f7a8ca965c
add arguments to transformers....configparser is somewhat retarded about capitalization so im going to be somewhat retarded here rather than google for how to fix right now. lame
Jeff Hammel <jhammel@mozilla.com>
parents:
35
diff
changeset
|
121 fileserver = FileTypeTransformer(*args, **kwargs) |
26
f306089d6def
now use contenttransformer to serve files if /transformer in directory configuration; TODO: cache on a per-directory basis
k0s <k0scist@gmail.com>
parents:
25
diff
changeset
|
122 else: |
f306089d6def
now use contenttransformer to serve files if /transformer in directory configuration; TODO: cache on a per-directory basis
k0s <k0scist@gmail.com>
parents:
25
diff
changeset
|
123 fileserver = FileApp |
f306089d6def
now use contenttransformer to serve files if /transformer in directory configuration; TODO: cache on a per-directory basis
k0s <k0scist@gmail.com>
parents:
25
diff
changeset
|
124 |
f306089d6def
now use contenttransformer to serve files if /transformer in directory configuration; TODO: cache on a per-directory basis
k0s <k0scist@gmail.com>
parents:
25
diff
changeset
|
125 fileserver = fileserver(path) |
2 | 126 return fileserver(environ, start_response) |
0
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
127 else: |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
128 raise exc.HTTPNotFound() |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
129 |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
130 |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
131 def get(self, request): |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
132 """ |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
133 return response to a GET requst |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
134 """ |
48
af73a3fda723
add more metadata to files: modification time, type
Jeff Hammel <jhammel@mozilla.com>
parents:
43
diff
changeset
|
135 |
0
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
136 # ensure a sane path |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
137 path = request.path_info.strip('/') |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
138 directory = os.path.join(self.directory, path) |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
139 path = '/%s' % path |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
140 |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
141 # get the configuraton |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
142 conf = self.conf(path) |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
143 |
33
e384d4569ac3
include components necessary to make decoupage feel almost like a framework
k0s <k0scist@gmail.com>
parents:
26
diff
changeset
|
144 ### build data dictionary |
52
a2f09d749a3f
work towards refactor letting links (and maybe other things in the future) dwell in a decoupage namespace
Jeff Hammel <jhammel@mozilla.com>
parents:
50
diff
changeset
|
145 # TODO: separate these out into several formatters |
12
9f91acf9874c
* split on space in formatters to be consist with everything else
k0s <k0scist@gmail.com>
parents:
10
diff
changeset
|
146 files = self.filedata(path, directory, conf) |
13
ab0c2bb4d23d
* get the templates in the correct way
k0s <k0scist@gmail.com>
parents:
12
diff
changeset
|
147 data = {'path': path, 'files': files, 'request': request } |
33
e384d4569ac3
include components necessary to make decoupage feel almost like a framework
k0s <k0scist@gmail.com>
parents:
26
diff
changeset
|
148 |
e384d4569ac3
include components necessary to make decoupage feel almost like a framework
k0s <k0scist@gmail.com>
parents:
26
diff
changeset
|
149 # defaults; TODO: make this better |
48
af73a3fda723
add more metadata to files: modification time, type
Jeff Hammel <jhammel@mozilla.com>
parents:
43
diff
changeset
|
150 # there shouldn't need to be defaults; |
af73a3fda723
add more metadata to files: modification time, type
Jeff Hammel <jhammel@mozilla.com>
parents:
43
diff
changeset
|
151 # iirc, genshi has a mode where these will default to None |
13
ab0c2bb4d23d
* get the templates in the correct way
k0s <k0scist@gmail.com>
parents:
12
diff
changeset
|
152 data['title'] = conf.get('/title') |
15 | 153 data['directory'] = directory |
14
4ca2530f8be1
stub for putting stylesheets and includes on templates"
k0s <k0scist@gmail.com>
parents:
13
diff
changeset
|
154 data['include'] = None |
4ca2530f8be1
stub for putting stylesheets and includes on templates"
k0s <k0scist@gmail.com>
parents:
13
diff
changeset
|
155 data['css'] = () |
33
e384d4569ac3
include components necessary to make decoupage feel almost like a framework
k0s <k0scist@gmail.com>
parents:
26
diff
changeset
|
156 data['scripts'] = () |
e384d4569ac3
include components necessary to make decoupage feel almost like a framework
k0s <k0scist@gmail.com>
parents:
26
diff
changeset
|
157 data['icon'] = None |
0
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
158 |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
159 # apply formatters |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
160 # XXX this should be cached if not self.auto_reload |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
161 if '/formatters' in conf: |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
162 # ordered list of formatters to be applied first |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
163 formatters = [ i for i in conf['/formatters'].split() |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
164 if i in self.formatters ] |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
165 else: |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
166 formatters = [] |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
167 for key in conf: |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
168 if key.startswith('/'): |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
169 key = key[1:] |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
170 if key in self.formatters and key not in formatters: |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
171 formatters.append(key) |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
172 for name in formatters: |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
173 formatter = self.formatters[name](conf.get('/%s' % name, '')) |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
174 formatter(request, data) |
10 | 175 |
49
ac693b8df32c
add idea of formats and json format
Jeff Hammel <jhammel@mozilla.com>
parents:
48
diff
changeset
|
176 # return an alternate format if specified |
ac693b8df32c
add idea of formats and json format
Jeff Hammel <jhammel@mozilla.com>
parents:
48
diff
changeset
|
177 # decoupage.formats should return a 2-tuple: |
ac693b8df32c
add idea of formats and json format
Jeff Hammel <jhammel@mozilla.com>
parents:
48
diff
changeset
|
178 # (content_type, body) |
ac693b8df32c
add idea of formats and json format
Jeff Hammel <jhammel@mozilla.com>
parents:
48
diff
changeset
|
179 if 'format' in request.GET: |
ac693b8df32c
add idea of formats and json format
Jeff Hammel <jhammel@mozilla.com>
parents:
48
diff
changeset
|
180 format_name = request.GET['format'] |
ac693b8df32c
add idea of formats and json format
Jeff Hammel <jhammel@mozilla.com>
parents:
48
diff
changeset
|
181 if format_name in self.formats: |
59
07cf168aa98c
make formats classes that can take arguments
Jeff Hammel <jhammel@mozilla.com>
parents:
56
diff
changeset
|
182 _format = self.formats[format_name] |
07cf168aa98c
make formats classes that can take arguments
Jeff Hammel <jhammel@mozilla.com>
parents:
56
diff
changeset
|
183 content_type, body = _format(request, data) |
49
ac693b8df32c
add idea of formats and json format
Jeff Hammel <jhammel@mozilla.com>
parents:
48
diff
changeset
|
184 return Response(content_type=content_type, body=body) |
ac693b8df32c
add idea of formats and json format
Jeff Hammel <jhammel@mozilla.com>
parents:
48
diff
changeset
|
185 |
0
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
186 # render the template |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
187 template = conf.get('/template') |
20 | 188 local_index = False |
0
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
189 if template is None: |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
190 if 'index.html' in [ f['name'] for f in files ]: |
20 | 191 local_index = os.path.join(directory, 'index.html') |
192 template = local_index | |
0
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
193 else: |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
194 template = self.template |
13
ab0c2bb4d23d
* get the templates in the correct way
k0s <k0scist@gmail.com>
parents:
12
diff
changeset
|
195 else: |
ab0c2bb4d23d
* get the templates in the correct way
k0s <k0scist@gmail.com>
parents:
12
diff
changeset
|
196 if not os.path.isabs(template): |
ab0c2bb4d23d
* get the templates in the correct way
k0s <k0scist@gmail.com>
parents:
12
diff
changeset
|
197 _template = os.path.join(directory, template) |
ab0c2bb4d23d
* get the templates in the correct way
k0s <k0scist@gmail.com>
parents:
12
diff
changeset
|
198 if os.path.exists(_template): |
ab0c2bb4d23d
* get the templates in the correct way
k0s <k0scist@gmail.com>
parents:
12
diff
changeset
|
199 template = _template |
ab0c2bb4d23d
* get the templates in the correct way
k0s <k0scist@gmail.com>
parents:
12
diff
changeset
|
200 else: |
ab0c2bb4d23d
* get the templates in the correct way
k0s <k0scist@gmail.com>
parents:
12
diff
changeset
|
201 for directory in self.template_directories: |
ab0c2bb4d23d
* get the templates in the correct way
k0s <k0scist@gmail.com>
parents:
12
diff
changeset
|
202 if template in os.listdir(directory): |
ab0c2bb4d23d
* get the templates in the correct way
k0s <k0scist@gmail.com>
parents:
12
diff
changeset
|
203 break |
ab0c2bb4d23d
* get the templates in the correct way
k0s <k0scist@gmail.com>
parents:
12
diff
changeset
|
204 else: |
ab0c2bb4d23d
* get the templates in the correct way
k0s <k0scist@gmail.com>
parents:
12
diff
changeset
|
205 raise IOError("template %s not found" % template) |
20 | 206 try: |
21 | 207 template = self.loader.load(template) |
20 | 208 res = template.generate(**data).render('html', doctype='html') |
43
8621a6e2fe38
actual sane error handling that human beings can read and decipher
Jeff Hammel <jhammel@mozilla.com>
parents:
42
diff
changeset
|
209 except (TemplateError, TemplateSyntaxError), e: |
20 | 210 if local_index: |
43
8621a6e2fe38
actual sane error handling that human beings can read and decipher
Jeff Hammel <jhammel@mozilla.com>
parents:
42
diff
changeset
|
211 print repr(e) |
20 | 212 return self.fileserver(local_index) |
213 raise | |
214 | |
48
af73a3fda723
add more metadata to files: modification time, type
Jeff Hammel <jhammel@mozilla.com>
parents:
43
diff
changeset
|
215 # return response |
25
d5775f3667a2
remove pointless get_response method
k0s <k0scist@gmail.com>
parents:
21
diff
changeset
|
216 return Response(content_type='text/html', body=res) |
d5775f3667a2
remove pointless get_response method
k0s <k0scist@gmail.com>
parents:
21
diff
changeset
|
217 |
0
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
218 |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
219 ### internal methods |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
220 |
52
a2f09d749a3f
work towards refactor letting links (and maybe other things in the future) dwell in a decoupage namespace
Jeff Hammel <jhammel@mozilla.com>
parents:
50
diff
changeset
|
221 def filedata(self, path, directory, conf=None): |
a2f09d749a3f
work towards refactor letting links (and maybe other things in the future) dwell in a decoupage namespace
Jeff Hammel <jhammel@mozilla.com>
parents:
50
diff
changeset
|
222 conf = conf or {} |
12
9f91acf9874c
* split on space in formatters to be consist with everything else
k0s <k0scist@gmail.com>
parents:
10
diff
changeset
|
223 files = [] |
56
0cc1af24602b
dont show size for directories
Jeff Hammel <jhammel@mozilla.com>
parents:
52
diff
changeset
|
224 |
0cc1af24602b
dont show size for directories
Jeff Hammel <jhammel@mozilla.com>
parents:
52
diff
changeset
|
225 # get data for files |
52
a2f09d749a3f
work towards refactor letting links (and maybe other things in the future) dwell in a decoupage namespace
Jeff Hammel <jhammel@mozilla.com>
parents:
50
diff
changeset
|
226 filenames = os.listdir(directory) |
a2f09d749a3f
work towards refactor letting links (and maybe other things in the future) dwell in a decoupage namespace
Jeff Hammel <jhammel@mozilla.com>
parents:
50
diff
changeset
|
227 for i in filenames: |
48
af73a3fda723
add more metadata to files: modification time, type
Jeff Hammel <jhammel@mozilla.com>
parents:
43
diff
changeset
|
228 filepath = os.path.join(directory, i) |
af73a3fda723
add more metadata to files: modification time, type
Jeff Hammel <jhammel@mozilla.com>
parents:
43
diff
changeset
|
229 filetype = 'file' |
af73a3fda723
add more metadata to files: modification time, type
Jeff Hammel <jhammel@mozilla.com>
parents:
43
diff
changeset
|
230 if os.path.isdir(filepath): |
af73a3fda723
add more metadata to files: modification time, type
Jeff Hammel <jhammel@mozilla.com>
parents:
43
diff
changeset
|
231 filetype = 'directory' |
af73a3fda723
add more metadata to files: modification time, type
Jeff Hammel <jhammel@mozilla.com>
parents:
43
diff
changeset
|
232 modified = os.path.getmtime(filepath) |
af73a3fda723
add more metadata to files: modification time, type
Jeff Hammel <jhammel@mozilla.com>
parents:
43
diff
changeset
|
233 modified = datetime.fromtimestamp(modified) |
56
0cc1af24602b
dont show size for directories
Jeff Hammel <jhammel@mozilla.com>
parents:
52
diff
changeset
|
234 data = {'path' : '%s/%s' % (path.rstrip('/'), i), |
0cc1af24602b
dont show size for directories
Jeff Hammel <jhammel@mozilla.com>
parents:
52
diff
changeset
|
235 'name': i, |
0cc1af24602b
dont show size for directories
Jeff Hammel <jhammel@mozilla.com>
parents:
52
diff
changeset
|
236 'modified': modified, |
0cc1af24602b
dont show size for directories
Jeff Hammel <jhammel@mozilla.com>
parents:
52
diff
changeset
|
237 'type': filetype} |
0cc1af24602b
dont show size for directories
Jeff Hammel <jhammel@mozilla.com>
parents:
52
diff
changeset
|
238 if filetype == 'file': |
0cc1af24602b
dont show size for directories
Jeff Hammel <jhammel@mozilla.com>
parents:
52
diff
changeset
|
239 data['size'] = os.path.getsize(filepath) |
0cc1af24602b
dont show size for directories
Jeff Hammel <jhammel@mozilla.com>
parents:
52
diff
changeset
|
240 files.append(data) |
35
20e3d138dc98
better way of doing up; this breaks old behaviour so incrementing version
k0s <k0scist@gmail.com>
parents:
34
diff
changeset
|
241 |
20e3d138dc98
better way of doing up; this breaks old behaviour so incrementing version
k0s <k0scist@gmail.com>
parents:
34
diff
changeset
|
242 # TODO: deal with other links in conf |
52
a2f09d749a3f
work towards refactor letting links (and maybe other things in the future) dwell in a decoupage namespace
Jeff Hammel <jhammel@mozilla.com>
parents:
50
diff
changeset
|
243 for i in conf: |
a2f09d749a3f
work towards refactor letting links (and maybe other things in the future) dwell in a decoupage namespace
Jeff Hammel <jhammel@mozilla.com>
parents:
50
diff
changeset
|
244 if i in filenames or i.startswith('/'): |
a2f09d749a3f
work towards refactor letting links (and maybe other things in the future) dwell in a decoupage namespace
Jeff Hammel <jhammel@mozilla.com>
parents:
50
diff
changeset
|
245 continue |
a2f09d749a3f
work towards refactor letting links (and maybe other things in the future) dwell in a decoupage namespace
Jeff Hammel <jhammel@mozilla.com>
parents:
50
diff
changeset
|
246 if i.startswith('http://') or i.startswith('https://'): |
a2f09d749a3f
work towards refactor letting links (and maybe other things in the future) dwell in a decoupage namespace
Jeff Hammel <jhammel@mozilla.com>
parents:
50
diff
changeset
|
247 files.append({'path': i, |
a2f09d749a3f
work towards refactor letting links (and maybe other things in the future) dwell in a decoupage namespace
Jeff Hammel <jhammel@mozilla.com>
parents:
50
diff
changeset
|
248 'name': i, |
a2f09d749a3f
work towards refactor letting links (and maybe other things in the future) dwell in a decoupage namespace
Jeff Hammel <jhammel@mozilla.com>
parents:
50
diff
changeset
|
249 'type': link}) |
a2f09d749a3f
work towards refactor letting links (and maybe other things in the future) dwell in a decoupage namespace
Jeff Hammel <jhammel@mozilla.com>
parents:
50
diff
changeset
|
250 |
a2f09d749a3f
work towards refactor letting links (and maybe other things in the future) dwell in a decoupage namespace
Jeff Hammel <jhammel@mozilla.com>
parents:
50
diff
changeset
|
251 for f in files: |
a2f09d749a3f
work towards refactor letting links (and maybe other things in the future) dwell in a decoupage namespace
Jeff Hammel <jhammel@mozilla.com>
parents:
50
diff
changeset
|
252 f['description'] = conf.get(f['name'].lower(), None) |
35
20e3d138dc98
better way of doing up; this breaks old behaviour so incrementing version
k0s <k0scist@gmail.com>
parents:
34
diff
changeset
|
253 |
12
9f91acf9874c
* split on space in formatters to be consist with everything else
k0s <k0scist@gmail.com>
parents:
10
diff
changeset
|
254 return files |
9f91acf9874c
* split on space in formatters to be consist with everything else
k0s <k0scist@gmail.com>
parents:
10
diff
changeset
|
255 |
10 | 256 def conf(self, path, cascade=None): |
0
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
257 """returns configuration dictionary appropriate to a path""" |
10 | 258 if cascade is None: |
259 cascase = self.cascade | |
0
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
260 |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
261 directory = os.path.join(self.directory, path.strip('/')) |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
262 if path.strip('/'): |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
263 path_tuple = tuple(path.strip('/').split('/')) |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
264 else: |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
265 path_tuple = () |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
266 |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
267 # return cached configuration |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
268 if hasattr(self, '_conf') and path_tuple in self._conf: |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
269 return self._conf[path_tuple] |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
270 |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
271 conf = {} |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
272 |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
273 # local configuration |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
274 ini_path = os.path.join(directory, 'index.ini') |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
275 if os.path.exists(ini_path): |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
276 _conf = ConfigMunger(ini_path).dict() |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
277 if len(_conf) == 1: |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
278 conf = _conf[_conf.keys()[0]].copy() |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
279 |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
280 # global configuration |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
281 if not conf and self.configuration and os.path.exists(self.configuration): |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
282 conf = ConfigMunger(self.configuration).dict().get('/%s' % path.rstrip('/'), {}) |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
283 |
10 | 284 # inherit and cascade configuration |
285 inherit_directory = None | |
286 if '/inherit' in conf: | |
287 inherit_directory = conf['/inherit'] | |
288 elif self.cascade and path_tuple: | |
289 inherit_directory = '/%s' % '/'.join(path_tuple[:-1]) | |
290 if inherit_directory: | |
291 parent_configuration = self.conf(inherit_directory) | |
0
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
292 for key, value in parent_configuration.items(): |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
293 if key.startswith('/') and key not in conf: |
26
f306089d6def
now use contenttransformer to serve files if /transformer in directory configuration; TODO: cache on a per-directory basis
k0s <k0scist@gmail.com>
parents:
25
diff
changeset
|
294 conf[key] = value |
0
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
295 |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
296 # cache configuration |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
297 if not self.auto_reload: |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
298 if not hasattr(self, '_conf'): |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
299 self._conf = {} |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
300 self._conf[path_tuple] = conf |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
301 |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
302 return conf |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
303 |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
304 def fmtrs(self, path): |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
305 formatters = [] |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
306 for key, value in self.conf(path).items(): |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
307 if key.startswith('/'): |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
308 key = key[1:] |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
309 if key in self.formatters: |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
310 formatter = self.formatters[key](value) |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
311 |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
312 |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
313 def app_conf(self, keystr, app_conf): |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
314 keystr += '.' |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
315 return dict([(key.split(keystr, 1)[-1], value) |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
316 for key, value in app_conf.items() |
fa2005f769eb
adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
317 if key.startswith(keystr) ]) |