Mercurial > hg > decoupage

annotate decoupage/web.py @ 98:abf23c2e4e82

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make sure all hashes are ordered
author Jeff Hammel <k0scist@gmail.com>
date Mon, 22 Aug 2016 18:19:07 -0700
parents 21273cdb2047
children 82ee67b95a0c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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 """
87
ced29a73c561 decoupage/web.py
Jeff Hammel <k0scist@gmail.com>
parents: 85
diff changeset
2 decoupage: a dynamic file server
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
78
5330cd62e179 something about hash marks in filenames
Jeff Hammel <jhammel@mozilla.com>
parents: 76
diff changeset
5 # TODO:
92
c5895d87c65e lets get these ordered
Jeff Hammel <k0scist@gmail.com>
parents: 89
diff changeset
6
82
8596a1d97740 unicode
Jeff Hammel <jhammel@mozilla.com>
parents: 78
diff changeset
7 # handle files with `#`s like like `#index.ini`
78
5330cd62e179 something about hash marks in filenames
Jeff Hammel <jhammel@mozilla.com>
parents: 76
diff changeset
8 # -> http://k0s.org/portfolio/ideas/#index.ini#
5330cd62e179 something about hash marks in filenames
Jeff Hammel <jhammel@mozilla.com>
parents: 76
diff changeset
9 #
5330cd62e179 something about hash marks in filenames
Jeff Hammel <jhammel@mozilla.com>
parents: 76
diff changeset
10 # oops. Handle it better
5330cd62e179 something about hash marks in filenames
Jeff Hammel <jhammel@mozilla.com>
parents: 76
diff changeset
11 # - either # is a magic hide character
5330cd62e179 something about hash marks in filenames
Jeff Hammel <jhammel@mozilla.com>
parents: 76
diff changeset
12 # - or you urlescape that guy
5330cd62e179 something about hash marks in filenames
Jeff Hammel <jhammel@mozilla.com>
parents: 76
diff changeset
13
92
c5895d87c65e lets get these ordered
Jeff Hammel <k0scist@gmail.com>
parents: 89
diff changeset
14
0
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
15 import os
43
8621a6e2fe38 actual sane error handling that human beings can read and decipher
Jeff Hammel <jhammel@mozilla.com>
parents: 42
diff changeset
16 import sys
0
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
17
92
c5895d87c65e lets get these ordered
Jeff Hammel <k0scist@gmail.com>
parents: 89
diff changeset
18 from collections import OrderedDict
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
19 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
20 from contenttransformer.app import transformers
48
af73a3fda723 add more metadata to files: modification time, type
Jeff Hammel <jhammel@mozilla.com>
parents: 43
diff changeset
21 from datetime import datetime
10
a328cc9d2c74 * fix formatters
k0s <k0scist@gmail.com>
parents: 6
diff changeset
22 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
23 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
24 from genshi.template import TemplateLoader
21
64ae0d2f402b fix breakages
egj@egj-laptop
parents: 20
diff changeset
25 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
26 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
27 from martini.config import ConfigMunger
2
041958c8c8f2 use paste.fileapp as the fileserver
k0s <k0scist@gmail.com>
parents: 0
diff changeset
28 from paste.fileapp import FileApp
49
ac693b8df32c add idea of formats and json format
Jeff Hammel <jhammel@mozilla.com>
parents: 48
diff changeset
29 from pkg_resources import iter_entry_points
ac693b8df32c add idea of formats and json format
Jeff Hammel <jhammel@mozilla.com>
parents: 48
diff changeset
30 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
31 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
32 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
33
61
f5ca54558292 remove previous hacks
Jeff Hammel <jhammel@mozilla.com>
parents: 59
diff changeset
34 transformers = transformers()
84
95820b36d7e3 cli client
Jeff Hammel <jhammel@mozilla.com>
parents: 82
diff changeset
35 string = (str, unicode)
95820b36d7e3 cli client
Jeff Hammel <jhammel@mozilla.com>
parents: 82
diff changeset
36
96
21273cdb2047 minor polish
Jeff Hammel <k0scist@gmail.com>
parents: 92
diff changeset
37
0
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
38 class Decoupage(object):
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
39
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
40 ### class level variables
84
95820b36d7e3 cli client
Jeff Hammel <jhammel@mozilla.com>
parents: 82
diff changeset
41 defaults = { 'auto_reload': False,
0
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
42 'configuration': None,
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
43 'directory': None, # directory to serve
84
95820b36d7e3 cli client
Jeff Hammel <jhammel@mozilla.com>
parents: 82
diff changeset
44 'cascade': True, # whether to cascade configuration
0
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
45 'template': 'index.html', # XXX see below
82
8596a1d97740 unicode
Jeff Hammel <jhammel@mozilla.com>
parents: 78
diff changeset
46 'template_directories': '', # list of directories to look for templates
8596a1d97740 unicode
Jeff Hammel <jhammel@mozilla.com>
parents: 78
diff changeset
47 'charset': 'utf-8', # content encoding for index.html files; -> `Content-Type: text/html; charset=ISO-8859-1`
0
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
48 }
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
49
63
9c570aed2246 move app_conf parsing logic to factory.py
Jeff Hammel <jhammel@mozilla.com>
parents: 61
diff changeset
50 def __init__(self, **kw):
0
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
51
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
52 # set defaults from app configuration
84
95820b36d7e3 cli client
Jeff Hammel <jhammel@mozilla.com>
parents: 82
diff changeset
53 for key, default_value in self.defaults.items():
95820b36d7e3 cli client
Jeff Hammel <jhammel@mozilla.com>
parents: 82
diff changeset
54
95820b36d7e3 cli client
Jeff Hammel <jhammel@mozilla.com>
parents: 82
diff changeset
55 value = kw.get(key, default_value)
95820b36d7e3 cli client
Jeff Hammel <jhammel@mozilla.com>
parents: 82
diff changeset
56
95820b36d7e3 cli client
Jeff Hammel <jhammel@mozilla.com>
parents: 82
diff changeset
57 # handle non-string bools
95820b36d7e3 cli client
Jeff Hammel <jhammel@mozilla.com>
parents: 82
diff changeset
58 if isinstance(default_value, bool) and isinstance(value, string):
95820b36d7e3 cli client
Jeff Hammel <jhammel@mozilla.com>
parents: 82
diff changeset
59 value = {'true': True,
95820b36d7e3 cli client
Jeff Hammel <jhammel@mozilla.com>
parents: 82
diff changeset
60 'false': False}[value.lower()]
95820b36d7e3 cli client
Jeff Hammel <jhammel@mozilla.com>
parents: 82
diff changeset
61 # TODO: error handling for bad strings
95820b36d7e3 cli client
Jeff Hammel <jhammel@mozilla.com>
parents: 82
diff changeset
62
95820b36d7e3 cli client
Jeff Hammel <jhammel@mozilla.com>
parents: 82
diff changeset
63 setattr(self, key, value)
95820b36d7e3 cli client
Jeff Hammel <jhammel@mozilla.com>
parents: 82
diff changeset
64
0
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
65
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
66 # configure defaults
63
9c570aed2246 move app_conf parsing logic to factory.py
Jeff Hammel <jhammel@mozilla.com>
parents: 61
diff changeset
67 assert self.directory, "Decoupage: directory not specified"
0
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
68 self.directory = self.directory.rstrip(os.path.sep)
75
7db9d9b82a06 better error message
Jeff Hammel <jhammel@mozilla.com>
parents: 74
diff changeset
69 assert os.path.isdir(self.directory), "'%s' is not a directory" % self.directory
0
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
70 self.template_directories = self.template_directories.split() # no spaces in directory names, for now
30
81607129a45e better error message
egj@socialplanning.org
parents: 21
diff changeset
71
81607129a45e better error message
egj@socialplanning.org
parents: 21
diff changeset
72 for directory in self.template_directories:
81607129a45e better error message
egj@socialplanning.org
parents: 21
diff changeset
73 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
74
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
75 # static file server
61
f5ca54558292 remove previous hacks
Jeff Hammel <jhammel@mozilla.com>
parents: 59
diff changeset
76 self.fileserver = FileApp
49
ac693b8df32c add idea of formats and json format
Jeff Hammel <jhammel@mozilla.com>
parents: 48
diff changeset
77
ac693b8df32c add idea of formats and json format
Jeff Hammel <jhammel@mozilla.com>
parents: 48
diff changeset
78 # pluggable formats
63
9c570aed2246 move app_conf parsing logic to factory.py
Jeff Hammel <jhammel@mozilla.com>
parents: 61
diff changeset
79 s = 'format.'
9c570aed2246 move app_conf parsing logic to factory.py
Jeff Hammel <jhammel@mozilla.com>
parents: 61
diff changeset
80 _format_args = [ (i.split(s, 1)[-1], j) for i, j in kw.items()
59
07cf168aa98c make formats classes that can take arguments
Jeff Hammel <jhammel@mozilla.com>
parents: 56
diff changeset
81 if i.startswith(s) ]
07cf168aa98c make formats classes that can take arguments
Jeff Hammel <jhammel@mozilla.com>
parents: 56
diff changeset
82 format_args = {}
07cf168aa98c make formats classes that can take arguments
Jeff Hammel <jhammel@mozilla.com>
parents: 56
diff changeset
83 for i, j in _format_args:
07cf168aa98c make formats classes that can take arguments
Jeff Hammel <jhammel@mozilla.com>
parents: 56
diff changeset
84 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
85 format_name, var_name = i.split('.')
07cf168aa98c make formats classes that can take arguments
Jeff Hammel <jhammel@mozilla.com>
parents: 56
diff changeset
86 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
87 self.formats = {}
ac693b8df32c add idea of formats and json format
Jeff Hammel <jhammel@mozilla.com>
parents: 48
diff changeset
88 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
89 try:
59
07cf168aa98c make formats classes that can take arguments
Jeff Hammel <jhammel@mozilla.com>
parents: 56
diff changeset
90 _cls = _format.load()
07cf168aa98c make formats classes that can take arguments
Jeff Hammel <jhammel@mozilla.com>
parents: 56
diff changeset
91 _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
92 except Exception, e:
ac693b8df32c add idea of formats and json format
Jeff Hammel <jhammel@mozilla.com>
parents: 48
diff changeset
93 # record the error, but persist
ac693b8df32c add idea of formats and json format
Jeff Hammel <jhammel@mozilla.com>
parents: 48
diff changeset
94 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
95 print >> sys.stderr, e
ac693b8df32c add idea of formats and json format
Jeff Hammel <jhammel@mozilla.com>
parents: 48
diff changeset
96 continue
59
07cf168aa98c make formats classes that can take arguments
Jeff Hammel <jhammel@mozilla.com>
parents: 56
diff changeset
97 self.formats[_format.name] = _instance
70
262fb90a54b4 make template loading lenient and other fixes; bump version
Jeff Hammel <jhammel@mozilla.com>
parents: 69
diff changeset
98
0
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
99 # pluggable index data formatters
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
100 self.formatters = {}
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
101 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
102 try:
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
103 _formatter = formatter.load()
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
104 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
105 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
106 self.template_directories.append(template_dir)
49
ac693b8df32c add idea of formats and json format
Jeff Hammel <jhammel@mozilla.com>
parents: 48
diff changeset
107 except Exception, e:
ac693b8df32c add idea of formats and json format
Jeff Hammel <jhammel@mozilla.com>
parents: 48
diff changeset
108 # record the error, but persist
ac693b8df32c add idea of formats and json format
Jeff Hammel <jhammel@mozilla.com>
parents: 48
diff changeset
109 print >> sys.stderr, "Couldn't load formatter: %s" % formatter
74
dd7d385e11ea error and bump
Jeff Hammel <jhammel@mozilla.com>
parents: 73
diff changeset
110 print >> sys.stderr, e
70
262fb90a54b4 make template loading lenient and other fixes; bump version
Jeff Hammel <jhammel@mozilla.com>
parents: 69
diff changeset
111 continue
0
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
112 self.formatters[formatter.name] = _formatter
70
262fb90a54b4 make template loading lenient and other fixes; bump version
Jeff Hammel <jhammel@mozilla.com>
parents: 69
diff changeset
113
0
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
114 # template loader
70
262fb90a54b4 make template loading lenient and other fixes; bump version
Jeff Hammel <jhammel@mozilla.com>
parents: 69
diff changeset
115 self.loader = TemplateLoader(self.template_directories,
262fb90a54b4 make template loading lenient and other fixes; bump version
Jeff Hammel <jhammel@mozilla.com>
parents: 69
diff changeset
116 variable_lookup="lenient",
0
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
117 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
118
70
262fb90a54b4 make template loading lenient and other fixes; bump version
Jeff Hammel <jhammel@mozilla.com>
parents: 69
diff changeset
119
0
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
120 ### methods dealing with HTTP
70
262fb90a54b4 make template loading lenient and other fixes; bump version
Jeff Hammel <jhammel@mozilla.com>
parents: 69
diff changeset
121
0
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
122 def __call__(self, environ, start_response):
96
21273cdb2047 minor polish
Jeff Hammel <k0scist@gmail.com>
parents: 92
diff changeset
123 """WSGI application"""
64
613ffeec2be5 return exceptions rather than just raise them; needed for wsgiref and who knows what other servers
Jeff Hammel <jhammel@mozilla.com>
parents: 63
diff changeset
124
613ffeec2be5 return exceptions rather than just raise them; needed for wsgiref and who knows what other servers
Jeff Hammel <jhammel@mozilla.com>
parents: 63
diff changeset
125 # boilerplate: request and filename
0
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
126 request = Request(environ)
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
127 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
128 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
129
64
613ffeec2be5 return exceptions rather than just raise them; needed for wsgiref and who knows what other servers
Jeff Hammel <jhammel@mozilla.com>
parents: 63
diff changeset
130 # check to see what we have to serve
613ffeec2be5 return exceptions rather than just raise them; needed for wsgiref and who knows what other servers
Jeff Hammel <jhammel@mozilla.com>
parents: 63
diff changeset
131 if os.path.exists(path):
70
262fb90a54b4 make template loading lenient and other fixes; bump version
Jeff Hammel <jhammel@mozilla.com>
parents: 69
diff changeset
132
64
613ffeec2be5 return exceptions rather than just raise them; needed for wsgiref and who knows what other servers
Jeff Hammel <jhammel@mozilla.com>
parents: 63
diff changeset
133 if os.path.isdir(path):
613ffeec2be5 return exceptions rather than just raise them; needed for wsgiref and who knows what other servers
Jeff Hammel <jhammel@mozilla.com>
parents: 63
diff changeset
134 # serve an index
613ffeec2be5 return exceptions rather than just raise them; needed for wsgiref and who knows what other servers
Jeff Hammel <jhammel@mozilla.com>
parents: 63
diff changeset
135 if request.path_info.endswith('/'):
613ffeec2be5 return exceptions rather than just raise them; needed for wsgiref and who knows what other servers
Jeff Hammel <jhammel@mozilla.com>
parents: 63
diff changeset
136 res = self.get(request)
613ffeec2be5 return exceptions rather than just raise them; needed for wsgiref and who knows what other servers
Jeff Hammel <jhammel@mozilla.com>
parents: 63
diff changeset
137 else:
613ffeec2be5 return exceptions rather than just raise them; needed for wsgiref and who knows what other servers
Jeff Hammel <jhammel@mozilla.com>
parents: 63
diff changeset
138 res = exc.HTTPMovedPermanently(add_slash=True)
613ffeec2be5 return exceptions rather than just raise them; needed for wsgiref and who knows what other servers
Jeff Hammel <jhammel@mozilla.com>
parents: 63
diff changeset
139 return res(environ, start_response)
0
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 else:
64
613ffeec2be5 return exceptions rather than just raise them; needed for wsgiref and who knows what other servers
Jeff Hammel <jhammel@mozilla.com>
parents: 63
diff changeset
142 # serve a file
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
143 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
144 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
145 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
146 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
147 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
148 if i.startswith('/'):
61
f5ca54558292 remove previous hacks
Jeff Hammel <jhammel@mozilla.com>
parents: 59
diff changeset
149 name = i[1:]
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
150 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
151 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
152 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
153 else:
61
f5ca54558292 remove previous hacks
Jeff Hammel <jhammel@mozilla.com>
parents: 59
diff changeset
154 fileserver = self.fileserver
70
262fb90a54b4 make template loading lenient and other fixes; bump version
Jeff Hammel <jhammel@mozilla.com>
parents: 69
diff changeset
155
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
156 fileserver = fileserver(path)
2
041958c8c8f2 use paste.fileapp as the fileserver
k0s <k0scist@gmail.com>
parents: 0
diff changeset
157 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
158 else:
64
613ffeec2be5 return exceptions rather than just raise them; needed for wsgiref and who knows what other servers
Jeff Hammel <jhammel@mozilla.com>
parents: 63
diff changeset
159 # file does not exist
73
12ee37017538 introduce templated 404s; works, just doesnt do anything yet
Jeff Hammel <jhammel@mozilla.com>
parents: 70
diff changeset
160 conf = self.conf('/')
12ee37017538 introduce templated 404s; works, just doesnt do anything yet
Jeff Hammel <jhammel@mozilla.com>
parents: 70
diff changeset
161 data = dict(request=request,
12ee37017538 introduce templated 404s; works, just doesnt do anything yet
Jeff Hammel <jhammel@mozilla.com>
parents: 70
diff changeset
162 title="Not Found")
12ee37017538 introduce templated 404s; works, just doesnt do anything yet
Jeff Hammel <jhammel@mozilla.com>
parents: 70
diff changeset
163 template = self.loader.load('HTTPNotFound.html')
12ee37017538 introduce templated 404s; works, just doesnt do anything yet
Jeff Hammel <jhammel@mozilla.com>
parents: 70
diff changeset
164 body = template.generate(**data).render('html', doctype='html')
12ee37017538 introduce templated 404s; works, just doesnt do anything yet
Jeff Hammel <jhammel@mozilla.com>
parents: 70
diff changeset
165 response = Response(content_type='text/html', body=body, status=404)
64
613ffeec2be5 return exceptions rather than just raise them; needed for wsgiref and who knows what other servers
Jeff Hammel <jhammel@mozilla.com>
parents: 63
diff changeset
166 return response(environ, start_response)
0
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
167
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
168
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
169 def get(self, request):
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
170 """
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
171 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
172 """
70
262fb90a54b4 make template loading lenient and other fixes; bump version
Jeff Hammel <jhammel@mozilla.com>
parents: 69
diff changeset
173
262fb90a54b4 make template loading lenient and other fixes; bump version
Jeff Hammel <jhammel@mozilla.com>
parents: 69
diff changeset
174 # ensure a sane path
0
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
175 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
176 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
177 path = '/%s' % path
70
262fb90a54b4 make template loading lenient and other fixes; bump version
Jeff Hammel <jhammel@mozilla.com>
parents: 69
diff changeset
178
0
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
179 # get the configuraton
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
180 conf = self.conf(path)
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
181
33
e384d4569ac3 include components necessary to make decoupage feel almost like a framework
k0s <k0scist@gmail.com>
parents: 26
diff changeset
182 ### 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
183 # 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
184 files = self.filedata(path, directory, conf)
96
21273cdb2047 minor polish
Jeff Hammel <k0scist@gmail.com>
parents: 92
diff changeset
185 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
186
65
ac1dc088e37e add inclusion template
Jeff Hammel <jhammel@mozilla.com>
parents: 64
diff changeset
187 # add a function to get the path to files
ac1dc088e37e add inclusion template
Jeff Hammel <jhammel@mozilla.com>
parents: 64
diff changeset
188 data['filepath'] = lambda *segments: os.path.join(*([directory] + list(segments)))
ac1dc088e37e add inclusion template
Jeff Hammel <jhammel@mozilla.com>
parents: 64
diff changeset
189
70
262fb90a54b4 make template loading lenient and other fixes; bump version
Jeff Hammel <jhammel@mozilla.com>
parents: 69
diff changeset
190 # defaults
15
8923fda80bd4 misspelling
k0s <k0scist@gmail.com>
parents: 14
diff changeset
191 data['directory'] = directory
14
4ca2530f8be1 stub for putting stylesheets and includes on templates"
k0s <k0scist@gmail.com>
parents: 13
diff changeset
192 data['css'] = ()
33
e384d4569ac3 include components necessary to make decoupage feel almost like a framework
k0s <k0scist@gmail.com>
parents: 26
diff changeset
193 data['scripts'] = ()
0
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
194
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
195 # apply formatters
85
3262010f7f79 add command line serving
Jeff Hammel <jhammel@mozilla.com>
parents: 84
diff changeset
196 formatters = self.get_formatters(path)
3262010f7f79 add command line serving
Jeff Hammel <jhammel@mozilla.com>
parents: 84
diff changeset
197 for formatter in formatters:
0
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
198 formatter(request, data)
10
a328cc9d2c74 * fix formatters
k0s <k0scist@gmail.com>
parents: 6
diff changeset
199
49
ac693b8df32c add idea of formats and json format
Jeff Hammel <jhammel@mozilla.com>
parents: 48
diff changeset
200 # return an alternate format if specified
ac693b8df32c add idea of formats and json format
Jeff Hammel <jhammel@mozilla.com>
parents: 48
diff changeset
201 # decoupage.formats should return a 2-tuple:
ac693b8df32c add idea of formats and json format
Jeff Hammel <jhammel@mozilla.com>
parents: 48
diff changeset
202 # (content_type, body)
ac693b8df32c add idea of formats and json format
Jeff Hammel <jhammel@mozilla.com>
parents: 48
diff changeset
203 if 'format' in request.GET:
ac693b8df32c add idea of formats and json format
Jeff Hammel <jhammel@mozilla.com>
parents: 48
diff changeset
204 format_name = request.GET['format']
ac693b8df32c add idea of formats and json format
Jeff Hammel <jhammel@mozilla.com>
parents: 48
diff changeset
205 if format_name in self.formats:
59
07cf168aa98c make formats classes that can take arguments
Jeff Hammel <jhammel@mozilla.com>
parents: 56
diff changeset
206 _format = self.formats[format_name]
07cf168aa98c make formats classes that can take arguments
Jeff Hammel <jhammel@mozilla.com>
parents: 56
diff changeset
207 content_type, body = _format(request, data)
49
ac693b8df32c add idea of formats and json format
Jeff Hammel <jhammel@mozilla.com>
parents: 48
diff changeset
208 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
209
0
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
210 # render the template
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
211 template = conf.get('/template')
69
9fac58348520 whitespace cleanup
Jeff Hammel <jhammel@mozilla.com>
parents: 65
diff changeset
212 local_index = False
0
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
213 if template is None:
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
214 if 'index.html' in [ f['name'] for f in files ]:
20
c17595c824a7 try to fail gracefully if index.html exists
egj@egj-laptop
parents: 15
diff changeset
215 local_index = os.path.join(directory, 'index.html')
c17595c824a7 try to fail gracefully if index.html exists
egj@egj-laptop
parents: 15
diff changeset
216 template = local_index
0
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
217 else:
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
218 template = self.template
13
ab0c2bb4d23d * get the templates in the correct way
k0s <k0scist@gmail.com>
parents: 12
diff changeset
219 else:
ab0c2bb4d23d * get the templates in the correct way
k0s <k0scist@gmail.com>
parents: 12
diff changeset
220 if not os.path.isabs(template):
ab0c2bb4d23d * get the templates in the correct way
k0s <k0scist@gmail.com>
parents: 12
diff changeset
221 _template = os.path.join(directory, template)
ab0c2bb4d23d * get the templates in the correct way
k0s <k0scist@gmail.com>
parents: 12
diff changeset
222 if os.path.exists(_template):
ab0c2bb4d23d * get the templates in the correct way
k0s <k0scist@gmail.com>
parents: 12
diff changeset
223 template = _template
ab0c2bb4d23d * get the templates in the correct way
k0s <k0scist@gmail.com>
parents: 12
diff changeset
224 else:
65
ac1dc088e37e add inclusion template
Jeff Hammel <jhammel@mozilla.com>
parents: 64
diff changeset
225 for _directory in self.template_directories:
ac1dc088e37e add inclusion template
Jeff Hammel <jhammel@mozilla.com>
parents: 64
diff changeset
226 if template in os.listdir(_directory):
13
ab0c2bb4d23d * get the templates in the correct way
k0s <k0scist@gmail.com>
parents: 12
diff changeset
227 break
ab0c2bb4d23d * get the templates in the correct way
k0s <k0scist@gmail.com>
parents: 12
diff changeset
228 else:
ab0c2bb4d23d * get the templates in the correct way
k0s <k0scist@gmail.com>
parents: 12
diff changeset
229 raise IOError("template %s not found" % template)
20
c17595c824a7 try to fail gracefully if index.html exists
egj@egj-laptop
parents: 15
diff changeset
230 try:
21
64ae0d2f402b fix breakages
egj@egj-laptop
parents: 20
diff changeset
231 template = self.loader.load(template)
20
c17595c824a7 try to fail gracefully if index.html exists
egj@egj-laptop
parents: 15
diff changeset
232 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
233 except (TemplateError, TemplateSyntaxError), e:
20
c17595c824a7 try to fail gracefully if index.html exists
egj@egj-laptop
parents: 15
diff changeset
234 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
235 print repr(e)
20
c17595c824a7 try to fail gracefully if index.html exists
egj@egj-laptop
parents: 15
diff changeset
236 return self.fileserver(local_index)
c17595c824a7 try to fail gracefully if index.html exists
egj@egj-laptop
parents: 15
diff changeset
237 raise
c17595c824a7 try to fail gracefully if index.html exists
egj@egj-laptop
parents: 15
diff changeset
238
82
8596a1d97740 unicode
Jeff Hammel <jhammel@mozilla.com>
parents: 78
diff changeset
239 # set charset if given
8596a1d97740 unicode
Jeff Hammel <jhammel@mozilla.com>
parents: 78
diff changeset
240 kw = {}
8596a1d97740 unicode
Jeff Hammel <jhammel@mozilla.com>
parents: 78
diff changeset
241 if self.charset:
8596a1d97740 unicode
Jeff Hammel <jhammel@mozilla.com>
parents: 78
diff changeset
242 kw['charset'] = self.charset
8596a1d97740 unicode
Jeff Hammel <jhammel@mozilla.com>
parents: 78
diff changeset
243
48
af73a3fda723 add more metadata to files: modification time, type
Jeff Hammel <jhammel@mozilla.com>
parents: 43
diff changeset
244 # return response
82
8596a1d97740 unicode
Jeff Hammel <jhammel@mozilla.com>
parents: 78
diff changeset
245 return Response(content_type='text/html', body=res, **kw)
25
d5775f3667a2 remove pointless get_response method
k0s <k0scist@gmail.com>
parents: 21
diff changeset
246
0
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
247
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
248 ### internal methods
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
249
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
250 def filedata(self, path, directory, conf=None):
92
c5895d87c65e lets get these ordered
Jeff Hammel <k0scist@gmail.com>
parents: 89
diff changeset
251 conf = conf or OrderedDict()
12
9f91acf9874c * split on space in formatters to be consist with everything else
k0s <k0scist@gmail.com>
parents: 10
diff changeset
252 files = []
56
0cc1af24602b dont show size for directories
Jeff Hammel <jhammel@mozilla.com>
parents: 52
diff changeset
253
0cc1af24602b dont show size for directories
Jeff Hammel <jhammel@mozilla.com>
parents: 52
diff changeset
254 # 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
255 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
256 for i in filenames:
48
af73a3fda723 add more metadata to files: modification time, type
Jeff Hammel <jhammel@mozilla.com>
parents: 43
diff changeset
257 filepath = os.path.join(directory, i)
af73a3fda723 add more metadata to files: modification time, type
Jeff Hammel <jhammel@mozilla.com>
parents: 43
diff changeset
258 filetype = 'file'
af73a3fda723 add more metadata to files: modification time, type
Jeff Hammel <jhammel@mozilla.com>
parents: 43
diff changeset
259 if os.path.isdir(filepath):
af73a3fda723 add more metadata to files: modification time, type
Jeff Hammel <jhammel@mozilla.com>
parents: 43
diff changeset
260 filetype = 'directory'
76
Jeff Hammel <jhammel@mozilla.com>
parents: 75
diff changeset
261 try:
Jeff Hammel <jhammel@mozilla.com>
parents: 75
diff changeset
262 modified = os.path.getmtime(filepath)
Jeff Hammel <jhammel@mozilla.com>
parents: 75
diff changeset
263 except OSError:
Jeff Hammel <jhammel@mozilla.com>
parents: 75
diff changeset
264 # the file (mysteriously) may not exist by this time(!)
Jeff Hammel <jhammel@mozilla.com>
parents: 75
diff changeset
265 # File "/home/jhammel/web/src/decoupage/decoupage/web.py", line 114, in __call__
Jeff Hammel <jhammel@mozilla.com>
parents: 75
diff changeset
266 # res = self.get(request)
Jeff Hammel <jhammel@mozilla.com>
parents: 75
diff changeset
267 # File "/home/jhammel/web/src/decoupage/decoupage/web.py", line 162, in get
Jeff Hammel <jhammel@mozilla.com>
parents: 75
diff changeset
268 # files = self.filedata(path, directory, conf)
Jeff Hammel <jhammel@mozilla.com>
parents: 75
diff changeset
269 # File "/home/jhammel/web/src/decoupage/decoupage/web.py", line 246, in filedata
Jeff Hammel <jhammel@mozilla.com>
parents: 75
diff changeset
270 # modified = os.path.getmtime(filepath)
Jeff Hammel <jhammel@mozilla.com>
parents: 75
diff changeset
271 # File "/home/jhammel/web/lib/python2.6/genericpath.py", line 54, in getmtime
Jeff Hammel <jhammel@mozilla.com>
parents: 75
diff changeset
272 # return os.stat(filename).st_mtime
Jeff Hammel <jhammel@mozilla.com>
parents: 75
diff changeset
273 # OSError: [Errno 2] No such file or directory: '/home/jhammel/web/site/portfolio/ideas/.#index.ini'
Jeff Hammel <jhammel@mozilla.com>
parents: 75
diff changeset
274 continue # wt{h,f}???
Jeff Hammel <jhammel@mozilla.com>
parents: 75
diff changeset
275
48
af73a3fda723 add more metadata to files: modification time, type
Jeff Hammel <jhammel@mozilla.com>
parents: 43
diff changeset
276 modified = datetime.fromtimestamp(modified)
56
0cc1af24602b dont show size for directories
Jeff Hammel <jhammel@mozilla.com>
parents: 52
diff changeset
277 data = {'path' : '%s/%s' % (path.rstrip('/'), i),
0cc1af24602b dont show size for directories
Jeff Hammel <jhammel@mozilla.com>
parents: 52
diff changeset
278 'name': i,
0cc1af24602b dont show size for directories
Jeff Hammel <jhammel@mozilla.com>
parents: 52
diff changeset
279 'modified': modified,
0cc1af24602b dont show size for directories
Jeff Hammel <jhammel@mozilla.com>
parents: 52
diff changeset
280 'type': filetype}
0cc1af24602b dont show size for directories
Jeff Hammel <jhammel@mozilla.com>
parents: 52
diff changeset
281 if filetype == 'file':
0cc1af24602b dont show size for directories
Jeff Hammel <jhammel@mozilla.com>
parents: 52
diff changeset
282 data['size'] = os.path.getsize(filepath)
0cc1af24602b dont show size for directories
Jeff Hammel <jhammel@mozilla.com>
parents: 52
diff changeset
283 files.append(data)
69
9fac58348520 whitespace cleanup
Jeff Hammel <jhammel@mozilla.com>
parents: 65
diff changeset
284
35
20e3d138dc98 better way of doing up; this breaks old behaviour so incrementing version
k0s <k0scist@gmail.com>
parents: 34
diff changeset
285 # 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
286 for i in conf:
98
abf23c2e4e82 make sure all hashes are ordered
Jeff Hammel <k0scist@gmail.com>
parents: 96
diff changeset
287
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
288 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
289 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
290 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
291 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
292 '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
293 'type': link})
69
9fac58348520 whitespace cleanup
Jeff Hammel <jhammel@mozilla.com>
parents: 65
diff changeset
294
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
295 for f in files:
61
f5ca54558292 remove previous hacks
Jeff Hammel <jhammel@mozilla.com>
parents: 59
diff changeset
296 f['description'] = conf.get(f['name'], None)
35
20e3d138dc98 better way of doing up; this breaks old behaviour so incrementing version
k0s <k0scist@gmail.com>
parents: 34
diff changeset
297
12
9f91acf9874c * split on space in formatters to be consist with everything else
k0s <k0scist@gmail.com>
parents: 10
diff changeset
298 return files
9f91acf9874c * split on space in formatters to be consist with everything else
k0s <k0scist@gmail.com>
parents: 10
diff changeset
299
10
a328cc9d2c74 * fix formatters
k0s <k0scist@gmail.com>
parents: 6
diff changeset
300 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
301 """returns configuration dictionary appropriate to a path"""
10
a328cc9d2c74 * fix formatters
k0s <k0scist@gmail.com>
parents: 6
diff changeset
302 if cascade is None:
a328cc9d2c74 * fix formatters
k0s <k0scist@gmail.com>
parents: 6
diff changeset
303 cascase = self.cascade
0
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
304
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
305 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
306 if path.strip('/'):
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
307 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
308 else:
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
309 path_tuple = ()
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
310
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
311 # return cached configuration
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
312 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
313 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
314
92
c5895d87c65e lets get these ordered
Jeff Hammel <k0scist@gmail.com>
parents: 89
diff changeset
315 conf = OrderedDict()
0
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
316
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
317 # local configuration
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
318 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
319 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
320 _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
321 if len(_conf) == 1:
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
322 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
323
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
324 # global configuration
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
325 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
326 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
327
10
a328cc9d2c74 * fix formatters
k0s <k0scist@gmail.com>
parents: 6
diff changeset
328 # inherit and cascade configuration
a328cc9d2c74 * fix formatters
k0s <k0scist@gmail.com>
parents: 6
diff changeset
329 inherit_directory = None
a328cc9d2c74 * fix formatters
k0s <k0scist@gmail.com>
parents: 6
diff changeset
330 if '/inherit' in conf:
a328cc9d2c74 * fix formatters
k0s <k0scist@gmail.com>
parents: 6
diff changeset
331 inherit_directory = conf['/inherit']
a328cc9d2c74 * fix formatters
k0s <k0scist@gmail.com>
parents: 6
diff changeset
332 elif self.cascade and path_tuple:
a328cc9d2c74 * fix formatters
k0s <k0scist@gmail.com>
parents: 6
diff changeset
333 inherit_directory = '/%s' % '/'.join(path_tuple[:-1])
a328cc9d2c74 * fix formatters
k0s <k0scist@gmail.com>
parents: 6
diff changeset
334 if inherit_directory:
a328cc9d2c74 * fix formatters
k0s <k0scist@gmail.com>
parents: 6
diff changeset
335 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
336 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
337 if key.startswith('/') and key not in conf:
69
9fac58348520 whitespace cleanup
Jeff Hammel <jhammel@mozilla.com>
parents: 65
diff changeset
338 conf[key] = value
0
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
339
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
340 # cache configuration
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
341 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
342 if not hasattr(self, '_conf'):
98
abf23c2e4e82 make sure all hashes are ordered
Jeff Hammel <k0scist@gmail.com>
parents: 96
diff changeset
343 self._conf = OrderedDict()
0
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
344 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
345
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
346 return conf
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
347
85
3262010f7f79 add command line serving
Jeff Hammel <jhammel@mozilla.com>
parents: 84
diff changeset
348 def get_formatters(self, path):
3262010f7f79 add command line serving
Jeff Hammel <jhammel@mozilla.com>
parents: 84
diff changeset
349 """return formatters for a path"""
3262010f7f79 add command line serving
Jeff Hammel <jhammel@mozilla.com>
parents: 84
diff changeset
350 retval = []
3262010f7f79 add command line serving
Jeff Hammel <jhammel@mozilla.com>
parents: 84
diff changeset
351 conf = self.conf(path)
3262010f7f79 add command line serving
Jeff Hammel <jhammel@mozilla.com>
parents: 84
diff changeset
352 # apply formatters
3262010f7f79 add command line serving
Jeff Hammel <jhammel@mozilla.com>
parents: 84
diff changeset
353 # XXX this should be cached if not self.auto_reload
3262010f7f79 add command line serving
Jeff Hammel <jhammel@mozilla.com>
parents: 84
diff changeset
354 if '/formatters' in conf:
3262010f7f79 add command line serving
Jeff Hammel <jhammel@mozilla.com>
parents: 84
diff changeset
355 # ordered list of formatters to be applied first
3262010f7f79 add command line serving
Jeff Hammel <jhammel@mozilla.com>
parents: 84
diff changeset
356 formatters = [ i for i in conf['/formatters'].split()
3262010f7f79 add command line serving
Jeff Hammel <jhammel@mozilla.com>
parents: 84
diff changeset
357 if i in self.formatters ]
3262010f7f79 add command line serving
Jeff Hammel <jhammel@mozilla.com>
parents: 84
diff changeset
358 else:
3262010f7f79 add command line serving
Jeff Hammel <jhammel@mozilla.com>
parents: 84
diff changeset
359 formatters = []
3262010f7f79 add command line serving
Jeff Hammel <jhammel@mozilla.com>
parents: 84
diff changeset
360 for key in conf:
0
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
361 if key.startswith('/'):
fa2005f769eb adding decoupage from http://my-svn.assembla.com/svn/arbez/decoupage r355
k0s <k0scist@gmail.com>
parents:
diff changeset
362 key = key[1:]
85
3262010f7f79 add command line serving
Jeff Hammel <jhammel@mozilla.com>
parents: 84
diff changeset
363 if key in self.formatters and key not in formatters:
3262010f7f79 add command line serving
Jeff Hammel <jhammel@mozilla.com>
parents: 84
diff changeset
364 formatters.append(key)
3262010f7f79 add command line serving
Jeff Hammel <jhammel@mozilla.com>
parents: 84
diff changeset
365 for name in formatters:
3262010f7f79 add command line serving
Jeff Hammel <jhammel@mozilla.com>
parents: 84
diff changeset
366 retval.append(self.formatters[name](conf.get('/%s' % name, '')))
89
fca150947fb1 STUB: decoupage/web.py
Jeff Hammel <k0scist@gmail.com>
parents: 87
diff changeset
367 return retval