y0rune/vimwiki
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add html_filename_parameterization option.

Browse Source 
This adds the vimwiki_local `html_filename_parameterization` option (0|1)
which performs the same sanitization of filenames as does the
vimwiki_markdown gem.

For example, if your file is called "My File.md" it will be written out
as "my-file.html".

If the html_filename_parameterization options is enabled, we also _do
not delete_ non-matching html files when the VimwikiAllToHtml command is
run.

Closes #129
This commit is contained in:
Patrick Davey
2019-03-30 14:34:31 +13:00
parent ae67790ad5
commit 5f01182468
3 changed files with 54 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
autoload/vimwiki/html.vim
View File

@ -239,8 +239,15 @@ function! s:is_html_uptodate(wikifile)
endif
let wikifile = fnamemodify(a:wikifile, ":p")
let htmlfile = expand(vimwiki#vars#get_wikilocal('path_html') .
\ vimwiki#vars#get_bufferlocal('subdir') . fnamemodify(wikifile, ":t:r").".html")
if vimwiki#vars#get_wikilocal('html_filename_parameterization')
let parameterized_wikiname = s:parameterized_wikiname(wikifile)
let htmlfile = expand(vimwiki#vars#get_wikilocal('path_html') .
\ vimwiki#vars#get_bufferlocal('subdir') . parameterized_wikiname)
else
let htmlfile = expand(vimwiki#vars#get_wikilocal('path_html') .
\ vimwiki#vars#get_bufferlocal('subdir') . fnamemodify(wikifile, ":t:r").".html")
endif
if getftime(wikifile) <= getftime(htmlfile) && tpl_time <= getftime(htmlfile)
return 1
@ -248,6 +255,15 @@ function! s:is_html_uptodate(wikifile)
return 0
endfunction
function! s:parameterized_wikiname(wikifile)
let initial = fnamemodify(a:wikifile, ":t:r")
let lower_sanitized = tolower(initial)
let substituted = substitute(lower_sanitized, '[^a-z0-9_-]\+',"-", "g")
let substituted = substitute(substituted, '\-\+',"-", "g")
let substituted = substitute(substituted, '^-', '', "g")
let substituted = substitute(substituted, '-$', '', "g")
return substitute(substituted, '\-\+',"-", "g") . ".html"
endfunction
function! s:html_insert_contents(html_lines, content)
let lines = []
@ -1614,8 +1630,10 @@ function! vimwiki#html#WikiAll2HTML(path_html)
let path_html = expand(a:path_html)
call vimwiki#path#mkdir(path_html)
echomsg 'Vimwiki: Deleting non-wiki html files ...'
call s:delete_html_files(path_html)
if !vimwiki#vars#get_wikilocal('html_filename_parameterization')
echomsg 'Vimwiki: Deleting non-wiki html files ...'
call s:delete_html_files(path_html)
endif
echomsg 'Vimwiki: Converting wiki to html files ...'
let setting_more = &more

1
autoload/vimwiki/vars.vim
View File

@ -281,6 +281,7 @@ function! s:populate_wikilocal_options()
\ 'template_default': {'type': type(''), 'default': 'default', 'min_length': 1},
\ 'template_ext': {'type': type(''), 'default': '.tpl'},
\ 'template_path': {'type': type(''), 'default': $HOME . '/vimwiki/templates/'},
\ 'html_filename_parameterization': {'type': type(0), 'default': 0, 'min': 0, 'max': 1},
\ }
let g:vimwiki_wikilocal_vars = []