Mercurial > piecrust2
annotate piecrust/formatting/markdownformatter.py @ 369:4b1019bb2533
serve: Giant refactor to change how we handle data when serving pages.
* We need a distinction between source metadata and route metadata. In most
cases they're the same, but in cases like taxonomy pages, route metadata
contains more things that can't be in source metadata if we want to re-use
cached pages.
* Create a new `QualifiedPage` type which is a page with a specific route
and route metadata. Pass this around in many places.
* Instead of passing an URL around, use the route in the `QualifiedPage` to
generate URLs. This is better since it removes the guess-work from trying
to generate URLs for sub-pages.
* Deep-copy app and page configurations before passing them around to things
that could modify them, like data builders and such.
* Exclude taxonomy pages from iterator data providers.
* Properly nest iterator data providers for when the theme and user page
sources are merged inside `site.pages`.
author | Ludovic Chabant <ludovic@chabant.com> |
---|---|
date | Sun, 03 May 2015 18:47:10 -0700 |
parents | cd049786c008 |
children | d1a472464e57 |
rev | line source |
---|---|
3
f485ba500df3
Gigantic change to basically make PieCrust 2 vaguely functional.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff
changeset
|
1 from markdown import markdown |
f485ba500df3
Gigantic change to basically make PieCrust 2 vaguely functional.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff
changeset
|
2 from piecrust.formatting.base import Formatter |
f485ba500df3
Gigantic change to basically make PieCrust 2 vaguely functional.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff
changeset
|
3 |
f485ba500df3
Gigantic change to basically make PieCrust 2 vaguely functional.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff
changeset
|
4 |
f485ba500df3
Gigantic change to basically make PieCrust 2 vaguely functional.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff
changeset
|
5 class MarkdownFormatter(Formatter): |
f485ba500df3
Gigantic change to basically make PieCrust 2 vaguely functional.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff
changeset
|
6 FORMAT_NAMES = ['markdown', 'mdown', 'md'] |
f485ba500df3
Gigantic change to basically make PieCrust 2 vaguely functional.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff
changeset
|
7 OUTPUT_FORMAT = 'html' |
f485ba500df3
Gigantic change to basically make PieCrust 2 vaguely functional.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff
changeset
|
8 |
20
c95c90c82263
Add support for Markdown extensions.
Ludovic Chabant <ludovic@chabant.com>
parents:
3
diff
changeset
|
9 def __init__(self): |
c95c90c82263
Add support for Markdown extensions.
Ludovic Chabant <ludovic@chabant.com>
parents:
3
diff
changeset
|
10 super(MarkdownFormatter, self).__init__() |
c95c90c82263
Add support for Markdown extensions.
Ludovic Chabant <ludovic@chabant.com>
parents:
3
diff
changeset
|
11 self._extensions = None |
c95c90c82263
Add support for Markdown extensions.
Ludovic Chabant <ludovic@chabant.com>
parents:
3
diff
changeset
|
12 |
3
f485ba500df3
Gigantic change to basically make PieCrust 2 vaguely functional.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff
changeset
|
13 def render(self, format_name, txt): |
76
fdb08d986384
Add SmartyPants formatting.
Ludovic Chabant <ludovic@chabant.com>
parents:
58
diff
changeset
|
14 assert format_name in self.FORMAT_NAMES |
20
c95c90c82263
Add support for Markdown extensions.
Ludovic Chabant <ludovic@chabant.com>
parents:
3
diff
changeset
|
15 self._ensureInitialized() |
c95c90c82263
Add support for Markdown extensions.
Ludovic Chabant <ludovic@chabant.com>
parents:
3
diff
changeset
|
16 return markdown(txt, extensions=self._extensions) |
c95c90c82263
Add support for Markdown extensions.
Ludovic Chabant <ludovic@chabant.com>
parents:
3
diff
changeset
|
17 |
c95c90c82263
Add support for Markdown extensions.
Ludovic Chabant <ludovic@chabant.com>
parents:
3
diff
changeset
|
18 def _ensureInitialized(self): |
c95c90c82263
Add support for Markdown extensions.
Ludovic Chabant <ludovic@chabant.com>
parents:
3
diff
changeset
|
19 if self._extensions is not None: |
c95c90c82263
Add support for Markdown extensions.
Ludovic Chabant <ludovic@chabant.com>
parents:
3
diff
changeset
|
20 return |
3
f485ba500df3
Gigantic change to basically make PieCrust 2 vaguely functional.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff
changeset
|
21 |
58
95590732e4c9
More robust Markdown configuration handling.
Ludovic Chabant <ludovic@chabant.com>
parents:
20
diff
changeset
|
22 config = self.app.config.get('markdown') |
95590732e4c9
More robust Markdown configuration handling.
Ludovic Chabant <ludovic@chabant.com>
parents:
20
diff
changeset
|
23 if config is None: |
95590732e4c9
More robust Markdown configuration handling.
Ludovic Chabant <ludovic@chabant.com>
parents:
20
diff
changeset
|
24 config = {} |
95590732e4c9
More robust Markdown configuration handling.
Ludovic Chabant <ludovic@chabant.com>
parents:
20
diff
changeset
|
25 elif not isinstance(config, dict): |
95590732e4c9
More robust Markdown configuration handling.
Ludovic Chabant <ludovic@chabant.com>
parents:
20
diff
changeset
|
26 raise Exception("The `markdown` configuration setting must be " |
95590732e4c9
More robust Markdown configuration handling.
Ludovic Chabant <ludovic@chabant.com>
parents:
20
diff
changeset
|
27 "a dictionary.") |
95590732e4c9
More robust Markdown configuration handling.
Ludovic Chabant <ludovic@chabant.com>
parents:
20
diff
changeset
|
28 |
95590732e4c9
More robust Markdown configuration handling.
Ludovic Chabant <ludovic@chabant.com>
parents:
20
diff
changeset
|
29 extensions = config.get('extensions') |
20
c95c90c82263
Add support for Markdown extensions.
Ludovic Chabant <ludovic@chabant.com>
parents:
3
diff
changeset
|
30 if extensions is None: |
c95c90c82263
Add support for Markdown extensions.
Ludovic Chabant <ludovic@chabant.com>
parents:
3
diff
changeset
|
31 extensions = [] |
202
cd049786c008
markdown: Let the user specify extensions in one line.
Ludovic Chabant <ludovic@chabant.com>
parents:
76
diff
changeset
|
32 if isinstance(extensions, str): |
cd049786c008
markdown: Let the user specify extensions in one line.
Ludovic Chabant <ludovic@chabant.com>
parents:
76
diff
changeset
|
33 extensions = [e.strip() for e in extensions.split(',')] |
20
c95c90c82263
Add support for Markdown extensions.
Ludovic Chabant <ludovic@chabant.com>
parents:
3
diff
changeset
|
34 # Compatibility with PieCrust 1.x |
58
95590732e4c9
More robust Markdown configuration handling.
Ludovic Chabant <ludovic@chabant.com>
parents:
20
diff
changeset
|
35 if config.get('use_markdown_extra'): |
20
c95c90c82263
Add support for Markdown extensions.
Ludovic Chabant <ludovic@chabant.com>
parents:
3
diff
changeset
|
36 extensions.append('extra') |
c95c90c82263
Add support for Markdown extensions.
Ludovic Chabant <ludovic@chabant.com>
parents:
3
diff
changeset
|
37 self._extensions = extensions |
c95c90c82263
Add support for Markdown extensions.
Ludovic Chabant <ludovic@chabant.com>
parents:
3
diff
changeset
|
38 |