vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

tmpl: support for `@include 'file.md'` as well as paths != templates/

pull/9017/head
Delyan Angelov 2021-02-28 18:52:31 +02:00
parent 4125bfe401
commit 5e87eeb864
No known key found for this signature in database
GPG Key ID: 66886C0F12D595ED
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
vlib/vweb/tmpl/tmpl.v
View File

@ -75,8 +75,26 @@ _ = footer
} }
if line.contains('@include ') { if line.contains('@include ') {
lines.delete(i) lines.delete(i)
file_name := line.split("'")[1] mut file_name := line.split("'")[1]
file_path := os.join_path('templates', '${file_name}.html') mut file_ext := os.file_ext(file_name)
if file_ext == '' {
file_ext = '.html'
}
file_name = file_name.replace(file_ext, '')
mut templates_folder := 'templates'
if file_name.contains('/') {
if file_name.starts_with('/') {
// absolute path
templates_folder = ''
} else {
// relative path, starting with the current folder
templates_folder = './'
}
}
file_path := os.real_path(os.join_path(templates_folder, '$file_name$file_ext'))
$if trace_tmpl ? {
eprintln('>>> @include line: "$line" , file_name: "$file_name" , file_ext: "$file_ext" , templates_folder: "$templates_folder" , file_path: "$file_path"')
}
file_content := os.read_file(file_path) or { file_content := os.read_file(file_path) or {
panic('Vweb: Reading file $file_name failed.') panic('Vweb: Reading file $file_name failed.')
} }