Mercurial > cgi-bin > hgweb.cgi > tincan
annotate tincan.py @ 22:f6a1492fe56e draft
Template loading (includes) pass all tests.
| author | David Barts <n5jrn@me.com> |
|---|---|
| date | Tue, 21 May 2019 16:01:53 -0700 |
| parents | ca2029ce95c7 |
| children | e8b6ee7e5b6b 4c6d3704e51f |
| rev | line source |
|---|---|
| 0 | 1 #!/usr/bin/env python3 |
| 2 # -*- coding: utf-8 -*- | |
| 3 # As with Bottle, it's all in one big, ugly file. For now. | |
| 4 | |
| 5 # I m p o r t s | |
| 6 | |
| 7 import os, sys | |
| 8 import ast | |
| 9 import binascii | |
| 10 from base64 import b16encode, b16decode | |
|
4
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
11 import functools |
| 2 | 12 import importlib |
|
4
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
13 from inspect import isclass |
| 0 | 14 import io |
| 2 | 15 import py_compile |
| 16 from stat import S_ISDIR, S_ISREG | |
| 5 | 17 from string import whitespace |
|
17
8186de188daf
Improve the run-time error handling in code-behinds.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
18 import traceback |
|
8186de188daf
Improve the run-time error handling in code-behinds.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
19 import urllib |
| 0 | 20 |
|
21
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
21 from chameleon import PageTemplate, PageTemplateFile |
| 0 | 22 import bottle |
| 23 | |
| 2 | 24 # E x c e p t i o n s |
| 0 | 25 |
| 26 class TinCanException(Exception): | |
| 27 """ | |
| 28 The parent class of all exceptions we raise. | |
| 29 """ | |
| 30 pass | |
| 31 | |
|
9
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
32 class TemplateHeaderError(TinCanException): |
| 0 | 33 """ |
| 34 Raised upon encountering a syntax error in the template headers. | |
| 35 """ | |
| 36 def __init__(self, message, line): | |
| 37 super().__init__(message, line) | |
| 38 self.message = message | |
| 39 self.line = line | |
| 40 | |
| 41 def __str__(self): | |
|
4
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
42 return "line {0}: {1}".format(self.line, self.message) |
| 0 | 43 |
| 44 class ForwardException(TinCanException): | |
| 45 """ | |
| 46 Raised to effect the flow control needed to do a forward (server-side | |
| 47 redirect). It is ugly to do this, but other Python frameworks do and | |
| 48 there seems to be no good alternative. | |
| 49 """ | |
| 50 def __init__(self, target): | |
| 51 self.target = target | |
| 52 | |
| 53 class TinCanError(TinCanException): | |
| 54 """ | |
| 55 General-purpose exception thrown by TinCan when things go wrong, often | |
| 56 when attempting to launch webapps. | |
| 57 """ | |
| 58 pass | |
| 59 | |
| 2 | 60 # T e m p l a t e s |
| 61 # | |
| 0 | 62 # Template (.pspx) files. These are standard templates for a supported |
| 63 # template engine, but with an optional set of header lines that begin | |
| 64 # with '#'. | |
| 65 | |
| 66 class TemplateFile(object): | |
| 67 """ | |
| 68 Parse a template file into a header part and the body part. The header | |
| 69 is always a leading set of lines, each starting with '#', that is of the | |
| 70 same format regardless of the template body. The template body varies | |
| 71 depending on the selected templating engine. The body part has | |
| 72 each header line replaced by a blank line. This preserves the overall | |
| 73 line numbering when processing the body. The added newlines are normally | |
| 74 stripped out before the rendered page is sent back to the client. | |
| 75 """ | |
| 5 | 76 _END = "#end" |
| 77 _LEND = len(_END) | |
| 78 _WS = set(whitespace) | |
| 79 | |
| 0 | 80 def __init__(self, raw, encoding='utf-8'): |
| 81 if isinstance(raw, io.TextIOBase): | |
| 82 self._do_init(raw) | |
| 83 elif isinstance(raw, str): | |
| 84 with open(raw, "r", encoding=encoding) as fp: | |
| 85 self._do_init(fp) | |
| 86 else: | |
| 87 raise TypeError("Expecting a string or Text I/O object.") | |
| 88 | |
| 89 def _do_init(self, fp): | |
| 90 self._hbuf = [] | |
| 91 self._bbuf = [] | |
| 92 self._state = self._header | |
| 93 while True: | |
| 94 line = fp.readline() | |
| 95 if line == '': | |
| 96 break | |
| 97 self._state(line) | |
| 98 self.header = ''.join(self._hbuf) | |
| 99 self.body = ''.join(self._bbuf) | |
| 100 | |
| 101 def _header(self, line): | |
| 102 if not line.startswith('#'): | |
| 103 self._state = self._body | |
| 104 self._state(line) | |
| 105 return | |
| 5 | 106 if line.startswith(self._END) and (len(line) == self._LEND or line[self._LEND] in self._WS): |
| 107 self._state = self._body | |
| 0 | 108 self._hbuf.append(line) |
| 109 self._bbuf.append("\n") | |
| 110 | |
| 111 def _body(self, line): | |
| 112 self._bbuf.append(line) | |
| 113 | |
| 114 class TemplateHeader(object): | |
| 115 """ | |
| 116 Parses and represents a set of header lines. | |
| 117 """ | |
| 2 | 118 _NAMES = [ "errors", "forward", "methods", "python", "template" ] |
| 0 | 119 _FNAMES = [ "hidden" ] |
| 120 | |
| 121 def __init__(self, string): | |
| 122 # Initialize our state | |
| 123 for i in self._NAMES: | |
| 124 setattr(self, i, None) | |
| 125 for i in self._FNAMES: | |
| 126 setattr(self, i, False) | |
| 127 # Parse the string | |
| 128 count = 0 | |
| 129 nameset = set(self._NAMES + self._FNAMES) | |
| 130 seen = set() | |
| 131 lines = string.split("\n") | |
| 132 if lines and lines[-1] == "": | |
| 133 del lines[-1] | |
| 134 for line in lines: | |
| 135 # Get line | |
| 136 count += 1 | |
| 137 if not line.startswith("#"): | |
|
9
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
138 raise TemplateHeaderError("Does not start with '#'.", count) |
| 0 | 139 try: |
| 140 rna, rpa = line.split(maxsplit=1) | |
| 141 except ValueError: | |
| 5 | 142 rna = line.rstrip() |
| 143 rpa = None | |
| 0 | 144 # Get name, ignoring remarks. |
| 145 name = rna[1:] | |
| 146 if name == "rem": | |
| 147 continue | |
| 5 | 148 if name == "end": |
| 149 break | |
| 0 | 150 if name not in nameset: |
|
9
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
151 raise TemplateHeaderError("Invalid directive: {0!r}".format(rna), count) |
| 0 | 152 if name in seen: |
|
9
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
153 raise TemplateHeaderError("Duplicate {0!r} directive.".format(rna), count) |
| 0 | 154 seen.add(name) |
| 155 # Flags | |
| 5 | 156 if name in self._FNAMES: |
| 0 | 157 setattr(self, name, True) |
| 158 continue | |
| 159 # Get parameter | |
| 5 | 160 if rpa is None: |
|
9
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
161 raise TemplateHeaderError("Missing parameter.", count) |
| 0 | 162 param = rpa.strip() |
| 163 for i in [ "'", '"']: | |
| 164 if param.startswith(i) and param.endswith(i): | |
| 165 param = ast.literal_eval(param) | |
| 166 break | |
| 167 # Update this object | |
| 168 setattr(self, name, param) | |
| 169 | |
|
21
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
170 # C h a m e l e o n ( B o t t l e ) |
| 2 | 171 # |
|
21
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
172 # Support for Chameleon templates (the kind TinCan uses by default). This |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
173 # allows the usage of Chameleon with Bottle itself. It is here as a |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
174 # convenience for those using Bottle routes as well as TinCan webapps; |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
175 # this is NOT how Tincan uses Chameleon |
| 0 | 176 |
| 177 class ChameleonTemplate(bottle.BaseTemplate): | |
| 178 def prepare(self, **options): | |
| 179 if self.source: | |
|
4
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
180 self.tpl = PageTemplate(self.source, encoding=self.encoding, |
|
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
181 **options) |
| 0 | 182 else: |
|
4
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
183 self.tpl = PageTemplateFile(self.filename, encoding=self.encoding, |
|
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
184 search_path=self.lookup, **options) |
| 0 | 185 |
| 186 def render(self, *args, **kwargs): | |
| 187 for dictarg in args: | |
| 188 kwargs.update(dictarg) | |
| 189 _defaults = self.defaults.copy() | |
| 190 _defaults.update(kwargs) | |
| 191 return self.tpl.render(**_defaults) | |
| 192 | |
|
4
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
193 chameleon_template = functools.partial(bottle.template, template_adapter=ChameleonTemplate) |
|
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
194 chameleon_view = functools.partial(bottle.view, template_adapter=ChameleonTemplate) |
| 0 | 195 |
|
21
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
196 # C h a m e l e o n ( T i n c a n ) |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
197 # |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
198 # How we use Chameleon ourselves. Everything is loaded as a string, and we |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
199 # provide convenience routines to load other templates. |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
200 |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
201 class TinCanChameleon(PageTemplate): |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
202 """ |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
203 Basically, a standard PageTemplate with load and lload functionality. |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
204 """ |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
205 def __init__(self, body, base=None, subdir=None, **config): |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
206 super(TinCanChameleon, self).__init__(body, **config) |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
207 if base is not None: |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
208 encoding = config.get("encoding", "utf-8") |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
209 if subdir is not None: |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
210 self.expression_types['load'] = \ |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
211 _LoaderFactory(base, subdir, encoding) |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
212 self.expression_types['lload'] = \ |
|
22
f6a1492fe56e
Template loading (includes) pass all tests.
David Barts <n5jrn@me.com>
parents:
21
diff
changeset
|
213 _LoaderFactory(os.path.join(base,_WINF,"tlib"), [], encoding) |
|
21
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
214 |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
215 class _LoaderFactory(object): |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
216 """ |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
217 One of two helper classes for the above. |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
218 """ |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
219 def __init__(self, base, subdir, encoding): |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
220 self.base = base |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
221 self.subdir = subdir |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
222 self.encoding = encoding |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
223 |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
224 def __call__(self, string): |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
225 return _Loader(self, string) |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
226 |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
227 class _Loader(object): |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
228 """ |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
229 Two of two helper classes for the above. |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
230 """ |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
231 def __init__(self, based_on, string): |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
232 if not (string.endswith(".pspx") or string.endswith(".pt")): |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
233 raise ValueError("loaded templates must end in .pspx or .pt") |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
234 self.path = string |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
235 self.params = based_on |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
236 |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
237 def __call__(self, target, engine): |
|
22
f6a1492fe56e
Template loading (includes) pass all tests.
David Barts <n5jrn@me.com>
parents:
21
diff
changeset
|
238 try: |
|
f6a1492fe56e
Template loading (includes) pass all tests.
David Barts <n5jrn@me.com>
parents:
21
diff
changeset
|
239 normalized = _normpath(self.params.subdir, self.path) |
|
f6a1492fe56e
Template loading (includes) pass all tests.
David Barts <n5jrn@me.com>
parents:
21
diff
changeset
|
240 except IndexError: |
|
f6a1492fe56e
Template loading (includes) pass all tests.
David Barts <n5jrn@me.com>
parents:
21
diff
changeset
|
241 raise ValueError("invalid path: {0!s}".format(self.path)) |
|
f6a1492fe56e
Template loading (includes) pass all tests.
David Barts <n5jrn@me.com>
parents:
21
diff
changeset
|
242 npath = os.path.join(self.params.base, *normalized) |
|
21
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
243 with open(npath, "r", encoding=self.params.encoding) as fp: |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
244 contents = fp.read() |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
245 value = ast.Str(contents) |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
246 return [ast.Assign(targets=[target], value=value)] |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
247 |
| 2 | 248 # U t i l i t i e s |
| 0 | 249 |
| 250 def _normpath(base, unsplit): | |
| 251 """ | |
| 252 Split, normalize and ensure a possibly relative path is absolute. First | |
| 253 argument is a list of directory names, defining a base. Second | |
| 254 argument is a string, which may either be relative to that base, or | |
| 255 absolute. Only '/' is supported as a separator. | |
| 256 """ | |
| 257 scratch = unsplit.strip('/').split('/') | |
| 258 if not unsplit.startswith('/'): | |
| 259 scratch = base + scratch | |
| 260 ret = [] | |
| 261 for i in scratch: | |
| 262 if i == '.': | |
| 263 continue | |
| 264 if i == '..': | |
| 265 ret.pop() # may raise IndexError | |
| 266 continue | |
| 267 ret.append(i) | |
| 268 return ret | |
| 269 | |
| 270 def _mangle(string): | |
| 271 """ | |
| 272 Turn a possibly troublesome identifier into a mangled one. | |
| 273 """ | |
| 274 first = True | |
| 275 ret = [] | |
| 276 for ch in string: | |
| 277 if ch == '_' or not (ch if first else "x" + ch).isidentifier(): | |
| 278 ret.append('_') | |
| 279 ret.append(b16encode(ch.encode("utf-8")).decode("us-ascii")) | |
| 280 else: | |
| 281 ret.append(ch) | |
| 282 first = False | |
| 283 return ''.join(ret) | |
| 284 | |
| 285 # The TinCan class. Simply a Bottle webapp that contains a forward method, so | |
| 286 # the code-behind can call request.app.forward(). | |
| 287 | |
| 288 class TinCan(bottle.Bottle): | |
| 289 def forward(self, target): | |
| 290 """ | |
| 291 Forward this request to the specified target route. | |
| 292 """ | |
| 293 source = bottle.request.environ['PATH_INFO'] | |
| 294 base = source.strip('/').split('/')[:-1] | |
|
9
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
295 if bottle.request.environ.get(_FTYPE, False): |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
296 raise TinCanError("{0}: forward from error page".format(source)) |
| 0 | 297 try: |
| 298 exc = ForwardException('/' + '/'.join(_normpath(base, target))) | |
| 299 except IndexError as e: | |
| 300 raise TinCanError("{0}: invalid forward to {1!r}".format(source, target)) from e | |
| 301 raise exc | |
| 302 | |
| 2 | 303 # C o d e B e h i n d |
| 304 # | |
| 0 | 305 # Represents the code-behind of one of our pages. This gets subclassed, of |
| 306 # course. | |
| 307 | |
|
9
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
308 class BasePage(object): |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
309 """ |
|
11
8037bad7d5a8
Update documentation, fix some #forward bugs.
David Barts <n5jrn@me.com>
parents:
9
diff
changeset
|
310 The parent class of both error and normal pages' code-behind. |
|
9
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
311 """ |
| 0 | 312 def handle(self): |
| 313 """ | |
| 314 This is the entry point for the code-behind logic. It is intended | |
| 315 to be overridden. | |
| 316 """ | |
| 317 pass | |
| 318 | |
| 319 def export(self): | |
| 320 """ | |
| 321 Export template variables. The default behavior is to export all | |
|
9
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
322 non-hidden non-callables that don't start with an underscore. |
| 0 | 323 This method can be overridden if a different behavior is |
| 324 desired. It should always return a dict or dict-like object. | |
| 325 """ | |
|
9
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
326 ret = { 'page': self } |
| 0 | 327 for name in dir(self): |
|
9
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
328 if name in self._HIDDEN or name.startswith('_'): |
| 0 | 329 continue |
| 330 value = getattr(self, name) | |
| 331 if callable(value): | |
| 332 continue | |
| 333 ret[name] = value | |
|
4
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
334 return ret |
| 0 | 335 |
|
9
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
336 class Page(BasePage): |
|
11
8037bad7d5a8
Update documentation, fix some #forward bugs.
David Barts <n5jrn@me.com>
parents:
9
diff
changeset
|
337 """ |
|
8037bad7d5a8
Update documentation, fix some #forward bugs.
David Barts <n5jrn@me.com>
parents:
9
diff
changeset
|
338 The code-behind for a normal page. |
|
8037bad7d5a8
Update documentation, fix some #forward bugs.
David Barts <n5jrn@me.com>
parents:
9
diff
changeset
|
339 """ |
|
9
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
340 # Non-private things we refuse to export anyhow. |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
341 _HIDDEN = set([ "request", "response" ]) |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
342 |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
343 def __init__(self, req, resp): |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
344 """ |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
345 Constructor. This is a lightweight operation. |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
346 """ |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
347 self.request = req # app context is request.app in Bottle |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
348 self.response = resp |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
349 |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
350 class ErrorPage(BasePage): |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
351 """ |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
352 The code-behind for an error page. |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
353 """ |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
354 _HIDDEN = set() |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
355 |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
356 def __init__(self, req, err): |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
357 """ |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
358 Constructor. This is a lightweight operation. |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
359 """ |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
360 self.request = req |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
361 self.error = err |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
362 |
| 2 | 363 # R o u t e s |
| 364 # | |
| 0 | 365 # Represents a route in TinCan. Our launcher creates these on-the-fly based |
| 366 # on the files it finds. | |
| 367 | |
| 2 | 368 _ERRMIN = 400 |
| 369 _ERRMAX = 599 | |
| 370 _PEXTEN = ".py" | |
| 371 _TEXTEN = ".pspx" | |
|
1
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
372 _FLOOP = "tincan.forwards" |
|
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
373 _FORIG = "tincan.origin" |
|
9
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
374 _FTYPE = "tincan.iserror" |
|
1
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
375 |
|
4
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
376 class _TinCanErrorRoute(object): |
|
1
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
377 """ |
|
9
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
378 A route to an error page. These don't get routes created for them, |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
379 and are only reached if an error routes them there. Unless you create |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
380 custom code-behind, only two variables are available to your template: |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
381 request (bottle.Request) and error (bottle.HTTPError). |
|
1
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
382 """ |
|
9
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
383 def __init__(self, template, klass): |
|
1
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
384 self._template = template |
|
9
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
385 self._class = klass |
|
1
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
386 |
|
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
387 def __call__(self, e): |
|
11
8037bad7d5a8
Update documentation, fix some #forward bugs.
David Barts <n5jrn@me.com>
parents:
9
diff
changeset
|
388 bottle.request.environ[_FTYPE] = True |
|
17
8186de188daf
Improve the run-time error handling in code-behinds.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
389 try: |
|
8186de188daf
Improve the run-time error handling in code-behinds.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
390 obj = self._class(bottle.request, e) |
|
8186de188daf
Improve the run-time error handling in code-behinds.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
391 obj.handle() |
|
21
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
392 return self._template.render(**obj.export()).lstrip('\n') |
|
17
8186de188daf
Improve the run-time error handling in code-behinds.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
393 except bottle.HTTPResponse as e: |
|
8186de188daf
Improve the run-time error handling in code-behinds.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
394 return e |
|
8186de188daf
Improve the run-time error handling in code-behinds.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
395 except Exception as e: |
|
8186de188daf
Improve the run-time error handling in code-behinds.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
396 traceback.print_exc() |
|
18
e88ab99914cf
More improvements to the error reportage.
David Barts <n5jrn@me.com>
parents:
17
diff
changeset
|
397 # Bottle doesn't allow error handlers to themselves cause |
|
e88ab99914cf
More improvements to the error reportage.
David Barts <n5jrn@me.com>
parents:
17
diff
changeset
|
398 # errors, most likely as a measure to prevent looping. So |
|
e88ab99914cf
More improvements to the error reportage.
David Barts <n5jrn@me.com>
parents:
17
diff
changeset
|
399 # this will cause a "Critical error while processing request" |
|
e88ab99914cf
More improvements to the error reportage.
David Barts <n5jrn@me.com>
parents:
17
diff
changeset
|
400 # page to be displayed, and any installed error pages to be |
|
e88ab99914cf
More improvements to the error reportage.
David Barts <n5jrn@me.com>
parents:
17
diff
changeset
|
401 # ignored. |
|
17
8186de188daf
Improve the run-time error handling in code-behinds.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
402 raise bottle.HTTPError(status=500, exception=e) |
|
1
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
403 |
|
4
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
404 class _TinCanRoute(object): |
| 0 | 405 """ |
| 406 A route created by the TinCan launcher. | |
| 407 """ | |
| 408 def __init__(self, launcher, name, subdir): | |
| 409 self._fsroot = launcher.fsroot | |
| 410 self._urlroot = launcher.urlroot | |
| 411 self._name = name | |
| 2 | 412 self._python = name + _PEXTEN |
| 413 self._fspath = os.path.join(launcher.fsroot, *subdir, name + _TEXTEN) | |
| 414 self._urlpath = self._urljoin(launcher.urlroot, *subdir, name + _TEXTEN) | |
| 0 | 415 self._origin = self._urlpath |
| 416 self._subdir = subdir | |
| 417 self._seen = set() | |
| 418 self._app = launcher.app | |
| 419 | |
| 2 | 420 def launch(self): |
| 0 | 421 """ |
| 422 Launch a single page. | |
| 423 """ | |
| 424 # Build master and header objects, process #forward directives | |
|
11
8037bad7d5a8
Update documentation, fix some #forward bugs.
David Barts <n5jrn@me.com>
parents:
9
diff
changeset
|
425 oheader = None |
| 0 | 426 while True: |
|
11
8037bad7d5a8
Update documentation, fix some #forward bugs.
David Barts <n5jrn@me.com>
parents:
9
diff
changeset
|
427 try: |
|
8037bad7d5a8
Update documentation, fix some #forward bugs.
David Barts <n5jrn@me.com>
parents:
9
diff
changeset
|
428 self._template = TemplateFile(self._fspath) |
|
8037bad7d5a8
Update documentation, fix some #forward bugs.
David Barts <n5jrn@me.com>
parents:
9
diff
changeset
|
429 except IOError as e: |
|
12
496d43d551d2
More redirecting fixes and improved error reportage.
David Barts <n5jrn@me.com>
parents:
11
diff
changeset
|
430 if oheader is not None: |
|
496d43d551d2
More redirecting fixes and improved error reportage.
David Barts <n5jrn@me.com>
parents:
11
diff
changeset
|
431 note = "{0}: invalid #forward: ".format(self._origin) |
|
496d43d551d2
More redirecting fixes and improved error reportage.
David Barts <n5jrn@me.com>
parents:
11
diff
changeset
|
432 else: |
|
496d43d551d2
More redirecting fixes and improved error reportage.
David Barts <n5jrn@me.com>
parents:
11
diff
changeset
|
433 note = "" |
|
496d43d551d2
More redirecting fixes and improved error reportage.
David Barts <n5jrn@me.com>
parents:
11
diff
changeset
|
434 raise TinCanError("{0}{1!s}".format(note, e)) from e |
|
4
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
435 try: |
|
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
436 self._header = TemplateHeader(self._template.header) |
|
9
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
437 except TemplateHeaderError as e: |
|
4
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
438 raise TinCanError("{0}: {1!s}".format(self._fspath, e)) from e |
|
11
8037bad7d5a8
Update documentation, fix some #forward bugs.
David Barts <n5jrn@me.com>
parents:
9
diff
changeset
|
439 if oheader is None: |
|
8037bad7d5a8
Update documentation, fix some #forward bugs.
David Barts <n5jrn@me.com>
parents:
9
diff
changeset
|
440 oheader = self._header # save original header |
|
8037bad7d5a8
Update documentation, fix some #forward bugs.
David Barts <n5jrn@me.com>
parents:
9
diff
changeset
|
441 elif (oheader.errors is None) != (self._header.errors is None): |
|
8037bad7d5a8
Update documentation, fix some #forward bugs.
David Barts <n5jrn@me.com>
parents:
9
diff
changeset
|
442 raise TinCanError("{0}: invalid #forward".format(self._origin)) |
| 0 | 443 if self._header.forward is None: |
| 444 break | |
|
12
496d43d551d2
More redirecting fixes and improved error reportage.
David Barts <n5jrn@me.com>
parents:
11
diff
changeset
|
445 # print("forwarding from:", self._urlpath) # debug |
| 0 | 446 self._redirect() |
|
12
496d43d551d2
More redirecting fixes and improved error reportage.
David Barts <n5jrn@me.com>
parents:
11
diff
changeset
|
447 # print("forwarded to:", self._urlpath) # debug |
|
4
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
448 # If this is a #hidden page, we ignore it for now, since hidden pages |
| 0 | 449 # don't get routes made for them. |
|
11
8037bad7d5a8
Update documentation, fix some #forward bugs.
David Barts <n5jrn@me.com>
parents:
9
diff
changeset
|
450 if oheader.hidden and not oheader.errors: |
| 0 | 451 return |
|
4
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
452 # Get the code-behind #python |
|
15
560c8fb55e4a
Fix bugs in #python directive, make code-behind class loading simpler.
David Barts <n5jrn@me.com>
parents:
14
diff
changeset
|
453 if self._header.python is None: |
|
560c8fb55e4a
Fix bugs in #python directive, make code-behind class loading simpler.
David Barts <n5jrn@me.com>
parents:
14
diff
changeset
|
454 self._python_specified = False |
|
560c8fb55e4a
Fix bugs in #python directive, make code-behind class loading simpler.
David Barts <n5jrn@me.com>
parents:
14
diff
changeset
|
455 else: |
| 2 | 456 if not self._header.python.endswith(_PEXTEN): |
|
4
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
457 raise TinCanError("{0}: #python files must end in {1}".format(self._urlpath, _PEXTEN)) |
| 0 | 458 self._python = self._header.python |
|
15
560c8fb55e4a
Fix bugs in #python directive, make code-behind class loading simpler.
David Barts <n5jrn@me.com>
parents:
14
diff
changeset
|
459 self._python_specified = True |
| 0 | 460 # Obtain a class object by importing and introspecting a module. |
| 3 | 461 self._getclass() |
|
4
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
462 # Build body object (#template) |
| 3 | 463 if self._header.template is not None: |
| 464 if not self._header.template.endswith(_TEXTEN): | |
|
4
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
465 raise TinCanError("{0}: #template files must end in {1}".format(self._urlpath, _TEXTEN)) |
| 16 | 466 try: |
| 467 tpath = os.path.normpath(os.path.join(self._fsroot, *self._splitpath(self._header.template))) | |
| 468 tfile = TemplateFile(tpath) | |
| 469 except OSError as e: | |
| 470 raise TinCanError("{0}: invalid #template: {1!s}".format(self._urlpath, e)) from e | |
| 471 except IndexError as e: | |
| 472 raise TinCanError("{0}: invalid #template".format(self._urlpath)) from e | |
|
21
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
473 try: |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
474 self._body = TinCanChameleon(tfile.body, base=self._fsroot, subdir=self._subdir) |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
475 except Exception as e: |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
476 raise TinCanError("{0}: template error: {1!s}".format(self._urlpath, e)) from e |
| 3 | 477 else: |
|
21
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
478 try: |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
479 self._body = TinCanChameleon(self._template.body, self._fsroot, subdir=self._subdir) |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
480 except Exception as e: |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
481 raise TinCanError("{0}: template error: {1!s}".format(self._urlpath, e)) from e |
|
9
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
482 # If this is an #errors page, register it as such. |
|
11
8037bad7d5a8
Update documentation, fix some #forward bugs.
David Barts <n5jrn@me.com>
parents:
9
diff
changeset
|
483 if oheader.errors is not None: |
|
8037bad7d5a8
Update documentation, fix some #forward bugs.
David Barts <n5jrn@me.com>
parents:
9
diff
changeset
|
484 self._mkerror(oheader.errors) |
|
9
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
485 return # this implies #hidden |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
486 # Get #methods for this route |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
487 if self._header.methods is None: |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
488 methods = [ 'GET' ] |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
489 else: |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
490 methods = [ i.upper() for i in self._header.methods.split() ] |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
491 if not methods: |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
492 raise TinCanError("{0}: no #methods specified".format(self._urlpath)) |
| 3 | 493 # Register this thing with Bottle |
| 6 | 494 print("adding route:", self._origin, '('+','.join(methods)+')') # debug |
| 3 | 495 self._app.route(self._origin, methods, self) |
| 496 | |
| 497 def _splitpath(self, unsplit): | |
| 498 return _normpath(self._subdir, unsplit) | |
| 499 | |
|
11
8037bad7d5a8
Update documentation, fix some #forward bugs.
David Barts <n5jrn@me.com>
parents:
9
diff
changeset
|
500 def _mkerror(self, rerrors): |
| 3 | 501 try: |
|
11
8037bad7d5a8
Update documentation, fix some #forward bugs.
David Barts <n5jrn@me.com>
parents:
9
diff
changeset
|
502 errors = [ int(i) for i in rerrors.split() ] |
| 3 | 503 except ValueError as e: |
| 504 raise TinCanError("{0}: bad #errors line".format(self._urlpath)) from e | |
| 505 if not errors: | |
| 506 errors = range(_ERRMIN, _ERRMAX+1) | |
|
21
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
507 try: |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
508 template = TinCanChameleon(self._template.body, base=self._fsroot, subdir=self._subdir) |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
509 except Exception as e: |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
510 raise TinCanError("{0}: template error: {1!s}".format(self._urlpath, e)) from e |
|
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
511 route = _TinCanErrorRoute(template, self._class) |
| 3 | 512 for error in errors: |
| 513 if error < _ERRMIN or error > _ERRMAX: | |
| 514 raise TinCanError("{0}: bad #errors code".format(self._urlpath)) | |
| 5 | 515 self._app.error_handler[error] = route # XXX |
| 3 | 516 |
|
7
57ec65f527e9
Eliminate a stat() call, allow no code-behind on pages.
David Barts <n5jrn@me.com>
parents:
6
diff
changeset
|
517 def _gettime(self, path): |
|
57ec65f527e9
Eliminate a stat() call, allow no code-behind on pages.
David Barts <n5jrn@me.com>
parents:
6
diff
changeset
|
518 try: |
|
57ec65f527e9
Eliminate a stat() call, allow no code-behind on pages.
David Barts <n5jrn@me.com>
parents:
6
diff
changeset
|
519 return os.stat(path).st_mtime |
|
57ec65f527e9
Eliminate a stat() call, allow no code-behind on pages.
David Barts <n5jrn@me.com>
parents:
6
diff
changeset
|
520 except FileNotFoundError: |
|
57ec65f527e9
Eliminate a stat() call, allow no code-behind on pages.
David Barts <n5jrn@me.com>
parents:
6
diff
changeset
|
521 return 0 |
| 8 | 522 except OSError as e: |
|
9
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
523 raise TinCanError(str(e)) from e |
|
7
57ec65f527e9
Eliminate a stat() call, allow no code-behind on pages.
David Barts <n5jrn@me.com>
parents:
6
diff
changeset
|
524 |
| 3 | 525 def _getclass(self): |
|
15
560c8fb55e4a
Fix bugs in #python directive, make code-behind class loading simpler.
David Barts <n5jrn@me.com>
parents:
14
diff
changeset
|
526 try: |
|
560c8fb55e4a
Fix bugs in #python directive, make code-behind class loading simpler.
David Barts <n5jrn@me.com>
parents:
14
diff
changeset
|
527 pypath = os.path.normpath(os.path.join(self._fsroot, *self._splitpath(self._python))) |
|
560c8fb55e4a
Fix bugs in #python directive, make code-behind class loading simpler.
David Barts <n5jrn@me.com>
parents:
14
diff
changeset
|
528 except IndexError as e: |
|
560c8fb55e4a
Fix bugs in #python directive, make code-behind class loading simpler.
David Barts <n5jrn@me.com>
parents:
14
diff
changeset
|
529 raise TinCanError("{0}: invalid #python".format(self._urlpath)) from e |
|
9
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
530 klass = ErrorPage if self._header.errors else Page |
|
7
57ec65f527e9
Eliminate a stat() call, allow no code-behind on pages.
David Barts <n5jrn@me.com>
parents:
6
diff
changeset
|
531 # Give 'em a default code-behind if they don't furnish one |
|
57ec65f527e9
Eliminate a stat() call, allow no code-behind on pages.
David Barts <n5jrn@me.com>
parents:
6
diff
changeset
|
532 pytime = self._gettime(pypath) |
|
57ec65f527e9
Eliminate a stat() call, allow no code-behind on pages.
David Barts <n5jrn@me.com>
parents:
6
diff
changeset
|
533 if not pytime: |
|
15
560c8fb55e4a
Fix bugs in #python directive, make code-behind class loading simpler.
David Barts <n5jrn@me.com>
parents:
14
diff
changeset
|
534 if self._python_specified: |
|
560c8fb55e4a
Fix bugs in #python directive, make code-behind class loading simpler.
David Barts <n5jrn@me.com>
parents:
14
diff
changeset
|
535 raise TinCanError("{0}: #python file not found".format(self._urlpath)) |
|
9
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
536 self._class = klass |
|
7
57ec65f527e9
Eliminate a stat() call, allow no code-behind on pages.
David Barts <n5jrn@me.com>
parents:
6
diff
changeset
|
537 return |
|
57ec65f527e9
Eliminate a stat() call, allow no code-behind on pages.
David Barts <n5jrn@me.com>
parents:
6
diff
changeset
|
538 # Else load the code-behind from a .py file |
| 0 | 539 pycpath = pypath + 'c' |
|
7
57ec65f527e9
Eliminate a stat() call, allow no code-behind on pages.
David Barts <n5jrn@me.com>
parents:
6
diff
changeset
|
540 pyctime = self._gettime(pycpath) |
| 0 | 541 try: |
|
7
57ec65f527e9
Eliminate a stat() call, allow no code-behind on pages.
David Barts <n5jrn@me.com>
parents:
6
diff
changeset
|
542 if pyctime < pytime: |
|
4
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
543 py_compile.compile(pypath, cfile=pycpath, doraise=True) |
|
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
544 except py_compile.PyCompileError as e: |
|
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
545 raise TinCanError(str(e)) from e |
|
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
546 except Exception as e: |
|
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
547 raise TinCanError("{0}: {1!s}".format(pypath, e)) from e |
|
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
548 try: |
|
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
549 spec = importlib.util.spec_from_file_location(_mangle(self._name), pycpath) |
| 0 | 550 mod = importlib.util.module_from_spec(spec) |
| 551 spec.loader.exec_module(mod) | |
| 552 except Exception as e: | |
| 16 | 553 raise TinCanError("{0}: error importing: {1!s}".format(pycpath, e)) from e |
|
19
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
554 # Locate a suitable class. We look for the "deepest" class object |
|
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
555 # we can find in the inheritance tree. |
| 0 | 556 self._class = None |
|
19
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
557 score = -1 |
|
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
558 ambig = False |
| 0 | 559 for i in dir(mod): |
| 560 v = getattr(mod, i) | |
|
19
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
561 if not isclass(v): |
|
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
562 continue |
|
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
563 d = self._cldepth(klass, v) |
|
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
564 if d > score: |
|
15
560c8fb55e4a
Fix bugs in #python directive, make code-behind class loading simpler.
David Barts <n5jrn@me.com>
parents:
14
diff
changeset
|
565 self._class = v |
|
19
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
566 score = d |
|
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
567 ambig = False |
|
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
568 elif d == score: |
|
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
569 ambig = True |
| 3 | 570 if self._class is None: |
|
9
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
571 raise TinCanError("{0}: contains no {1} classes".format(pypath, klass.__name__)) |
|
19
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
572 if ambig: |
|
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
573 raise TinCanError("{0}: contains ambiguous {1} classes".format(pypath, klass.__name__)) |
|
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
574 |
|
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
575 # This might fail for complex inheritance schemes from the classes of |
|
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
576 # interest (so don't use them!). |
|
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
577 def _cldepth(self, base, klass, count=0): |
|
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
578 if klass is object: |
|
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
579 # not found |
|
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
580 return -1 |
|
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
581 elif klass is base: |
|
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
582 # just found |
|
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
583 return count |
|
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
584 else: |
|
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
585 # must recurse |
|
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
586 for c in klass.__bases__: |
|
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
587 result = self._cldepth(base, c, count=count+1) |
|
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
588 if result > 0: |
|
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
589 return result |
|
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
590 return -1 |
| 0 | 591 |
| 592 def _redirect(self): | |
| 593 try: | |
| 594 rlist = self._splitpath(self._header.forward) | |
|
4
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
595 forw = '/' + '/'.join(rlist) |
|
11
8037bad7d5a8
Update documentation, fix some #forward bugs.
David Barts <n5jrn@me.com>
parents:
9
diff
changeset
|
596 if forw in self._seen: |
|
4
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
597 raise TinCanError("{0}: #forward loop".format(self._origin)) |
|
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
598 self._seen.add(forw) |
| 0 | 599 rname = rlist.pop() |
| 600 except IndexError as e: | |
| 601 raise TinCanError("{0}: invalid #forward".format(self._urlpath)) from e | |
|
11
8037bad7d5a8
Update documentation, fix some #forward bugs.
David Barts <n5jrn@me.com>
parents:
9
diff
changeset
|
602 name, ext = os.path.splitext(rname) |
| 2 | 603 if ext != _TEXTEN: |
| 0 | 604 raise TinCanError("{0}: invalid #forward".format(self._urlpath)) |
| 605 self._subdir = rlist | |
| 2 | 606 self._python = name + _PEXTEN |
| 0 | 607 self._fspath = os.path.join(self._fsroot, *self._subdir, rname) |
|
12
496d43d551d2
More redirecting fixes and improved error reportage.
David Barts <n5jrn@me.com>
parents:
11
diff
changeset
|
608 self._urlpath = '/' + self._urljoin(*self._subdir, rname) |
| 0 | 609 |
| 610 def _urljoin(self, *args): | |
| 611 args = list(args) | |
| 612 if args[0] == '/': | |
| 613 args[0] = '' | |
| 614 return '/'.join(args) | |
| 615 | |
|
1
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
616 def __call__(self): |
| 0 | 617 """ |
| 618 This gets called by the framework AFTER the page is launched. | |
| 619 """ | |
|
1
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
620 target = None |
|
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
621 try: |
|
17
8186de188daf
Improve the run-time error handling in code-behinds.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
622 obj = self._class(bottle.request, bottle.response) |
|
1
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
623 obj.handle() |
|
21
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
624 return self._body.render(**obj.export()).lstrip('\n') |
|
1
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
625 except ForwardException as fwd: |
|
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
626 target = fwd.target |
|
17
8186de188daf
Improve the run-time error handling in code-behinds.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
627 except bottle.HTTPResponse as e: |
|
8186de188daf
Improve the run-time error handling in code-behinds.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
628 return e |
|
8186de188daf
Improve the run-time error handling in code-behinds.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
629 except Exception as e: |
|
8186de188daf
Improve the run-time error handling in code-behinds.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
630 traceback.print_exc() |
|
8186de188daf
Improve the run-time error handling in code-behinds.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
631 raise bottle.HTTPError(status=500, exception=e) |
|
1
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
632 if target is None: |
|
17
8186de188daf
Improve the run-time error handling in code-behinds.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
633 message = "{0}: unexpected null target".format(self._urlpath) |
|
8186de188daf
Improve the run-time error handling in code-behinds.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
634 sys.stderr.write(message + '\n') |
|
8186de188daf
Improve the run-time error handling in code-behinds.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
635 raise bottle.HTTPError(status=500, exception=TinCanError(message)) |
|
1
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
636 # We get here if we are doing a server-side programmatic |
|
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
637 # forward. |
|
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
638 environ = bottle.request.environ |
|
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
639 if _FORIG not in environ: |
|
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
640 environ[_FORIG] = self._urlpath |
| 2 | 641 if _FLOOP not in environ: |
| 642 environ[_FLOOP] = set([self._urlpath]) | |
|
1
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
643 elif target in environ[_FLOOP]: |
|
17
8186de188daf
Improve the run-time error handling in code-behinds.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
644 message = "{0}: forward loop detected".format(environ[_FORIG]) |
|
8186de188daf
Improve the run-time error handling in code-behinds.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
645 sys.stderr.write(message + '\n') |
|
8186de188daf
Improve the run-time error handling in code-behinds.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
646 raise bottle.HTTPError(status=500, exception=TinCanError(message)) |
|
1
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
647 environ[_FLOOP].add(target) |
|
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
648 environ['bottle.raw_path'] = target |
|
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
649 environ['PATH_INFO'] = urllib.parse.quote(target) |
|
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
650 route, args = self._app.router.match(environ) |
|
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
651 environ['route.handle'] = environ['bottle.route'] = route |
|
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
652 environ['route.url_args'] = args |
|
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
653 return route.call(**args) |
| 0 | 654 |
| 655 def _mkdict(self, obj): | |
| 656 ret = {} | |
| 657 for name in dir(obj): | |
| 658 if name.startswith('_'): | |
| 659 continue | |
| 660 value = getattr(obj, name) | |
| 661 if not callable(value): | |
| 662 ret[name] = value | |
| 663 return ret | |
| 2 | 664 |
| 665 # L a u n c h e r | |
| 666 | |
| 667 _WINF = "WEB-INF" | |
| 668 _BANNED = set([_WINF]) | |
| 669 | |
| 670 class _Launcher(object): | |
| 671 """ | |
| 672 Helper class for launching webapps. | |
| 673 """ | |
|
21
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
674 def __init__(self, fsroot, urlroot, logger): |
| 2 | 675 """ |
| 676 Lightweight constructor. The real action happens in .launch() below. | |
| 677 """ | |
| 678 self.fsroot = fsroot | |
| 679 self.urlroot = urlroot | |
|
4
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
680 self.logger = logger |
| 2 | 681 self.app = None |
|
4
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
682 self.errors = 0 |
|
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
683 self.debug = False |
| 2 | 684 |
| 685 def launch(self): | |
| 686 """ | |
| 687 Does the actual work of launching something. XXX - modifies sys.path | |
| 688 and never un-modifies it. | |
| 689 """ | |
| 690 # Sanity checks | |
| 691 if not self.urlroot.startswith("/"): | |
|
18
e88ab99914cf
More improvements to the error reportage.
David Barts <n5jrn@me.com>
parents:
17
diff
changeset
|
692 self.errors = 1 |
|
e88ab99914cf
More improvements to the error reportage.
David Barts <n5jrn@me.com>
parents:
17
diff
changeset
|
693 self.logger("urlroot not absolute: {0!r}".format(self.urlroot)) |
|
e88ab99914cf
More improvements to the error reportage.
David Barts <n5jrn@me.com>
parents:
17
diff
changeset
|
694 return self |
| 2 | 695 if not os.path.isdir(self.fsroot): |
|
18
e88ab99914cf
More improvements to the error reportage.
David Barts <n5jrn@me.com>
parents:
17
diff
changeset
|
696 self.errors = 1 |
|
e88ab99914cf
More improvements to the error reportage.
David Barts <n5jrn@me.com>
parents:
17
diff
changeset
|
697 self.logger("no such directory: {0!r}".format(self.fsroot)) |
|
e88ab99914cf
More improvements to the error reportage.
David Barts <n5jrn@me.com>
parents:
17
diff
changeset
|
698 return self |
|
e88ab99914cf
More improvements to the error reportage.
David Barts <n5jrn@me.com>
parents:
17
diff
changeset
|
699 # Make any needed directories. Refuse to launch things that don't |
|
e88ab99914cf
More improvements to the error reportage.
David Barts <n5jrn@me.com>
parents:
17
diff
changeset
|
700 # contain WEB-INF, to prevent accidental launches of undesired |
|
e88ab99914cf
More improvements to the error reportage.
David Barts <n5jrn@me.com>
parents:
17
diff
changeset
|
701 # directory trees containing sensitive files. |
| 2 | 702 winf = os.path.join(self.fsroot, _WINF) |
|
18
e88ab99914cf
More improvements to the error reportage.
David Barts <n5jrn@me.com>
parents:
17
diff
changeset
|
703 if not os.path.isdir(winf): |
|
e88ab99914cf
More improvements to the error reportage.
David Barts <n5jrn@me.com>
parents:
17
diff
changeset
|
704 self.errors = 1 |
|
e88ab99914cf
More improvements to the error reportage.
David Barts <n5jrn@me.com>
parents:
17
diff
changeset
|
705 self.logger("no WEB-INF directory in {0!r}".format(self.fsroot)) |
|
e88ab99914cf
More improvements to the error reportage.
David Barts <n5jrn@me.com>
parents:
17
diff
changeset
|
706 return self |
| 2 | 707 lib = os.path.join(winf, "lib") |
|
18
e88ab99914cf
More improvements to the error reportage.
David Barts <n5jrn@me.com>
parents:
17
diff
changeset
|
708 for i in [ lib ]: |
| 2 | 709 if not os.path.isdir(i): |
| 710 os.mkdir(i) | |
| 711 # Add our private lib directory to sys.path | |
| 712 sys.path.insert(1, os.path.abspath(lib)) | |
| 713 # Do what we gotta do | |
| 714 self.app = TinCan() | |
| 715 self._launch([]) | |
|
4
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
716 return self |
| 2 | 717 |
| 718 def _launch(self, subdir): | |
| 719 for entry in os.listdir(os.path.join(self.fsroot, *subdir)): | |
| 720 if not subdir and entry in _BANNED: | |
| 721 continue | |
| 722 etype = os.stat(os.path.join(self.fsroot, *subdir, entry)).st_mode | |
| 723 if S_ISREG(etype): | |
| 724 ename, eext = os.path.splitext(entry) | |
| 725 if eext != _TEXTEN: | |
| 726 continue # only look at interesting files | |
|
4
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
727 route = _TinCanRoute(self, ename, subdir) |
|
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
728 try: |
|
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
729 route.launch() |
|
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
730 except TinCanError as e: |
|
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
731 self.logger(str(e)) |
|
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
732 if self.debug: |
|
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
733 while e.__cause__ != None: |
|
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
734 e = e.__cause__ |
|
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
735 self.logger("\t{0}: {1!s}".format(e.__class__.__name__, e)) |
|
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
736 self.errors += 1 |
| 2 | 737 elif S_ISDIR(etype): |
| 738 self._launch(subdir + [entry]) | |
| 739 | |
|
4
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
740 def _logger(message): |
|
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
741 sys.stderr.write(message) |
|
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
742 sys.stderr.write('\n') |
|
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
743 |
|
21
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
744 def launch(fsroot=None, urlroot='/', logger=_logger): |
| 2 | 745 """ |
| 746 Launch and return a TinCan webapp. Does not run the app; it is the | |
| 747 caller's responsibility to call app.run() | |
| 748 """ | |
| 749 if fsroot is None: | |
| 750 fsroot = os.getcwd() | |
|
21
ca2029ce95c7
Mostly done with new template logic, working through testing.
David Barts <n5jrn@me.com>
parents:
19
diff
changeset
|
751 launcher = _Launcher(fsroot, urlroot, logger) |
|
4
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
752 # launcher.debug = True |
|
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
753 launcher.launch() |
|
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
754 return launcher.app, launcher.errors |
|
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
755 |
|
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
756 # XXX - We cannot implement a command-line launcher here; see the |
|
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
757 # launcher script for why. |