apairon/mark2web
1
1
Fork 0
Code Issues 8 Pull Requests Releases 5 Activity

do not copy config.yml

Browse Source
This commit is contained in:
Sebastian Frank 2019-02-15 12:11:27 +01:00
parent 1fecb5faae
commit 7dbaa95a90
Signed by: apairon
GPG Key ID: 7270D06DDA7FE8C3
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
main.go
View File

@ -101,6 +101,16 @@ type PathConfigTree struct {
var contentConfig = new(PathConfigTree)
func backToRoot(curNavPath string) string {
tmpPath := ""
if curNavPath != "" {
for i := strings.Count(curNavPath, "/") + 1; i > 0; i-- {
tmpPath += "../"
}
}
return tmpPath
}
func readContentDir(inBase string, outBase string, dir string, conf *PathConfig, tree *PathConfigTree) {
inPath := inBase
if dir != "" {
@ -172,7 +182,7 @@ func readContentDir(inBase string, outBase string, dir string, conf *PathConfig,
// first only files
for _, f := range files {
p := inPath + "/" + f.Name()
if !f.IsDir() {
if !f.IsDir() && f.Name() != "config.yml" {
switch path.Ext(f.Name()) {
case ".md":
log.Debugf(".MD %s", p)
@ -274,11 +284,8 @@ func buildNavigation(conf *PathConfigTree, curNavMap *map[string]*navElement, cu
if activeNav != "" && activeNav != "/" {
// calculate relative path
tmpPath := ""
for i := len(strings.Split(activeNav, "/")); i > 0; i-- {
tmpPath += "../"
}
navEl.GoTo = tmpPath + navEl.GoTo
bToRoot := backToRoot(activeNav)
navEl.GoTo = bToRoot + navEl.GoTo
navEl.GoTo = path.Clean(navEl.GoTo)
}
@ -436,18 +443,13 @@ func processContent(conf *PathConfigTree) {
if find := globalConfig.Assets.FixTemplate.Find; find != "" {
log.Debugf("fixing assets paths in '%s' for '%s'", templateFile, inFile)
tmpPath := ""
if curNavPath != "" {
for i := len(strings.Split(curNavPath, "/")); i > 0; i-- {
tmpPath += "../"
}
}
bToRoot := backToRoot(curNavPath)
regex, err := regexp.Compile(find)
if err != nil {
log.Panicf("could not compile regexp '%s' for assets path: %s", find, err)
}
repl := globalConfig.Assets.FixTemplate.Replace
repl = tmpPath + globalConfig.Assets.ToPath + "/" + repl
repl = bToRoot + globalConfig.Assets.ToPath + "/" + repl
repl = path.Clean(repl) + "/"
log.Debugf("new assets paths: %s", repl)
result = regex.ReplaceAllString(result, repl)