Skip to content

Commit 6c52b93

Browse files
KwpolskaKwpolska
committedMar 29, 2014
Compatibility with new-style metadata in Nikola v7
Signed-off-by: Chris “Kwpolska” Warrick <kwpolska@gmail.com>
1 parent eacc93e commit 6c52b93

File tree

7 files changed

+41
-24
lines changed

7 files changed

+41
-24
lines changed
 

Diff for: ‎plugins/asciidoc/asciidoc.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import subprocess
3636

3737
from nikola.plugin_categories import PageCompiler
38-
from nikola.utils import makedirs, req_missing
38+
from nikola.utils import makedirs, req_missing, write_metadata
3939

4040
try:
4141
from collections import OrderedDict
@@ -70,7 +70,6 @@ def create_post(self, path, **kw):
7070
with codecs.open(path, "wb+", "utf8") as fd:
7171
if one_file:
7272
fd.write("/////////////////////////////////////////////\n")
73-
for k, v in metadata.items():
74-
fd.write('.. {0}: {1}\n'.format(k, v))
73+
fd.write(write_metadata(metadata))
7574
fd.write("/////////////////////////////////////////////\n")
7675
fd.write(content)

Diff for: ‎plugins/bbcode/bbcode.py

+4-5
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
bbcode = None # NOQA
3737

3838
from nikola.plugin_categories import PageCompiler
39-
from nikola.utils import makedirs, req_missing
39+
from nikola.utils import makedirs, req_missing, write_metadata
4040
try:
4141
from collections import OrderedDict
4242
except ImportError:
@@ -68,8 +68,8 @@ def compile_html(self, source, dest, is_two_file=True):
6868

6969
def create_post(self, path, content, onefile=False, is_page=False, **kw):
7070
content = kw.pop('content', None)
71-
one_file = kw.pop('one_file', False) # NOQA
72-
is_page = kw.pop('is_page', False) # NOQA
71+
onefile = kw.pop('onefile', False)
72+
kw.pop('is_page', False)
7373
metadata = OrderedDict()
7474
metadata.update(self.default_metadata)
7575
metadata.update(kw)
@@ -79,7 +79,6 @@ def create_post(self, path, content, onefile=False, is_page=False, **kw):
7979
with codecs.open(path, "wb+", "utf8") as fd:
8080
if onefile:
8181
fd.write('[note]<!--\n')
82-
for k, v in metadata.items():
83-
fd.write('.. {0}: {1}\n'.format(k, v))
82+
fd.write(write_metadata(metadata))
8483
fd.write('-->[/note]\n\n')
8584
fd.write(content)

Diff for: ‎plugins/misaka/misaka.py

+4-5
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
podcast_extension = None
4747

4848
from nikola.plugin_categories import PageCompiler
49-
from nikola.utils import makedirs, req_missing
49+
from nikola.utils import makedirs, req_missing, write_metadata
5050

5151

5252
class CompileMisaka(PageCompiler):
@@ -75,8 +75,8 @@ def compile_html(self, source, dest, is_two_file=True):
7575

7676
def create_post(self, path, content, onefile=False, is_page=False, **kw):
7777
content = kw.pop('content', None)
78-
one_file = kw.pop('one_file', False) # NOQA
79-
is_page = kw.pop('is_page', False) # NOQA
78+
onefile = kw.pop('onefile', False)
79+
kw.pop('is_page', False)
8080
metadata = OrderedDict()
8181
metadata.update(self.default_metadata)
8282
metadata.update(kw)
@@ -86,7 +86,6 @@ def create_post(self, path, content, onefile=False, is_page=False, **kw):
8686
with codecs.open(path, "wb+", "utf8") as fd:
8787
if onefile:
8888
fd.write('<!-- \n')
89-
for k, v in metadata.items():
90-
fd.write('.. {0}: {1}\n'.format(k, v))
89+
fd.write(write_metadata(metadata))
9190
fd.write('-->\n\n')
9291
fd.write(content)

Diff for: ‎plugins/orgmode/orgmode.plugin

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
Name = orgmode
33
Module = orgmode
44

5+
6+
[Nikola]
7+
MinVersion = 6.0.0
8+
59
[Documentation]
610
Author = Puneeth Chaganti
711
Version = 0.1

Diff for: ‎plugins/orgmode/orgmode.py

+18-6
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@
4444
from nikola.plugin_categories import PageCompiler
4545
from nikola.utils import req_missing, makedirs
4646

47+
# v6 compat
48+
try:
49+
from nikola.utils import write_metadata
50+
except ImportError:
51+
write_metadata = None # NOQA
52+
4753

4854
class CompileOrgmode(PageCompiler):
4955
""" Compile org-mode markup into HTML using emacs. """
@@ -71,9 +77,9 @@ def compile_html(self, source, dest, is_two_file=True):
7177
source, e.returncode))
7278

7379
def create_post(self, path, onefile=False, **kw):
74-
content = kw.pop('content', None) # NOQA
75-
one_file = kw.pop('one_file', False) # NOQA
76-
is_page = kw.pop('is_page', False) # NOQA
80+
content = kw.pop('content', None)
81+
onefile = kw.pop('onefile', False)
82+
kw.pop('is_page', False)
7783
metadata = OrderedDict()
7884
metadata.update(self.default_metadata)
7985
metadata.update(kw)
@@ -82,8 +88,14 @@ def create_post(self, path, onefile=False, **kw):
8288
with codecs.open(path, "wb+", "utf8") as fd:
8389
if onefile:
8490
fd.write("#+BEGIN_COMMENT\n")
85-
for k, v in metadata.items():
86-
fd.write('.. {0}: {1}\n'.format(k, v))
91+
if write_metadata:
92+
fd.write(write_metadata(metadata))
93+
else:
94+
for k, v in metadata.items():
95+
fd.write('.. {0}: {1}\n'.format(k, v))
8796
fd.write("#+END_COMMENT\n")
8897
fd.write("\n\n")
89-
fd.write('Write your post here.')
98+
if content:
99+
fd.write(content)
100+
else:
101+
fd.write('Write your post here.')

Diff for: ‎plugins/textile/textile.plugin

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
Name = textile
33
Module = textile
44

5+
[Nikola]
6+
MinVersion = 7.0.0
7+
58
[Documentation]
69
Author = Roberto Alsina
710
Version = 0.1
811
Website = http://getnikola.com
912
Description = Compile Textile into HTML
10-

Diff for: ‎plugins/textile/textile.py

+6-4
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
textile = None # NOQA
3737

3838
from nikola.plugin_categories import PageCompiler
39-
from nikola.utils import makedirs, req_missing
39+
from nikola.utils import makedirs, req_missing, write_metadata
4040

4141
try:
4242
from collections import OrderedDict
@@ -62,7 +62,10 @@ def compile_html(self, source, dest, is_two_file=True):
6262
output = textile(data, head_offset=1)
6363
out_file.write(output)
6464

65-
def create_post(self, path, content, onefile=False, is_page=False, **kw):
65+
def create_post(self, path, **kw):
66+
content = kw.pop('content', None)
67+
onefile = kw.pop('onefile', False)
68+
kw.pop('is_page', False)
6669
metadata = OrderedDict()
6770
metadata.update(self.default_metadata)
6871
metadata.update(kw)
@@ -72,7 +75,6 @@ def create_post(self, path, content, onefile=False, is_page=False, **kw):
7275
with codecs.open(path, "wb+", "utf8") as fd:
7376
if onefile:
7477
fd.write('<notextile> <!--\n')
75-
for k, v in metadata.items():
76-
fd.write('.. {0}: {1}\n'.format(k, v))
78+
fd.write(write_metadata(metadata))
7779
fd.write('--></notextile>\n\n')
7880
fd.write(content)

0 commit comments

Comments
 (0)
Please sign in to comment.