OrgWiki/go-org-orgwiki
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update blorg and add it to gh-pages. Update README

Browse source
This commit is contained in:
Niklas Fasching 2020-06-26 20:16:59 +02:00
parent e076412b29
commit d2bbcc8881
21 changed files with 746 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

15
blorg/config.go
View file

@ -24,6 +24,7 @@ type Config struct {
ContentDir string
PublicDir string
Address string
BaseUrl string
Template *template.Template
OrgConfig *org.Configuration
}
@ -52,7 +53,7 @@ var TemplateFuncs = map[string]interface{}{
}
func ReadConfig(configFile string) (*Config, error) {
address, publicDir, contentDir, workingDir := ":3000", "public", "content", filepath.Dir(configFile)
baseUrl, address, publicDir, contentDir, workingDir := "/", ":3000", "public", "content", filepath.Dir(configFile)
f, err := os.Open(configFile)
if err != nil {
return nil, err
@ -63,6 +64,9 @@ func ReadConfig(configFile string) (*Config, error) {
return nil, document.Error
}
m := document.BufferSettings
if !strings.HasSuffix(m["BASE_URL"], "/") {
m["BASE_URL"] += "/"
}
if v, exists := m["AUTO_LINK"]; exists {
orgConfig.AutoLink = v == "true"
delete(m, "AUTO_LINK")
@ -71,6 +75,9 @@ func ReadConfig(configFile string) (*Config, error) {
address = v
delete(m, "ADDRESS")
}
if _, exists := m["BASE_URL"]; exists {
baseUrl = m["BASE_URL"]
}
if v, exists := m["PUBLIC"]; exists {
publicDir = v
delete(m, "PUBLIC")
@ -87,6 +94,7 @@ func ReadConfig(configFile string) (*Config, error) {
orgConfig.MaxEmphasisNewLines = i
delete(m, "MAX_EMPHASIS_NEW_LINES")
}
for k, v := range m {
if k == "OPTIONS" {
orgConfig.DefaultSettings[k] = v + " " + orgConfig.DefaultSettings[k]
@ -94,11 +102,13 @@ func ReadConfig(configFile string) (*Config, error) {
orgConfig.DefaultSettings[k] = v
}
}
config := &Config{
ConfigFile: configFile,
ContentDir: filepath.Join(workingDir, contentDir),
PublicDir: filepath.Join(workingDir, publicDir),
Address: address,
BaseUrl: baseUrl,
Template: template.New("_").Funcs(TemplateFuncs),
OrgConfig: orgConfig,
}
@ -174,7 +184,8 @@ func (c *Config) RenderContent() ([]*Page, error) {
return err
}
pages = append(pages, p)
p.PermaLink = "/" + relPath[:len(relPath)-len(".org")] + ".html"
p.PermaLink = c.BaseUrl + relPath[:len(relPath)-len(".org")] + ".html"
return p.Render(publicPath[:len(publicPath)-len(".org")] + ".html")
})
sort.Slice(pages, func(i, j int) bool { return pages[i].Date.After(pages[j].Date) })