Mercurial > cgi-bin > hgweb.cgi > tincan
annotate tincan.py @ 67:b5e72129ef72 draft
Support #errors w/ no params, as documented.
| author | David Barts <n5jrn@me.com> |
|---|---|
| date | Sun, 14 Jul 2019 14:47:33 -0700 |
| parents | f33cb3e93473 |
| children | 61667621e19d |
| 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 | |
|
57
935f8013f540
Fix lack of error detection and recovery in template parsing.
David Barts <n5jrn@me.com>
parents:
56
diff
changeset
|
11 from chameleon import PageTemplate, PageTemplateFile, TemplateError |
|
40
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
12 import email.utils |
|
4
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
13 import functools |
| 2 | 14 import importlib |
|
4
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
15 from inspect import isclass |
| 0 | 16 import io |
|
45
969f515b505b
Make it easy to leave stdout and stderr alone (untested).
David Barts <n5jrn@me.com>
parents:
44
diff
changeset
|
17 import logging |
|
40
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
18 import mimetypes |
| 2 | 19 import py_compile |
| 20 from stat import S_ISDIR, S_ISREG | |
| 5 | 21 from string import whitespace |
| 43 | 22 from threading import Lock |
|
40
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
23 import time |
|
17
8186de188daf
Improve the run-time error handling in code-behinds.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
24 import urllib |
| 0 | 25 |
| 26 import bottle | |
| 27 | |
| 2 | 28 # E x c e p t i o n s |
| 0 | 29 |
| 30 class TinCanException(Exception): | |
| 31 """ | |
| 32 The parent class of all exceptions we raise. | |
| 33 """ | |
| 34 pass | |
| 35 | |
|
9
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
36 class TemplateHeaderError(TinCanException): |
| 0 | 37 """ |
| 38 Raised upon encountering a syntax error in the template headers. | |
| 39 """ | |
| 40 def __init__(self, message, line): | |
| 41 super().__init__(message, line) | |
| 42 self.message = message | |
| 43 self.line = line | |
| 44 | |
| 45 def __str__(self): | |
|
4
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
46 return "line {0}: {1}".format(self.line, self.message) |
| 0 | 47 |
|
35
41da0b3d2156
Rename #include to #load (more descriptive).
David Barts <n5jrn@me.com>
parents:
34
diff
changeset
|
48 class LoadError(TinCanException): |
|
24
34d3cfcd37ef
First batch of work on getting a #include header. Unfinished.
David Barts <n5jrn@me.com>
parents:
23
diff
changeset
|
49 """ |
|
35
41da0b3d2156
Rename #include to #load (more descriptive).
David Barts <n5jrn@me.com>
parents:
34
diff
changeset
|
50 Raised when we run into problems #load'ing something, usually |
|
24
34d3cfcd37ef
First batch of work on getting a #include header. Unfinished.
David Barts <n5jrn@me.com>
parents:
23
diff
changeset
|
51 because it doesn't exist. |
|
34d3cfcd37ef
First batch of work on getting a #include header. Unfinished.
David Barts <n5jrn@me.com>
parents:
23
diff
changeset
|
52 """ |
|
34d3cfcd37ef
First batch of work on getting a #include header. Unfinished.
David Barts <n5jrn@me.com>
parents:
23
diff
changeset
|
53 def __init__(self, message, source): |
|
34d3cfcd37ef
First batch of work on getting a #include header. Unfinished.
David Barts <n5jrn@me.com>
parents:
23
diff
changeset
|
54 super().__init__(message, source) |
|
34d3cfcd37ef
First batch of work on getting a #include header. Unfinished.
David Barts <n5jrn@me.com>
parents:
23
diff
changeset
|
55 self.message = message |
|
34d3cfcd37ef
First batch of work on getting a #include header. Unfinished.
David Barts <n5jrn@me.com>
parents:
23
diff
changeset
|
56 self.source = source |
|
34d3cfcd37ef
First batch of work on getting a #include header. Unfinished.
David Barts <n5jrn@me.com>
parents:
23
diff
changeset
|
57 |
|
34d3cfcd37ef
First batch of work on getting a #include header. Unfinished.
David Barts <n5jrn@me.com>
parents:
23
diff
changeset
|
58 def __str__(self): |
|
35
41da0b3d2156
Rename #include to #load (more descriptive).
David Barts <n5jrn@me.com>
parents:
34
diff
changeset
|
59 return "{0}: #load error: {1}".format(self.source, self.message) |
|
24
34d3cfcd37ef
First batch of work on getting a #include header. Unfinished.
David Barts <n5jrn@me.com>
parents:
23
diff
changeset
|
60 |
| 0 | 61 class ForwardException(TinCanException): |
| 62 """ | |
| 63 Raised to effect the flow control needed to do a forward (server-side | |
| 64 redirect). It is ugly to do this, but other Python frameworks do and | |
| 65 there seems to be no good alternative. | |
| 66 """ | |
| 67 def __init__(self, target): | |
| 68 self.target = target | |
| 69 | |
| 70 class TinCanError(TinCanException): | |
| 71 """ | |
| 72 General-purpose exception thrown by TinCan when things go wrong, often | |
| 73 when attempting to launch webapps. | |
| 74 """ | |
| 75 pass | |
| 76 | |
| 2 | 77 # T e m p l a t e s |
| 78 # | |
| 0 | 79 # Template (.pspx) files. These are standard templates for a supported |
| 80 # template engine, but with an optional set of header lines that begin | |
| 81 # with '#'. | |
| 82 | |
| 83 class TemplateFile(object): | |
| 84 """ | |
| 85 Parse a template file into a header part and the body part. The header | |
| 86 is always a leading set of lines, each starting with '#', that is of the | |
| 87 same format regardless of the template body. The template body varies | |
| 88 depending on the selected templating engine. The body part has | |
| 89 each header line replaced by a blank line. This preserves the overall | |
| 90 line numbering when processing the body. The added newlines are normally | |
| 91 stripped out before the rendered page is sent back to the client. | |
| 92 """ | |
| 5 | 93 _END = "#end" |
| 94 _LEND = len(_END) | |
| 95 _WS = set(whitespace) | |
| 96 | |
| 0 | 97 def __init__(self, raw, encoding='utf-8'): |
| 98 if isinstance(raw, io.TextIOBase): | |
| 99 self._do_init(raw) | |
| 100 elif isinstance(raw, str): | |
| 101 with open(raw, "r", encoding=encoding) as fp: | |
| 102 self._do_init(fp) | |
| 103 else: | |
| 104 raise TypeError("Expecting a string or Text I/O object.") | |
| 105 | |
| 106 def _do_init(self, fp): | |
| 107 self._hbuf = [] | |
| 108 self._bbuf = [] | |
| 109 self._state = self._header | |
| 110 while True: | |
| 111 line = fp.readline() | |
| 112 if line == '': | |
| 113 break | |
| 114 self._state(line) | |
| 115 self.header = ''.join(self._hbuf) | |
| 116 self.body = ''.join(self._bbuf) | |
| 117 | |
| 118 def _header(self, line): | |
| 119 if not line.startswith('#'): | |
| 120 self._state = self._body | |
| 121 self._state(line) | |
| 122 return | |
| 5 | 123 if line.startswith(self._END) and (len(line) == self._LEND or line[self._LEND] in self._WS): |
| 124 self._state = self._body | |
| 0 | 125 self._hbuf.append(line) |
| 36 | 126 self._bbuf.append("\n") |
| 0 | 127 |
| 128 def _body(self, line): | |
| 129 self._bbuf.append(line) | |
| 130 | |
| 131 class TemplateHeader(object): | |
| 132 """ | |
| 133 Parses and represents a set of header lines. | |
| 134 """ | |
| 2 | 135 _NAMES = [ "errors", "forward", "methods", "python", "template" ] |
| 0 | 136 _FNAMES = [ "hidden" ] |
|
35
41da0b3d2156
Rename #include to #load (more descriptive).
David Barts <n5jrn@me.com>
parents:
34
diff
changeset
|
137 _ANAMES = [ "load" ] |
|
67
b5e72129ef72
Support #errors w/ no params, as documented.
David Barts <n5jrn@me.com>
parents:
66
diff
changeset
|
138 _ONAMES = [ "errors" ] |
| 0 | 139 |
| 140 def __init__(self, string): | |
| 141 # Initialize our state | |
| 142 for i in self._NAMES: | |
| 143 setattr(self, i, None) | |
| 144 for i in self._FNAMES: | |
| 145 setattr(self, i, False) | |
|
25
e93e5e746cc5
Preliminary debugging, still not fully tested.
David Barts <n5jrn@me.com>
parents:
24
diff
changeset
|
146 for i in self._ANAMES: |
|
e93e5e746cc5
Preliminary debugging, still not fully tested.
David Barts <n5jrn@me.com>
parents:
24
diff
changeset
|
147 setattr(self, i, []) |
| 0 | 148 # Parse the string |
| 149 count = 0 | |
|
25
e93e5e746cc5
Preliminary debugging, still not fully tested.
David Barts <n5jrn@me.com>
parents:
24
diff
changeset
|
150 nameset = set(self._NAMES + self._FNAMES + self._ANAMES) |
| 0 | 151 seen = set() |
| 152 lines = string.split("\n") | |
| 153 if lines and lines[-1] == "": | |
| 154 del lines[-1] | |
| 155 for line in lines: | |
| 156 # Get line | |
| 157 count += 1 | |
| 158 if not line.startswith("#"): | |
|
9
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
159 raise TemplateHeaderError("Does not start with '#'.", count) |
| 0 | 160 try: |
| 161 rna, rpa = line.split(maxsplit=1) | |
| 162 except ValueError: | |
| 5 | 163 rna = line.rstrip() |
| 164 rpa = None | |
| 0 | 165 # Get name, ignoring remarks. |
| 166 name = rna[1:] | |
| 167 if name == "rem": | |
| 168 continue | |
| 5 | 169 if name == "end": |
| 170 break | |
| 0 | 171 if name not in nameset: |
|
9
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
172 raise TemplateHeaderError("Invalid directive: {0!r}".format(rna), count) |
| 0 | 173 if name in seen: |
|
9
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
174 raise TemplateHeaderError("Duplicate {0!r} directive.".format(rna), count) |
|
24
34d3cfcd37ef
First batch of work on getting a #include header. Unfinished.
David Barts <n5jrn@me.com>
parents:
23
diff
changeset
|
175 if name not in self._ANAMES: |
|
34d3cfcd37ef
First batch of work on getting a #include header. Unfinished.
David Barts <n5jrn@me.com>
parents:
23
diff
changeset
|
176 seen.add(name) |
| 0 | 177 # Flags |
| 5 | 178 if name in self._FNAMES: |
| 0 | 179 setattr(self, name, True) |
| 180 continue | |
| 181 # Get parameter | |
| 5 | 182 if rpa is None: |
|
67
b5e72129ef72
Support #errors w/ no params, as documented.
David Barts <n5jrn@me.com>
parents:
66
diff
changeset
|
183 if name in self._ONAMES: |
|
b5e72129ef72
Support #errors w/ no params, as documented.
David Barts <n5jrn@me.com>
parents:
66
diff
changeset
|
184 rpa = "" |
|
b5e72129ef72
Support #errors w/ no params, as documented.
David Barts <n5jrn@me.com>
parents:
66
diff
changeset
|
185 else: |
|
b5e72129ef72
Support #errors w/ no params, as documented.
David Barts <n5jrn@me.com>
parents:
66
diff
changeset
|
186 raise TemplateHeaderError("Missing parameter.", count) |
| 0 | 187 param = rpa.strip() |
| 188 for i in [ "'", '"']: | |
| 189 if param.startswith(i) and param.endswith(i): | |
| 190 param = ast.literal_eval(param) | |
| 191 break | |
| 192 # Update this object | |
|
24
34d3cfcd37ef
First batch of work on getting a #include header. Unfinished.
David Barts <n5jrn@me.com>
parents:
23
diff
changeset
|
193 if name in self._ANAMES: |
|
34d3cfcd37ef
First batch of work on getting a #include header. Unfinished.
David Barts <n5jrn@me.com>
parents:
23
diff
changeset
|
194 getattr(self, name).append(param) |
|
34d3cfcd37ef
First batch of work on getting a #include header. Unfinished.
David Barts <n5jrn@me.com>
parents:
23
diff
changeset
|
195 else: |
|
34d3cfcd37ef
First batch of work on getting a #include header. Unfinished.
David Barts <n5jrn@me.com>
parents:
23
diff
changeset
|
196 setattr(self, name, param) |
| 0 | 197 |
|
23
e8b6ee7e5b6b
Well, *that* attempt at includes didn't work. Revert.
David Barts <n5jrn@me.com>
parents:
22
diff
changeset
|
198 # C h a m e l e o n |
| 2 | 199 # |
|
35
41da0b3d2156
Rename #include to #load (more descriptive).
David Barts <n5jrn@me.com>
parents:
34
diff
changeset
|
200 # Support for Chameleon templates (the kind TinCan uses). |
| 0 | 201 |
| 202 class ChameleonTemplate(bottle.BaseTemplate): | |
| 203 def prepare(self, **options): | |
| 204 if self.source: | |
|
37
ce67eac10fc7
Allow global character encoding specification.
David Barts <n5jrn@me.com>
parents:
36
diff
changeset
|
205 self.tpl = PageTemplate(self.source, **options) |
| 0 | 206 else: |
|
4
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
207 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
|
208 search_path=self.lookup, **options) |
|
37
ce67eac10fc7
Allow global character encoding specification.
David Barts <n5jrn@me.com>
parents:
36
diff
changeset
|
209 # XXX - work around broken Chameleon decoding |
|
ce67eac10fc7
Allow global character encoding specification.
David Barts <n5jrn@me.com>
parents:
36
diff
changeset
|
210 self.tpl.default_encoding = self.encoding |
| 0 | 211 |
| 212 def render(self, *args, **kwargs): | |
| 213 for dictarg in args: | |
| 214 kwargs.update(dictarg) | |
| 215 _defaults = self.defaults.copy() | |
| 216 _defaults.update(kwargs) | |
| 217 return self.tpl.render(**_defaults) | |
| 218 | |
|
4
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
219 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
|
220 chameleon_view = functools.partial(bottle.view, template_adapter=ChameleonTemplate) |
| 0 | 221 |
| 2 | 222 # U t i l i t i e s |
| 0 | 223 |
| 224 def _normpath(base, unsplit): | |
| 225 """ | |
| 226 Split, normalize and ensure a possibly relative path is absolute. First | |
| 227 argument is a list of directory names, defining a base. Second | |
| 228 argument is a string, which may either be relative to that base, or | |
| 229 absolute. Only '/' is supported as a separator. | |
| 230 """ | |
| 231 scratch = unsplit.strip('/').split('/') | |
| 232 if not unsplit.startswith('/'): | |
| 233 scratch = base + scratch | |
| 234 ret = [] | |
| 235 for i in scratch: | |
| 236 if i == '.': | |
| 237 continue | |
| 238 if i == '..': | |
| 239 ret.pop() # may raise IndexError | |
| 240 continue | |
| 241 ret.append(i) | |
| 242 return ret | |
| 243 | |
| 244 def _mangle(string): | |
| 245 """ | |
| 246 Turn a possibly troublesome identifier into a mangled one. | |
| 247 """ | |
| 248 first = True | |
| 249 ret = [] | |
| 250 for ch in string: | |
| 251 if ch == '_' or not (ch if first else "x" + ch).isidentifier(): | |
| 252 ret.append('_') | |
| 253 ret.append(b16encode(ch.encode("utf-8")).decode("us-ascii")) | |
| 254 else: | |
| 255 ret.append(ch) | |
| 256 first = False | |
| 257 return ''.join(ret) | |
| 258 | |
|
59
60907204a265
Support case-insensitive filesystems properly.
David Barts <n5jrn@me.com>
parents:
58
diff
changeset
|
259 _FOLDS_CASE = sys.platform in ['darwin', 'win32'] |
|
60907204a265
Support case-insensitive filesystems properly.
David Barts <n5jrn@me.com>
parents:
58
diff
changeset
|
260 |
|
60907204a265
Support case-insensitive filesystems properly.
David Barts <n5jrn@me.com>
parents:
58
diff
changeset
|
261 def _casef(string, case="lower"): |
|
60907204a265
Support case-insensitive filesystems properly.
David Barts <n5jrn@me.com>
parents:
58
diff
changeset
|
262 """ |
|
60907204a265
Support case-insensitive filesystems properly.
David Barts <n5jrn@me.com>
parents:
58
diff
changeset
|
263 If we're on an OS with case-insensitive file names, fold case. |
|
60907204a265
Support case-insensitive filesystems properly.
David Barts <n5jrn@me.com>
parents:
58
diff
changeset
|
264 Else leave things alone. |
|
60907204a265
Support case-insensitive filesystems properly.
David Barts <n5jrn@me.com>
parents:
58
diff
changeset
|
265 """ |
|
60907204a265
Support case-insensitive filesystems properly.
David Barts <n5jrn@me.com>
parents:
58
diff
changeset
|
266 return getattr(string, case)() if _FOLDS_CASE else string |
|
60907204a265
Support case-insensitive filesystems properly.
David Barts <n5jrn@me.com>
parents:
58
diff
changeset
|
267 |
| 0 | 268 # The TinCan class. Simply a Bottle webapp that contains a forward method, so |
| 269 # the code-behind can call request.app.forward(). | |
| 270 | |
| 271 class TinCan(bottle.Bottle): | |
| 272 def forward(self, target): | |
| 273 """ | |
| 274 Forward this request to the specified target route. | |
| 275 """ | |
| 276 source = bottle.request.environ['PATH_INFO'] | |
| 277 base = source.strip('/').split('/')[:-1] | |
|
9
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
278 if bottle.request.environ.get(_FTYPE, False): |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
279 raise TinCanError("{0}: forward from error page".format(source)) |
| 0 | 280 try: |
| 281 exc = ForwardException('/' + '/'.join(_normpath(base, target))) | |
| 282 except IndexError as e: | |
| 283 raise TinCanError("{0}: invalid forward to {1!r}".format(source, target)) from e | |
| 284 raise exc | |
| 285 | |
| 2 | 286 # C o d e B e h i n d |
| 287 # | |
| 0 | 288 # Represents the code-behind of one of our pages. This gets subclassed, of |
| 289 # course. | |
| 290 | |
|
9
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
291 class BasePage(object): |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
292 """ |
|
11
8037bad7d5a8
Update documentation, fix some #forward bugs.
David Barts <n5jrn@me.com>
parents:
9
diff
changeset
|
293 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
|
294 """ |
| 0 | 295 def handle(self): |
| 296 """ | |
| 297 This is the entry point for the code-behind logic. It is intended | |
| 298 to be overridden. | |
| 299 """ | |
| 300 pass | |
| 301 | |
| 302 def export(self): | |
| 303 """ | |
| 304 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
|
305 non-hidden non-callables that don't start with an underscore. |
| 0 | 306 This method can be overridden if a different behavior is |
| 307 desired. It should always return a dict or dict-like object. | |
| 308 """ | |
|
9
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
309 ret = { 'page': self } |
| 0 | 310 for name in dir(self): |
|
9
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
311 if name in self._HIDDEN or name.startswith('_'): |
| 0 | 312 continue |
| 313 value = getattr(self, name) | |
| 314 if callable(value): | |
| 315 continue | |
| 316 ret[name] = value | |
|
4
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
317 return ret |
| 0 | 318 |
|
9
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
319 class Page(BasePage): |
|
11
8037bad7d5a8
Update documentation, fix some #forward bugs.
David Barts <n5jrn@me.com>
parents:
9
diff
changeset
|
320 """ |
|
8037bad7d5a8
Update documentation, fix some #forward bugs.
David Barts <n5jrn@me.com>
parents:
9
diff
changeset
|
321 The code-behind for a normal page. |
|
8037bad7d5a8
Update documentation, fix some #forward bugs.
David Barts <n5jrn@me.com>
parents:
9
diff
changeset
|
322 """ |
|
9
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
323 # 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
|
324 _HIDDEN = set([ "request", "response" ]) |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
325 |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
326 def __init__(self, req, resp): |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
327 """ |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
328 Constructor. This is a lightweight operation. |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
329 """ |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
330 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
|
331 self.response = resp |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
332 |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
333 class ErrorPage(BasePage): |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
334 """ |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
335 The code-behind for an error page. |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
336 """ |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
337 _HIDDEN = set() |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
338 |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
339 def __init__(self, req, err): |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
340 """ |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
341 Constructor. This is a lightweight operation. |
|
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 self.request = req |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
344 self.error = err |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
345 |
|
24
34d3cfcd37ef
First batch of work on getting a #include header. Unfinished.
David Barts <n5jrn@me.com>
parents:
23
diff
changeset
|
346 # I n c l u s i o n |
|
34d3cfcd37ef
First batch of work on getting a #include header. Unfinished.
David Barts <n5jrn@me.com>
parents:
23
diff
changeset
|
347 # |
|
29
2e3ac3d7b0a4
A possible workaround for the drainbamage (needs testing)?
David Barts <n5jrn@me.com>
parents:
26
diff
changeset
|
348 # Most processing is in the TinCanRoute class; this just interprets and |
|
35
41da0b3d2156
Rename #include to #load (more descriptive).
David Barts <n5jrn@me.com>
parents:
34
diff
changeset
|
349 # represents arguments to the #load header directive. |
|
24
34d3cfcd37ef
First batch of work on getting a #include header. Unfinished.
David Barts <n5jrn@me.com>
parents:
23
diff
changeset
|
350 |
|
35
41da0b3d2156
Rename #include to #load (more descriptive).
David Barts <n5jrn@me.com>
parents:
34
diff
changeset
|
351 class _LoadedFile(object): |
|
29
2e3ac3d7b0a4
A possible workaround for the drainbamage (needs testing)?
David Barts <n5jrn@me.com>
parents:
26
diff
changeset
|
352 def __init__(self, raw): |
|
2e3ac3d7b0a4
A possible workaround for the drainbamage (needs testing)?
David Barts <n5jrn@me.com>
parents:
26
diff
changeset
|
353 if raw.startswith('<') and raw.endswith('>'): |
|
2e3ac3d7b0a4
A possible workaround for the drainbamage (needs testing)?
David Barts <n5jrn@me.com>
parents:
26
diff
changeset
|
354 raw = raw[1:-1] |
|
2e3ac3d7b0a4
A possible workaround for the drainbamage (needs testing)?
David Barts <n5jrn@me.com>
parents:
26
diff
changeset
|
355 self.in_lib = True |
|
2e3ac3d7b0a4
A possible workaround for the drainbamage (needs testing)?
David Barts <n5jrn@me.com>
parents:
26
diff
changeset
|
356 else: |
|
2e3ac3d7b0a4
A possible workaround for the drainbamage (needs testing)?
David Barts <n5jrn@me.com>
parents:
26
diff
changeset
|
357 self.in_lib = False |
|
31
443a0001d841
Improve the #include syntax a bit.
David Barts <n5jrn@me.com>
parents:
30
diff
changeset
|
358 equals = raw.find('=') |
|
443a0001d841
Improve the #include syntax a bit.
David Barts <n5jrn@me.com>
parents:
30
diff
changeset
|
359 if equals < 0: |
|
33
cc975bf7a3fa
Fix bug in auto-generated include variables.
David Barts <n5jrn@me.com>
parents:
32
diff
changeset
|
360 self.vname = os.path.splitext(os.path.basename(raw))[0] |
|
31
443a0001d841
Improve the #include syntax a bit.
David Barts <n5jrn@me.com>
parents:
30
diff
changeset
|
361 self.fname = raw |
|
443a0001d841
Improve the #include syntax a bit.
David Barts <n5jrn@me.com>
parents:
30
diff
changeset
|
362 else: |
|
443a0001d841
Improve the #include syntax a bit.
David Barts <n5jrn@me.com>
parents:
30
diff
changeset
|
363 self.vname = raw[:equals] |
|
443a0001d841
Improve the #include syntax a bit.
David Barts <n5jrn@me.com>
parents:
30
diff
changeset
|
364 self.fname = raw[equals+1:] |
|
29
2e3ac3d7b0a4
A possible workaround for the drainbamage (needs testing)?
David Barts <n5jrn@me.com>
parents:
26
diff
changeset
|
365 if self.vname == "": |
|
2e3ac3d7b0a4
A possible workaround for the drainbamage (needs testing)?
David Barts <n5jrn@me.com>
parents:
26
diff
changeset
|
366 raise ValueError("empty variable name") |
|
2e3ac3d7b0a4
A possible workaround for the drainbamage (needs testing)?
David Barts <n5jrn@me.com>
parents:
26
diff
changeset
|
367 if self.fname == "": |
|
2e3ac3d7b0a4
A possible workaround for the drainbamage (needs testing)?
David Barts <n5jrn@me.com>
parents:
26
diff
changeset
|
368 raise ValueError("empty file name") |
|
59
60907204a265
Support case-insensitive filesystems properly.
David Barts <n5jrn@me.com>
parents:
58
diff
changeset
|
369 if not _casef(self.fname).endswith(_IEXTEN): |
|
29
2e3ac3d7b0a4
A possible workaround for the drainbamage (needs testing)?
David Barts <n5jrn@me.com>
parents:
26
diff
changeset
|
370 raise ValueError("file does not end in {0}".format(_IEXTEN)) |
|
24
34d3cfcd37ef
First batch of work on getting a #include header. Unfinished.
David Barts <n5jrn@me.com>
parents:
23
diff
changeset
|
371 |
| 34 | 372 # Using a cache is likely to help efficiency a lot, since many pages |
| 43 | 373 # will typically #load the same standard stuff. Except if we're |
| 374 # multithreading, then we want each page's templates to be private. | |
| 34 | 375 _tcache = {} |
| 43 | 376 def _get_template_cache(name, direct, coding): |
| 34 | 377 aname = os.path.abspath(os.path.join(direct, name)) |
| 378 if aname not in _tcache: | |
|
37
ce67eac10fc7
Allow global character encoding specification.
David Barts <n5jrn@me.com>
parents:
36
diff
changeset
|
379 tmpl = ChameleonTemplate(name=name, lookup=[direct], encoding=coding) |
| 34 | 380 assert aname == tmpl.filename |
| 381 _tcache[aname] = tmpl | |
| 382 return _tcache[aname] | |
| 383 | |
| 43 | 384 def _get_template_nocache(name, direct, coding): |
| 385 return ChameleonTemplate(name=name, lookup=[direct], encoding=coding) | |
| 386 | |
| 2 | 387 # R o u t e s |
| 388 # | |
| 0 | 389 # Represents a route in TinCan. Our launcher creates these on-the-fly based |
| 390 # on the files it finds. | |
| 391 | |
| 2 | 392 _ERRMIN = 400 |
| 393 _ERRMAX = 599 | |
|
29
2e3ac3d7b0a4
A possible workaround for the drainbamage (needs testing)?
David Barts <n5jrn@me.com>
parents:
26
diff
changeset
|
394 _IEXTEN = ".pt" |
| 2 | 395 _PEXTEN = ".py" |
| 396 _TEXTEN = ".pspx" | |
|
1
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
397 _FLOOP = "tincan.forwards" |
|
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
398 _FORIG = "tincan.origin" |
|
9
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
399 _FTYPE = "tincan.iserror" |
|
58
e08e24707da1
Recognize index.pspx (and index.html, and index.htm if static).
David Barts <n5jrn@me.com>
parents:
57
diff
changeset
|
400 _INDEX = "/index" + _TEXTEN |
|
e08e24707da1
Recognize index.pspx (and index.html, and index.htm if static).
David Barts <n5jrn@me.com>
parents:
57
diff
changeset
|
401 _LINDEX = len(_INDEX) |
|
e08e24707da1
Recognize index.pspx (and index.html, and index.htm if static).
David Barts <n5jrn@me.com>
parents:
57
diff
changeset
|
402 _INDICES = [ _INDEX, "/index.html", "/index.htm" ] |
|
1
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
403 |
| 43 | 404 class _TinCanBaseRoute(object): |
| 405 """ | |
| 406 The base class for all NON ERROR routes. Error routes are just a little | |
| 407 bit different. | |
| 408 """ | |
| 409 def __init__(self, launcher, name, subdir): | |
| 410 global _get_template_cache, _get_template_nocache | |
| 411 if launcher.multithread: | |
| 412 self.lock = Lock() | |
| 413 self.get_template = _get_template_nocache | |
| 414 else: | |
| 415 self.lock = _DummyLock() | |
| 416 self.get_template = _get_template_cache | |
|
45
969f515b505b
Make it easy to leave stdout and stderr alone (untested).
David Barts <n5jrn@me.com>
parents:
44
diff
changeset
|
417 self.logger = launcher.logger |
| 43 | 418 |
| 419 def urljoin(self, *args): | |
| 420 """ | |
| 421 Normalize a parsed-out URL fragment. | |
| 422 """ | |
| 423 args = list(args) | |
| 424 if args[0] == '/': | |
| 425 args[0] = '' | |
| 426 return '/'.join(args) | |
| 427 | |
| 428 def launch(self): | |
| 429 raise NotImplementedError("This must be overridden.") | |
| 430 | |
| 431 def __call__(self): | |
| 432 raise NotImplementedError("This must be overridden.") | |
| 433 | |
| 434 class _TinCanStaticRoute(_TinCanBaseRoute): | |
|
40
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
435 """ |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
436 A route to a static file. These are useful for test servers. For |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
437 production servers, one is better off using a real web server and |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
438 a WSGI plugin, and having that handle static files. Much of this |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
439 logic is cribbed from the Bottle source code (we don't call it |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
440 directly because it is undocumented and thus subject to change). |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
441 """ |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
442 def __init__(self, launcher, name, subdir): |
| 43 | 443 super().__init__(launcher, name, subdir) |
|
40
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
444 self._app = launcher.app |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
445 self._fspath = os.path.join(launcher.fsroot, *subdir, name) |
| 43 | 446 self._urlpath = self.urljoin(launcher.urlroot, *subdir, name) |
|
40
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
447 self._type = mimetypes.guess_type(name)[0] |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
448 if self._type is None: |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
449 self._type = "application/octet-stream" |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
450 if self._type.startswith("text/"): |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
451 self._encoding = launcher.encoding |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
452 self._type += "; charset=" + launcher.encoding |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
453 else: |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
454 self._encoding = None |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
455 |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
456 def launch(self): |
|
45
969f515b505b
Make it easy to leave stdout and stderr alone (untested).
David Barts <n5jrn@me.com>
parents:
44
diff
changeset
|
457 self.logger.info("adding static route: %s", self._urlpath) |
|
40
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
458 self._app.route(self._urlpath, 'GET', self) |
|
58
e08e24707da1
Recognize index.pspx (and index.html, and index.htm if static).
David Barts <n5jrn@me.com>
parents:
57
diff
changeset
|
459 for i in _INDICES: |
|
59
60907204a265
Support case-insensitive filesystems properly.
David Barts <n5jrn@me.com>
parents:
58
diff
changeset
|
460 if _casef(self._urlpath).endswith(i): |
|
58
e08e24707da1
Recognize index.pspx (and index.html, and index.htm if static).
David Barts <n5jrn@me.com>
parents:
57
diff
changeset
|
461 li = len(i) |
|
e08e24707da1
Recognize index.pspx (and index.html, and index.htm if static).
David Barts <n5jrn@me.com>
parents:
57
diff
changeset
|
462 for j in [ self._urlpath[:1-li], self._urlpath[:-li] ]: |
|
e08e24707da1
Recognize index.pspx (and index.html, and index.htm if static).
David Barts <n5jrn@me.com>
parents:
57
diff
changeset
|
463 if j: |
|
e08e24707da1
Recognize index.pspx (and index.html, and index.htm if static).
David Barts <n5jrn@me.com>
parents:
57
diff
changeset
|
464 self.logger.info("adding static route: %s", j) |
|
e08e24707da1
Recognize index.pspx (and index.html, and index.htm if static).
David Barts <n5jrn@me.com>
parents:
57
diff
changeset
|
465 self._app.route(j, 'GET', self) |
|
40
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
466 |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
467 def _parse_date(self, ims): |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
468 """ |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
469 Parse rfc1123, rfc850 and asctime timestamps and return UTC epoch. |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
470 """ |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
471 try: |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
472 ts = email.utils.parsedate_tz(ims) |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
473 return time.mktime(ts[:8] + (0,)) - (ts[9] or 0) - time.timezone |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
474 except (TypeError, ValueError, IndexError, OverflowError): |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
475 return None |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
476 |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
477 def __call__(self): |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
478 # Get file contents and time stamp. If we can't, return an |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
479 # appropriate HTTP error response. |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
480 try: |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
481 with open(self._fspath, "rb") as fp: |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
482 mtime = os.fstat(fp.fileno()).st_mtime |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
483 bytes = fp.read() |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
484 except FileNotFoundError as e: |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
485 return bottle.HTTPError(status=404, exception=e) |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
486 except PermissionError as e: |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
487 return bottle.HTTPError(status=403, exception=e) |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
488 except OSError as e: |
|
45
969f515b505b
Make it easy to leave stdout and stderr alone (untested).
David Barts <n5jrn@me.com>
parents:
44
diff
changeset
|
489 self.logger.exception("unexpected exception reading %r", self._fspath) |
|
40
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
490 return bottle.HTTPError(status=500, exception=e) |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
491 # Establish preliminary standard headers. |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
492 headers = { |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
493 "Content-Type": self._type, |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
494 "Last-Modified": time.strftime("%a, %d %b %Y %H:%M:%S GMT", time.gmtime(mtime)), |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
495 } |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
496 if self._encoding: |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
497 headers["Content-Encoding"] = self._encoding |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
498 # Support the If-Modified-Since request header. |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
499 ims = bottle.request.environ.get('HTTP_IF_MODIFIED_SINCE') |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
500 if ims: |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
501 ims = self._parse_date(ims.split(";")[0].strip()) |
| 41 | 502 if ims is not None and ims >= int(mtime): |
|
40
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
503 headers["Content-Length"] = "0" |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
504 return bottle.HTTPResponse(body=b"", status=304, headers=headers) |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
505 # Standard response. |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
506 headers["Content-Length"] = str(len(bytes)) |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
507 return bottle.HTTPResponse(body=bytes, status=200, headers=headers) |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
508 |
|
4
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
509 class _TinCanErrorRoute(object): |
|
1
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
510 """ |
|
9
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
511 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
|
512 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
|
513 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
|
514 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
|
515 """ |
|
45
969f515b505b
Make it easy to leave stdout and stderr alone (untested).
David Barts <n5jrn@me.com>
parents:
44
diff
changeset
|
516 def __init__(self, template, loads, klass, lock, logger): |
|
1
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
517 self._template = template |
|
23
e8b6ee7e5b6b
Well, *that* attempt at includes didn't work. Revert.
David Barts <n5jrn@me.com>
parents:
22
diff
changeset
|
518 self._template.prepare() |
|
35
41da0b3d2156
Rename #include to #load (more descriptive).
David Barts <n5jrn@me.com>
parents:
34
diff
changeset
|
519 self._loads = loads |
|
9
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
520 self._class = klass |
| 43 | 521 self.lock = lock |
|
45
969f515b505b
Make it easy to leave stdout and stderr alone (untested).
David Barts <n5jrn@me.com>
parents:
44
diff
changeset
|
522 self.logger = logger |
|
1
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
523 |
|
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
524 def __call__(self, e): |
|
11
8037bad7d5a8
Update documentation, fix some #forward bugs.
David Barts <n5jrn@me.com>
parents:
9
diff
changeset
|
525 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
|
526 try: |
|
8186de188daf
Improve the run-time error handling in code-behinds.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
527 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
|
528 obj.handle() |
|
35
41da0b3d2156
Rename #include to #load (more descriptive).
David Barts <n5jrn@me.com>
parents:
34
diff
changeset
|
529 tvars = self._loads.copy() |
|
29
2e3ac3d7b0a4
A possible workaround for the drainbamage (needs testing)?
David Barts <n5jrn@me.com>
parents:
26
diff
changeset
|
530 tvars.update(obj.export()) |
| 43 | 531 with self.lock: |
| 532 return self._template.render(tvars).lstrip('\n') | |
|
17
8186de188daf
Improve the run-time error handling in code-behinds.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
533 except bottle.HTTPResponse as e: |
|
8186de188daf
Improve the run-time error handling in code-behinds.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
534 return e |
|
8186de188daf
Improve the run-time error handling in code-behinds.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
535 except Exception as e: |
|
45
969f515b505b
Make it easy to leave stdout and stderr alone (untested).
David Barts <n5jrn@me.com>
parents:
44
diff
changeset
|
536 self.logger.exception("unexpected exception in error page") |
|
18
e88ab99914cf
More improvements to the error reportage.
David Barts <n5jrn@me.com>
parents:
17
diff
changeset
|
537 # 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
|
538 # 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
|
539 # 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
|
540 # 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
|
541 # ignored. |
|
17
8186de188daf
Improve the run-time error handling in code-behinds.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
542 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
|
543 |
| 43 | 544 class _TinCanRoute(_TinCanBaseRoute): |
| 0 | 545 """ |
| 546 A route created by the TinCan launcher. | |
| 547 """ | |
| 548 def __init__(self, launcher, name, subdir): | |
| 43 | 549 super().__init__(launcher, name, subdir) |
| 0 | 550 self._fsroot = launcher.fsroot |
| 551 self._urlroot = launcher.urlroot | |
| 552 self._name = name | |
| 2 | 553 self._python = name + _PEXTEN |
| 554 self._fspath = os.path.join(launcher.fsroot, *subdir, name + _TEXTEN) | |
| 43 | 555 self._urlpath = self.urljoin(launcher.urlroot, *subdir, name + _TEXTEN) |
| 0 | 556 self._origin = self._urlpath |
| 557 self._subdir = subdir | |
| 558 self._seen = set() | |
| 559 self._app = launcher.app | |
|
37
ce67eac10fc7
Allow global character encoding specification.
David Barts <n5jrn@me.com>
parents:
36
diff
changeset
|
560 self._encoding = launcher.encoding |
| 0 | 561 |
| 2 | 562 def launch(self): |
| 0 | 563 """ |
| 564 Launch a single page. | |
| 565 """ | |
| 566 # 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
|
567 oheader = None |
| 0 | 568 while True: |
|
11
8037bad7d5a8
Update documentation, fix some #forward bugs.
David Barts <n5jrn@me.com>
parents:
9
diff
changeset
|
569 try: |
|
8037bad7d5a8
Update documentation, fix some #forward bugs.
David Barts <n5jrn@me.com>
parents:
9
diff
changeset
|
570 self._template = TemplateFile(self._fspath) |
|
8037bad7d5a8
Update documentation, fix some #forward bugs.
David Barts <n5jrn@me.com>
parents:
9
diff
changeset
|
571 except IOError as e: |
|
12
496d43d551d2
More redirecting fixes and improved error reportage.
David Barts <n5jrn@me.com>
parents:
11
diff
changeset
|
572 if oheader is not None: |
|
496d43d551d2
More redirecting fixes and improved error reportage.
David Barts <n5jrn@me.com>
parents:
11
diff
changeset
|
573 note = "{0}: invalid #forward: ".format(self._origin) |
|
496d43d551d2
More redirecting fixes and improved error reportage.
David Barts <n5jrn@me.com>
parents:
11
diff
changeset
|
574 else: |
|
496d43d551d2
More redirecting fixes and improved error reportage.
David Barts <n5jrn@me.com>
parents:
11
diff
changeset
|
575 note = "" |
|
496d43d551d2
More redirecting fixes and improved error reportage.
David Barts <n5jrn@me.com>
parents:
11
diff
changeset
|
576 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
|
577 try: |
|
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
578 self._header = TemplateHeader(self._template.header) |
|
9
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
579 except TemplateHeaderError as e: |
|
4
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
580 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
|
581 if oheader is None: |
|
8037bad7d5a8
Update documentation, fix some #forward bugs.
David Barts <n5jrn@me.com>
parents:
9
diff
changeset
|
582 oheader = self._header # save original header |
|
8037bad7d5a8
Update documentation, fix some #forward bugs.
David Barts <n5jrn@me.com>
parents:
9
diff
changeset
|
583 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
|
584 raise TinCanError("{0}: invalid #forward".format(self._origin)) |
| 0 | 585 if self._header.forward is None: |
| 586 break | |
|
45
969f515b505b
Make it easy to leave stdout and stderr alone (untested).
David Barts <n5jrn@me.com>
parents:
44
diff
changeset
|
587 # self.logger.debug("forwarding from: %s", self._urlpath) # debug |
| 0 | 588 self._redirect() |
|
45
969f515b505b
Make it easy to leave stdout and stderr alone (untested).
David Barts <n5jrn@me.com>
parents:
44
diff
changeset
|
589 # self.logger.debug("forwarded to: %s", self._urlpath) # debug |
|
4
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
590 # If this is a #hidden page, we ignore it for now, since hidden pages |
| 0 | 591 # don't get routes made for them. |
|
67
b5e72129ef72
Support #errors w/ no params, as documented.
David Barts <n5jrn@me.com>
parents:
66
diff
changeset
|
592 if oheader.hidden and oheader.errors is None: |
| 0 | 593 return |
|
4
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
594 # 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
|
595 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
|
596 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
|
597 else: |
|
59
60907204a265
Support case-insensitive filesystems properly.
David Barts <n5jrn@me.com>
parents:
58
diff
changeset
|
598 if not _casef(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
|
599 raise TinCanError("{0}: #python files must end in {1}".format(self._urlpath, _PEXTEN)) |
| 0 | 600 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
|
601 self._python_specified = True |
| 0 | 602 # Obtain a class object by importing and introspecting a module. |
| 3 | 603 self._getclass() |
|
35
41da0b3d2156
Rename #include to #load (more descriptive).
David Barts <n5jrn@me.com>
parents:
34
diff
changeset
|
604 # Build body object (#template) and obtain #loads. |
| 3 | 605 if self._header.template is not None: |
|
59
60907204a265
Support case-insensitive filesystems properly.
David Barts <n5jrn@me.com>
parents:
58
diff
changeset
|
606 if not _casef(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
|
607 raise TinCanError("{0}: #template files must end in {1}".format(self._urlpath, _TEXTEN)) |
| 16 | 608 try: |
|
29
2e3ac3d7b0a4
A possible workaround for the drainbamage (needs testing)?
David Barts <n5jrn@me.com>
parents:
26
diff
changeset
|
609 rtpath = self._splitpath(self._header.template) |
|
2e3ac3d7b0a4
A possible workaround for the drainbamage (needs testing)?
David Barts <n5jrn@me.com>
parents:
26
diff
changeset
|
610 tpath = os.path.normpath(os.path.join(self._fsroot, *rtpath)) |
| 16 | 611 tfile = TemplateFile(tpath) |
|
29
2e3ac3d7b0a4
A possible workaround for the drainbamage (needs testing)?
David Barts <n5jrn@me.com>
parents:
26
diff
changeset
|
612 except OSError as e: |
| 16 | 613 raise TinCanError("{0}: invalid #template: {1!s}".format(self._urlpath, e)) from e |
| 614 except IndexError as e: | |
| 615 raise TinCanError("{0}: invalid #template".format(self._urlpath)) from e | |
|
58
e08e24707da1
Recognize index.pspx (and index.html, and index.htm if static).
David Barts <n5jrn@me.com>
parents:
57
diff
changeset
|
616 self._body = self._mktemplate(tfile.body, self.urljoin(*rtpath)) |
| 3 | 617 else: |
|
57
935f8013f540
Fix lack of error detection and recovery in template parsing.
David Barts <n5jrn@me.com>
parents:
56
diff
changeset
|
618 self._body = self._mktemplate(self._template.body, self._urlpath) |
|
29
2e3ac3d7b0a4
A possible workaround for the drainbamage (needs testing)?
David Barts <n5jrn@me.com>
parents:
26
diff
changeset
|
619 self._body.prepare() |
|
35
41da0b3d2156
Rename #include to #load (more descriptive).
David Barts <n5jrn@me.com>
parents:
34
diff
changeset
|
620 # Process loads |
|
41da0b3d2156
Rename #include to #load (more descriptive).
David Barts <n5jrn@me.com>
parents:
34
diff
changeset
|
621 self._loads = {} |
|
41da0b3d2156
Rename #include to #load (more descriptive).
David Barts <n5jrn@me.com>
parents:
34
diff
changeset
|
622 for load in self._header.load: |
|
29
2e3ac3d7b0a4
A possible workaround for the drainbamage (needs testing)?
David Barts <n5jrn@me.com>
parents:
26
diff
changeset
|
623 try: |
|
35
41da0b3d2156
Rename #include to #load (more descriptive).
David Barts <n5jrn@me.com>
parents:
34
diff
changeset
|
624 load = _LoadedFile(load) |
|
29
2e3ac3d7b0a4
A possible workaround for the drainbamage (needs testing)?
David Barts <n5jrn@me.com>
parents:
26
diff
changeset
|
625 except ValueError as e: |
|
35
41da0b3d2156
Rename #include to #load (more descriptive).
David Barts <n5jrn@me.com>
parents:
34
diff
changeset
|
626 raise TinCanError("{0}: bad #load: {1!s}".format(self._urlpath, e)) from e |
|
41da0b3d2156
Rename #include to #load (more descriptive).
David Barts <n5jrn@me.com>
parents:
34
diff
changeset
|
627 if load.in_lib: |
|
29
2e3ac3d7b0a4
A possible workaround for the drainbamage (needs testing)?
David Barts <n5jrn@me.com>
parents:
26
diff
changeset
|
628 fdir = os.path.join(self._fsroot, _WINF, "tlib") |
|
2e3ac3d7b0a4
A possible workaround for the drainbamage (needs testing)?
David Barts <n5jrn@me.com>
parents:
26
diff
changeset
|
629 else: |
| 32 | 630 fdir = os.path.join(self._fsroot, *self._subdir) |
|
29
2e3ac3d7b0a4
A possible workaround for the drainbamage (needs testing)?
David Barts <n5jrn@me.com>
parents:
26
diff
changeset
|
631 try: |
| 43 | 632 tmpl = self.get_template(load.fname, fdir, self._encoding) |
|
29
2e3ac3d7b0a4
A possible workaround for the drainbamage (needs testing)?
David Barts <n5jrn@me.com>
parents:
26
diff
changeset
|
633 except Exception as e: |
|
35
41da0b3d2156
Rename #include to #load (more descriptive).
David Barts <n5jrn@me.com>
parents:
34
diff
changeset
|
634 raise TinCanError("{0}: bad #load: {1!s}".format(self._urlpath, e)) from e |
|
41da0b3d2156
Rename #include to #load (more descriptive).
David Barts <n5jrn@me.com>
parents:
34
diff
changeset
|
635 self._loads[load.vname] = tmpl.tpl |
|
9
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
636 # 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
|
637 if oheader.errors is not None: |
|
8037bad7d5a8
Update documentation, fix some #forward bugs.
David Barts <n5jrn@me.com>
parents:
9
diff
changeset
|
638 self._mkerror(oheader.errors) |
|
9
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
639 return # this implies #hidden |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
640 # Get #methods for this route |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
641 if self._header.methods is None: |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
642 methods = [ 'GET' ] |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
643 else: |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
644 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
|
645 if not methods: |
|
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
646 raise TinCanError("{0}: no #methods specified".format(self._urlpath)) |
| 3 | 647 # Register this thing with Bottle |
|
58
e08e24707da1
Recognize index.pspx (and index.html, and index.htm if static).
David Barts <n5jrn@me.com>
parents:
57
diff
changeset
|
648 mtxt = ','.join(methods) |
|
e08e24707da1
Recognize index.pspx (and index.html, and index.htm if static).
David Barts <n5jrn@me.com>
parents:
57
diff
changeset
|
649 self.logger.info("adding route: %s (%s)", self._origin, mtxt) |
| 3 | 650 self._app.route(self._origin, methods, self) |
|
59
60907204a265
Support case-insensitive filesystems properly.
David Barts <n5jrn@me.com>
parents:
58
diff
changeset
|
651 if _casef(self._origin).endswith(_INDEX): |
|
58
e08e24707da1
Recognize index.pspx (and index.html, and index.htm if static).
David Barts <n5jrn@me.com>
parents:
57
diff
changeset
|
652 for i in [ self._origin[:1-_LINDEX], self._origin[:-_LINDEX] ]: |
|
e08e24707da1
Recognize index.pspx (and index.html, and index.htm if static).
David Barts <n5jrn@me.com>
parents:
57
diff
changeset
|
653 if i: |
|
e08e24707da1
Recognize index.pspx (and index.html, and index.htm if static).
David Barts <n5jrn@me.com>
parents:
57
diff
changeset
|
654 self.logger.info("adding route: %s (%s)", i, mtxt) |
|
e08e24707da1
Recognize index.pspx (and index.html, and index.htm if static).
David Barts <n5jrn@me.com>
parents:
57
diff
changeset
|
655 self._app.route(i, methods, self) |
| 3 | 656 |
|
57
935f8013f540
Fix lack of error detection and recovery in template parsing.
David Barts <n5jrn@me.com>
parents:
56
diff
changeset
|
657 def _mktemplate(self, source, name): |
|
935f8013f540
Fix lack of error detection and recovery in template parsing.
David Barts <n5jrn@me.com>
parents:
56
diff
changeset
|
658 try: |
|
935f8013f540
Fix lack of error detection and recovery in template parsing.
David Barts <n5jrn@me.com>
parents:
56
diff
changeset
|
659 return ChameleonTemplate(source=source, encoding=self._encoding) |
|
935f8013f540
Fix lack of error detection and recovery in template parsing.
David Barts <n5jrn@me.com>
parents:
56
diff
changeset
|
660 except TemplateError as e: |
|
935f8013f540
Fix lack of error detection and recovery in template parsing.
David Barts <n5jrn@me.com>
parents:
56
diff
changeset
|
661 raise TinCanError("{0}: {1!s}".format(name, e)) from e |
|
935f8013f540
Fix lack of error detection and recovery in template parsing.
David Barts <n5jrn@me.com>
parents:
56
diff
changeset
|
662 |
| 3 | 663 def _splitpath(self, unsplit): |
| 664 return _normpath(self._subdir, unsplit) | |
| 665 | |
|
11
8037bad7d5a8
Update documentation, fix some #forward bugs.
David Barts <n5jrn@me.com>
parents:
9
diff
changeset
|
666 def _mkerror(self, rerrors): |
| 3 | 667 try: |
|
11
8037bad7d5a8
Update documentation, fix some #forward bugs.
David Barts <n5jrn@me.com>
parents:
9
diff
changeset
|
668 errors = [ int(i) for i in rerrors.split() ] |
| 3 | 669 except ValueError as e: |
| 670 raise TinCanError("{0}: bad #errors line".format(self._urlpath)) from e | |
| 671 if not errors: | |
| 672 errors = range(_ERRMIN, _ERRMAX+1) | |
|
37
ce67eac10fc7
Allow global character encoding specification.
David Barts <n5jrn@me.com>
parents:
36
diff
changeset
|
673 route = _TinCanErrorRoute( |
|
ce67eac10fc7
Allow global character encoding specification.
David Barts <n5jrn@me.com>
parents:
36
diff
changeset
|
674 ChameleonTemplate(source=self._template.body, encoding=self._encoding), |
|
45
969f515b505b
Make it easy to leave stdout and stderr alone (untested).
David Barts <n5jrn@me.com>
parents:
44
diff
changeset
|
675 self._loads, self._class, self.lock, self.logger) |
| 3 | 676 for error in errors: |
| 677 if error < _ERRMIN or error > _ERRMAX: | |
| 678 raise TinCanError("{0}: bad #errors code".format(self._urlpath)) | |
| 5 | 679 self._app.error_handler[error] = route # XXX |
| 3 | 680 |
|
7
57ec65f527e9
Eliminate a stat() call, allow no code-behind on pages.
David Barts <n5jrn@me.com>
parents:
6
diff
changeset
|
681 def _gettime(self, path): |
|
57ec65f527e9
Eliminate a stat() call, allow no code-behind on pages.
David Barts <n5jrn@me.com>
parents:
6
diff
changeset
|
682 try: |
|
57ec65f527e9
Eliminate a stat() call, allow no code-behind on pages.
David Barts <n5jrn@me.com>
parents:
6
diff
changeset
|
683 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
|
684 except FileNotFoundError: |
|
57ec65f527e9
Eliminate a stat() call, allow no code-behind on pages.
David Barts <n5jrn@me.com>
parents:
6
diff
changeset
|
685 return 0 |
| 8 | 686 except OSError as e: |
|
9
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
687 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
|
688 |
| 3 | 689 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
|
690 try: |
|
560c8fb55e4a
Fix bugs in #python directive, make code-behind class loading simpler.
David Barts <n5jrn@me.com>
parents:
14
diff
changeset
|
691 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
|
692 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
|
693 raise TinCanError("{0}: invalid #python".format(self._urlpath)) from e |
|
67
b5e72129ef72
Support #errors w/ no params, as documented.
David Barts <n5jrn@me.com>
parents:
66
diff
changeset
|
694 klass = ErrorPage if self._header.errors is not None else Page |
|
7
57ec65f527e9
Eliminate a stat() call, allow no code-behind on pages.
David Barts <n5jrn@me.com>
parents:
6
diff
changeset
|
695 # 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
|
696 pytime = self._gettime(pypath) |
|
57ec65f527e9
Eliminate a stat() call, allow no code-behind on pages.
David Barts <n5jrn@me.com>
parents:
6
diff
changeset
|
697 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
|
698 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
|
699 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
|
700 self._class = klass |
|
7
57ec65f527e9
Eliminate a stat() call, allow no code-behind on pages.
David Barts <n5jrn@me.com>
parents:
6
diff
changeset
|
701 return |
|
57ec65f527e9
Eliminate a stat() call, allow no code-behind on pages.
David Barts <n5jrn@me.com>
parents:
6
diff
changeset
|
702 # Else load the code-behind from a .py file |
| 0 | 703 pycpath = pypath + 'c' |
|
7
57ec65f527e9
Eliminate a stat() call, allow no code-behind on pages.
David Barts <n5jrn@me.com>
parents:
6
diff
changeset
|
704 pyctime = self._gettime(pycpath) |
| 0 | 705 try: |
|
7
57ec65f527e9
Eliminate a stat() call, allow no code-behind on pages.
David Barts <n5jrn@me.com>
parents:
6
diff
changeset
|
706 if pyctime < pytime: |
|
4
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
707 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
|
708 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
|
709 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
|
710 except Exception as e: |
|
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
711 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
|
712 try: |
|
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
713 spec = importlib.util.spec_from_file_location(_mangle(self._name), pycpath) |
| 0 | 714 mod = importlib.util.module_from_spec(spec) |
| 715 spec.loader.exec_module(mod) | |
| 716 except Exception as e: | |
| 16 | 717 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
|
718 # 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
|
719 # we can find in the inheritance tree. |
| 0 | 720 self._class = None |
|
19
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
721 score = -1 |
|
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
722 ambig = False |
| 0 | 723 for i in dir(mod): |
| 724 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
|
725 if not isclass(v): |
|
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
726 continue |
|
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
727 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
|
728 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
|
729 self._class = v |
|
19
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
730 score = d |
|
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
731 ambig = False |
|
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
732 elif d == score: |
|
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
733 ambig = True |
| 3 | 734 if self._class is None: |
|
9
75e375b1976a
Error pages now can have code-behind.
David Barts <n5jrn@me.com>
parents:
8
diff
changeset
|
735 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
|
736 if ambig: |
|
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
737 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
|
738 |
|
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
739 # 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
|
740 # 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
|
741 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
|
742 if klass is object: |
|
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
743 # not found |
|
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
744 return -1 |
|
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
745 elif klass is base: |
|
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
746 # just found |
|
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
747 return count |
|
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
748 else: |
|
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
749 # must recurse |
|
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
750 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
|
751 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
|
752 if result > 0: |
|
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
753 return result |
|
5d9a1b82251a
Return the "deepest" subclass; this allows subclassing tincan.Page and
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
754 return -1 |
| 0 | 755 |
| 756 def _redirect(self): | |
| 757 try: | |
| 758 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
|
759 forw = '/' + '/'.join(rlist) |
|
11
8037bad7d5a8
Update documentation, fix some #forward bugs.
David Barts <n5jrn@me.com>
parents:
9
diff
changeset
|
760 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
|
761 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
|
762 self._seen.add(forw) |
| 0 | 763 rname = rlist.pop() |
| 764 except IndexError as e: | |
| 765 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
|
766 name, ext = os.path.splitext(rname) |
|
59
60907204a265
Support case-insensitive filesystems properly.
David Barts <n5jrn@me.com>
parents:
58
diff
changeset
|
767 if _casef(ext) != _TEXTEN: |
| 0 | 768 raise TinCanError("{0}: invalid #forward".format(self._urlpath)) |
| 769 self._subdir = rlist | |
| 2 | 770 self._python = name + _PEXTEN |
| 0 | 771 self._fspath = os.path.join(self._fsroot, *self._subdir, rname) |
| 43 | 772 self._urlpath = '/' + self.urljoin(*self._subdir, rname) |
| 0 | 773 |
|
1
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
774 def __call__(self): |
| 0 | 775 """ |
| 776 This gets called by the framework AFTER the page is launched. | |
| 777 """ | |
|
1
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
778 target = None |
|
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
779 try: |
|
17
8186de188daf
Improve the run-time error handling in code-behinds.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
780 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
|
781 obj.handle() |
|
35
41da0b3d2156
Rename #include to #load (more descriptive).
David Barts <n5jrn@me.com>
parents:
34
diff
changeset
|
782 tvars = self._loads.copy() |
|
29
2e3ac3d7b0a4
A possible workaround for the drainbamage (needs testing)?
David Barts <n5jrn@me.com>
parents:
26
diff
changeset
|
783 tvars.update(obj.export()) |
| 43 | 784 with self.lock: |
| 785 return self._body.render(tvars).lstrip('\n') | |
|
1
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
786 except ForwardException as fwd: |
|
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
787 target = fwd.target |
|
17
8186de188daf
Improve the run-time error handling in code-behinds.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
788 except bottle.HTTPResponse as e: |
|
8186de188daf
Improve the run-time error handling in code-behinds.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
789 return e |
|
8186de188daf
Improve the run-time error handling in code-behinds.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
790 except Exception as e: |
|
45
969f515b505b
Make it easy to leave stdout and stderr alone (untested).
David Barts <n5jrn@me.com>
parents:
44
diff
changeset
|
791 self.logger.exception("%s: unexpected exception", self._urlpath) |
|
17
8186de188daf
Improve the run-time error handling in code-behinds.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
792 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
|
793 if target is None: |
|
45
969f515b505b
Make it easy to leave stdout and stderr alone (untested).
David Barts <n5jrn@me.com>
parents:
44
diff
changeset
|
794 self.logger.error("%s: unexpected null target", self._urlpath) |
|
17
8186de188daf
Improve the run-time error handling in code-behinds.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
795 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
|
796 # 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
|
797 # forward. |
|
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
798 environ = bottle.request.environ |
|
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
799 if _FORIG not in environ: |
|
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
800 environ[_FORIG] = self._urlpath |
| 2 | 801 if _FLOOP not in environ: |
| 802 environ[_FLOOP] = set([self._urlpath]) | |
|
1
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
803 elif target in environ[_FLOOP]: |
|
45
969f515b505b
Make it easy to leave stdout and stderr alone (untested).
David Barts <n5jrn@me.com>
parents:
44
diff
changeset
|
804 self.logger.error("%s: forward loop detected", environ[_FORIG]) |
|
17
8186de188daf
Improve the run-time error handling in code-behinds.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
805 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
|
806 environ[_FLOOP].add(target) |
|
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
807 environ['bottle.raw_path'] = target |
|
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
808 environ['PATH_INFO'] = urllib.parse.quote(target) |
|
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
809 route, args = self._app.router.match(environ) |
|
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
810 environ['route.handle'] = environ['bottle.route'] = route |
|
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
811 environ['route.url_args'] = args |
|
94b36e721500
Another check in to back stuff up.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
812 return route.call(**args) |
| 0 | 813 |
| 43 | 814 # M u t e x |
| 815 # | |
| 816 # A dummy lock class, which is what we use if we don't need locking. | |
| 817 | |
| 818 class _DummyLock(object): | |
| 819 def acquire(self, blocking=True, timeout=-1): | |
| 820 pass | |
| 821 | |
| 822 def release(self): | |
| 823 pass | |
| 824 | |
| 825 def __enter__(self): | |
| 826 self.acquire() | |
| 827 return self | |
| 828 | |
| 829 def __exit__(self, exc_type, exc_value, traceback): | |
| 830 self.release() | |
| 831 return False | |
| 832 | |
| 2 | 833 # L a u n c h e r |
| 834 | |
| 835 _WINF = "WEB-INF" | |
|
40
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
836 _EBANNED = set([_IEXTEN, _TEXTEN, _PEXTEN, _PEXTEN+"c"]) |
|
37
ce67eac10fc7
Allow global character encoding specification.
David Barts <n5jrn@me.com>
parents:
36
diff
changeset
|
837 ENCODING = "utf-8" |
| 53 | 838 _BITBUCKET = logging.getLogger(__name__) |
| 839 _BITBUCKET.addHandler(logging.NullHandler) | |
| 2 | 840 |
| 841 class _Launcher(object): | |
| 842 """ | |
| 843 Helper class for launching webapps. | |
| 844 """ | |
|
45
969f515b505b
Make it easy to leave stdout and stderr alone (untested).
David Barts <n5jrn@me.com>
parents:
44
diff
changeset
|
845 def __init__(self, fsroot, urlroot, multithread): |
| 2 | 846 """ |
| 847 Lightweight constructor. The real action happens in .launch() below. | |
| 848 """ | |
| 849 self.fsroot = fsroot | |
| 850 self.urlroot = urlroot | |
| 851 self.app = None | |
|
4
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
852 self.errors = 0 |
|
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
853 self.debug = False |
|
37
ce67eac10fc7
Allow global character encoding specification.
David Barts <n5jrn@me.com>
parents:
36
diff
changeset
|
854 self.encoding = ENCODING |
|
40
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
855 self.static = False |
| 43 | 856 self.multithread = multithread |
| 53 | 857 self.logger = _BITBUCKET |
| 2 | 858 |
| 859 def launch(self): | |
| 860 """ | |
| 861 Does the actual work of launching something. XXX - modifies sys.path | |
| 862 and never un-modifies it. | |
| 863 """ | |
| 864 # Sanity checks | |
| 865 if not self.urlroot.startswith("/"): | |
|
18
e88ab99914cf
More improvements to the error reportage.
David Barts <n5jrn@me.com>
parents:
17
diff
changeset
|
866 self.errors = 1 |
| 66 | 867 self.logger.error("urlroot not absolute: %r", self.urlroot) |
|
18
e88ab99914cf
More improvements to the error reportage.
David Barts <n5jrn@me.com>
parents:
17
diff
changeset
|
868 return self |
| 2 | 869 if not os.path.isdir(self.fsroot): |
|
18
e88ab99914cf
More improvements to the error reportage.
David Barts <n5jrn@me.com>
parents:
17
diff
changeset
|
870 self.errors = 1 |
| 66 | 871 self.logger.error("no such directory: %r", self.fsroot) |
|
18
e88ab99914cf
More improvements to the error reportage.
David Barts <n5jrn@me.com>
parents:
17
diff
changeset
|
872 return self |
|
e88ab99914cf
More improvements to the error reportage.
David Barts <n5jrn@me.com>
parents:
17
diff
changeset
|
873 # 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
|
874 # 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
|
875 # directory trees containing sensitive files. |
| 2 | 876 winf = os.path.join(self.fsroot, _WINF) |
|
18
e88ab99914cf
More improvements to the error reportage.
David Barts <n5jrn@me.com>
parents:
17
diff
changeset
|
877 if not os.path.isdir(winf): |
|
e88ab99914cf
More improvements to the error reportage.
David Barts <n5jrn@me.com>
parents:
17
diff
changeset
|
878 self.errors = 1 |
| 66 | 879 self.logger.error("no WEB-INF directory in %r", self.fsroot) |
|
18
e88ab99914cf
More improvements to the error reportage.
David Barts <n5jrn@me.com>
parents:
17
diff
changeset
|
880 return self |
| 2 | 881 lib = os.path.join(winf, "lib") |
|
18
e88ab99914cf
More improvements to the error reportage.
David Barts <n5jrn@me.com>
parents:
17
diff
changeset
|
882 for i in [ lib ]: |
| 2 | 883 if not os.path.isdir(i): |
| 884 os.mkdir(i) | |
| 885 # Add our private lib directory to sys.path | |
| 886 sys.path.insert(1, os.path.abspath(lib)) | |
| 887 # Do what we gotta do | |
| 888 self.app = TinCan() | |
| 56 | 889 config = self.app.config |
| 890 config['tincan.fsroot'] = os.path.abspath(self.fsroot) | |
| 891 config['tincan.urlroot'] = self.urlroot | |
| 892 config['tincan.logger'] = self.logger | |
| 893 config['tincan.encoding'] = self.encoding | |
| 2 | 894 self._launch([]) |
|
4
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
895 return self |
| 2 | 896 |
| 897 def _launch(self, subdir): | |
| 898 for entry in os.listdir(os.path.join(self.fsroot, *subdir)): | |
|
42
8948020c54fd
Remove some debug deadwood, ignore hidden files.
David Barts <n5jrn@me.com>
parents:
41
diff
changeset
|
899 if entry.startswith("."): |
|
8948020c54fd
Remove some debug deadwood, ignore hidden files.
David Barts <n5jrn@me.com>
parents:
41
diff
changeset
|
900 continue # hidden file |
|
59
60907204a265
Support case-insensitive filesystems properly.
David Barts <n5jrn@me.com>
parents:
58
diff
changeset
|
901 if not subdir and _casef(entry, "upper") == _WINF: |
| 2 | 902 continue |
| 903 etype = os.stat(os.path.join(self.fsroot, *subdir, entry)).st_mode | |
| 904 if S_ISREG(etype): | |
| 905 ename, eext = os.path.splitext(entry) | |
|
59
60907204a265
Support case-insensitive filesystems properly.
David Barts <n5jrn@me.com>
parents:
58
diff
changeset
|
906 eext = _casef(eext) |
|
40
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
907 if eext == _TEXTEN: |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
908 route = _TinCanRoute(self, ename, subdir) |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
909 else: |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
910 if eext in _EBANNED: |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
911 continue |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
912 if self.static: |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
913 route = _TinCanStaticRoute(self, entry, subdir) |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
914 else: |
|
df27cf08c093
Add support for serving static files.
David Barts <n5jrn@me.com>
parents:
37
diff
changeset
|
915 continue |
|
4
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
916 try: |
|
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
917 route.launch() |
|
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
918 except TinCanError as e: |
|
45
969f515b505b
Make it easy to leave stdout and stderr alone (untested).
David Barts <n5jrn@me.com>
parents:
44
diff
changeset
|
919 if self.logger.getEffectiveLevel() <= logging.DEBUG: |
|
969f515b505b
Make it easy to leave stdout and stderr alone (untested).
David Barts <n5jrn@me.com>
parents:
44
diff
changeset
|
920 self.logger.exception(str(e)) |
|
969f515b505b
Make it easy to leave stdout and stderr alone (untested).
David Barts <n5jrn@me.com>
parents:
44
diff
changeset
|
921 else: |
|
969f515b505b
Make it easy to leave stdout and stderr alone (untested).
David Barts <n5jrn@me.com>
parents:
44
diff
changeset
|
922 self.logger.error(str(e)) |
|
4
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
923 self.errors += 1 |
| 2 | 924 elif S_ISDIR(etype): |
| 925 self._launch(subdir + [entry]) | |
| 926 | |
| 53 | 927 def launch(fsroot=None, urlroot='/', multithread=True, **kwargs): |
| 2 | 928 """ |
| 929 Launch and return a TinCan webapp. Does not run the app; it is the | |
| 930 caller's responsibility to call app.run() | |
| 931 """ | |
| 932 if fsroot is None: | |
| 933 fsroot = os.getcwd() | |
|
45
969f515b505b
Make it easy to leave stdout and stderr alone (untested).
David Barts <n5jrn@me.com>
parents:
44
diff
changeset
|
934 launcher = _Launcher(fsroot, urlroot, multithread) |
| 54 | 935 allowed = set(["logger", "encoding", "static"]) |
| 936 for k, v in kwargs.items(): | |
| 937 if k not in allowed: | |
| 938 raise TypeError("launch() got an unexpected keyword argument {0!r}".format(k)) | |
| 939 setattr(launcher, k, v) | |
|
4
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
940 launcher.launch() |
|
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
941 return launcher.app, launcher.errors |
|
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
942 |
|
0d47859f792a
Finally got "hello, world" working. Still likely many bugs.
David Barts <n5jrn@me.com>
parents:
3
diff
changeset
|
943 # 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
|
944 # launcher script for why. |