From 6130ac98e37675af096d600be332733ec577eeea Mon Sep 17 00:00:00 2001 From: Alexandre Terrasa Date: Thu, 21 May 2015 14:09:54 -0400 Subject: [PATCH] nitiwiki: allow user to change markdown extension Signed-off-by: Alexandre Terrasa --- contrib/nitiwiki/src/wiki_base.nit | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/contrib/nitiwiki/src/wiki_base.nit b/contrib/nitiwiki/src/wiki_base.nit index 56cbbcb..81dc157 100644 --- a/contrib/nitiwiki/src/wiki_base.nit +++ b/contrib/nitiwiki/src/wiki_base.nit @@ -115,11 +115,11 @@ class Nitiwiki # List markdown source files from a directory. fun list_md_files(dir: String): Array[String] do var files = new Array[String] - var pipe = new ProcessReader("find", dir, "-name", "*.md") + var pipe = new ProcessReader("find", dir, "-name", "*.{config.md_ext}") while not pipe.eof do var file = pipe.read_line if file == "" then break # last line - var name = file.basename(".md") + var name = file.basename(".{config.md_ext}") if name == "header" or name == "footer" or name == "menu" then continue files.add file end @@ -520,7 +520,7 @@ class WikiArticle # Create a new article using a markdown source file. init from_source(wiki: Nitiwiki, md_file: String) do src_full_path = md_file - init(wiki, md_file.basename(".md")) + init(wiki, md_file.basename(".{wiki.config.md_ext}")) content = md end @@ -599,6 +599,14 @@ class WikiConfig # * default: `http://localhost/` var root_url: String is lazy do return value_or_default("wiki.root_url", "http://localhost/") + # Markdown extension recognized by this wiki. + # + # We allow only one kind of extension per wiki. + # Files with other markdown extensions will be treated as resources. + # + # * key: `wiki.md_ext` + # * default: `md` + var md_ext: String is lazy do return value_or_default("wiki.md_ext", "md") # Root directory of the wiki. # -- 1.7.9.5