\n")
+ b.WriteString("\n")
} else {
- fmt.Fprint(&b, "\n")
+ b.WriteString("\n")
}
case gemini.LinePreformattedText:
text := string(l.(gemini.LinePreformattedText))
@@ -60,17 +60,17 @@ func textToHTML(text gemini.Text) string {
case gemini.LineText:
text := string(l.(gemini.LineText))
if text == "" {
- fmt.Fprint(&b, "%s
\n", html.EscapeString(text)) } } } if pre { - fmt.Fprint(&b, "\n") + b.WriteString("\n") } if list { - fmt.Fprint(&b, "\n") + b.WriteString("\n") } - return b.String() + return b.Bytes() } diff --git a/main.go b/main.go index 185c47b..ac33cf5 100644 --- a/main.go +++ b/main.go @@ -3,487 +3,93 @@ package main import ( "bytes" "flag" - "fmt" - "io/ioutil" "log" - "os" - "path/filepath" - "regexp" - "sort" - "strconv" + pathpkg "path" "strings" - "text/template" - "time" "git.sr.ht/~adnano/go-gemini" - "git.sr.ht/~adnano/go-ini" ) -const ( - srcDir = "src" // site source - dstDir = "dst" // site destination - htmlDst = "dst.html" // html destination - indexPath = "index.gmi" // path used for index files - atomPath = "atom.xml" // path used for atom feeds - tmplDir = "templates" // templates directory - atomTmpl = "/atom.xml" // path to atom template - indexTmpl = "/index.gmi" // path to index template - pageTmpl = "/page.gmi" // path to page template - htmlTmpl = "/output.html" // path to html template -) - -// site config -var cfg struct { - title string // site title - url string // site URL - toAtom bool // output Atom - toHTML bool // output HTML -} - func main() { - // Try to read config file - if f, err := os.Open("config.ini"); err == nil { - ini.Parse(f, func(section, key, value string) { - if section == "" { - switch key { - case "title": - cfg.title = value - case "url": - cfg.url = value - case "atom": - b, err := strconv.ParseBool(value) - if err != nil { - fmt.Println(err) - break - } - cfg.toAtom = b - case "html": - b, err := strconv.ParseBool(value) - if err != nil { - fmt.Println(err) - break - } - cfg.toHTML = b - } - } - }) - } - flag.Parse() if err := run(); err != nil { log.Fatal(err) } } -// site metadata passed to templates -type site struct { - Title string - URL string -} - -// map of paths to templates -var templates = map[string]*template.Template{} - -// template functions -var funcMap = template.FuncMap{ - "site": func() site { - return site{ - Title: cfg.title, - URL: cfg.url, - } - }, -} - -// loadTemplate loads a template from the provided path and content. -func loadTemplate(path string, content string) { - tmpl := template.New(path) - tmpl.Funcs(funcMap) - template.Must(tmpl.Parse(content)) - templates[path] = tmpl -} - -// findTemplate searches recursively for a template for the given path. -func findTemplate(path string, tmpl string) *template.Template { - for { - tmplPath := filepath.Join(path, tmpl) - if t, ok := templates[tmplPath]; ok { - return t - } - slash := path == "/" - path = filepath.Dir(path) - if slash && path == "/" { - break - } - } - // shouldn't happen - return nil -} - func run() error { - // Load default templates - loadTemplate(atomTmpl, atom_xml) - loadTemplate(indexTmpl, index_gmi) - loadTemplate(pageTmpl, page_gmi) - loadTemplate(htmlTmpl, output_html) - // Load templates - filepath.Walk(tmplDir, func(path string, info os.FileInfo, err error) error { - if err != nil { - return err - } - if info.Mode().IsRegular() { - b, err := ioutil.ReadFile(path) - if err != nil { - return err - } - // Remove "templates/" from beginning of path - path = strings.TrimPrefix(path, tmplDir) - loadTemplate(path, string(b)) - } - return nil - }) + // whether or not to output HTML + var toHTML bool + flag.BoolVar(&toHTML, "html", false, "output HTML") + flag.Parse() + + // Load config + cfg := NewConfig() + if err := cfg.Load("config.ini"); err != nil { + return err + } + if err := cfg.LoadTemplates("templates"); err != nil { + return err + } + // Load content dir := NewDir("") - if err := dir.read(srcDir, ""); err != nil { + if err := dir.read("src", ""); err != nil { return err } - // Sort content dir.sort() // Manipulate content - if err := manipulate(dir); err != nil { + if err := dir.manipulate(cfg); err != nil { return err } - if cfg.toAtom { - if err := createFeeds(dir); err != nil { - return err - } - } // Write content - if err := write(dir, dstDir, outputGemini); err != nil { + if err := dir.write("dst", outputGemini, cfg); err != nil { return err } - if cfg.toHTML { - if err := write(dir, htmlDst, outputHTML); err != nil { + if toHTML { + if err := dir.write("html", outputHTML, cfg); err != nil { return err } } return nil } -// write writes the contents of the Index to the provided destination directory. -func write(dir *Dir, dstDir string, format outputFormat) error { - // Empty the destination directory - if err := os.RemoveAll(dstDir); err != nil { - return err - } - // Create the destination directory - if err := os.MkdirAll(dstDir, 0755); err != nil { - return err - } - // Write the directory - return dir.write(dstDir, format) -} - -// manipulate processes and manipulates the site's content. -func manipulate(dir *Dir) error { - // Write the directory index file, if it doesn't exist - if dir.index == nil { - var b bytes.Buffer - tmpl := findTemplate(dir.Permalink, indexTmpl) - if err := tmpl.Execute(&b, dir); err != nil { - return err - } - dir.index = &Page{ - Permalink: dir.Permalink, - content: b.Bytes(), - } - } - // Manipulate pages - for i := range dir.Pages { - var b bytes.Buffer - tmpl := findTemplate(dir.Pages[i].Permalink, pageTmpl) - if err := tmpl.Execute(&b, dir.Pages[i]); err != nil { - return err - } - dir.Pages[i].content = b.Bytes() - } - // Manipulate subdirectories - for _, d := range dir.Dirs { - if err := manipulate(d); err != nil { - return err - } - } - return nil -} - -// feed represents an Atom feed. -type feed struct { - Title string // Feed title. - Path string // Feed path. - URL string // Site URL. - Updated time.Time // Last updated time. - Entries []*Page // Feed entries. -} - -// createFeeds creates Atom feeds. -func createFeeds(dir *Dir) error { - var b bytes.Buffer - tmpl := templates[atomTmpl] - feed := &feed{ - Title: cfg.title, - Path: filepath.Join(dir.Permalink, atomPath), - URL: cfg.url, - Updated: time.Now(), - Entries: dir.Pages, - } - if err := tmpl.Execute(&b, feed); err != nil { - return err - } - path := filepath.Join(dir.Permalink, atomPath) - dir.Files[path] = b.Bytes() - return nil -} - -// Page represents a page. -type Page struct { - Title string // The title of this page. - Permalink string // The permalink to this page. - Date time.Time // The date of the page. - content []byte // The content of this page. -} - -// Content returns the page content as a string. -// Used in templates. -func (p *Page) Content() string { - return string(p.content) -} - -// Regexp to parse title from Gemini files -var titleRE = regexp.MustCompile("^# ?([^#\r\n]+)\r?\n?\r?\n?") - -// Regexp to parse frontmatter from Gemini files -var frontmatterRE = regexp.MustCompile("---\r?\n(?s)(.*)(?-s)---\r?\n?") - -// NewPage returns a new Page with the given path and content. -func NewPage(path string, content []byte) *Page { - var page Page - - // Try to parse frontmatter - if submatches := frontmatterRE.FindSubmatch(content); submatches != nil { - ini.Parse(bytes.NewReader(submatches[1]), func(section, key, value string) { - if section == "" { - switch key { - case "title": - page.Title = value - case "date": - date, err := time.Parse("2006-01-02", value) - if err != nil { - fmt.Println(err) - break - } - page.Date = date - } - } - // Preserve unrecognized keys - - }) - fmt.Println(string(submatches[1])) - content = content[len(submatches[0]):] - } else { - // Try to parse the date from the page filename - const layout = "2006-01-02" - base := filepath.Base(path) - if len(base) >= len(layout) { - dateStr := base[:len(layout)] - if time, err := time.Parse(layout, dateStr); err == nil { - page.Date = time - } - // Remove the date from the path - base = base[len(layout):] - if len(base) > 0 { - // Remove a leading dash - if base[0] == '-' { - base = base[1:] - } - if len(base) > 0 { - dir := filepath.Dir(path) - if dir == "." { - dir = "" - } - path = filepath.Join(dir, base) - } - } - } - - // Try to parse the title from the contents - if submatches := titleRE.FindSubmatch(content); submatches != nil { - page.Title = string(submatches[1]) - // Remove the title from the contents - content = content[len(submatches[0]):] - } - } - - page.Permalink = "/" + strings.TrimSuffix(path, ".gmi") + "/" - page.content = content - return &page -} - -// Dir represents a directory. -type Dir struct { - Permalink string // Permalink to this directory. - Pages []*Page // Pages in this directory. - Dirs []*Dir // Subdirectories. - Files map[string][]byte // Static files. - index *Page // The index file (index.gmi). -} - -// NewDir returns a new Dir with the given path. -func NewDir(path string) *Dir { - var permalink string - if path == "" { - permalink = "/" - } else { - permalink = "/" + path + "/" - } - return &Dir{ - Permalink: permalink, - Files: map[string][]byte{}, - } -} - -// read reads from a directory and indexes the files and directories within it. -func (d *Dir) read(srcDir string, path string) error { - entries, err := ioutil.ReadDir(filepath.Join(srcDir, path)) - if err != nil { - return err - } - for _, entry := range entries { - name := entry.Name() - // Ignore names that start with "_" - if strings.HasPrefix(name, "_") { - continue - } - path := filepath.Join(path, name) - if entry.IsDir() { - // Gather directory data - dir := NewDir(path) - if err := dir.read(srcDir, path); err != nil { - return err - } - d.Dirs = append(d.Dirs, dir) - } else { - srcPath := filepath.Join(srcDir, path) - content, err := ioutil.ReadFile(srcPath) - if err != nil { - return err - } - if filepath.Ext(name) == ".gmi" { - // Gather page data - page := NewPage(path, content) - if name == "index.gmi" { - d.index = page - } else { - d.Pages = append(d.Pages, page) - } - } else { - // Static file - d.Files[path] = content - } - } - } - return nil -} - -// write writes the Dir to the provided destination path. -func (d *Dir) write(dstDir string, format outputFormat) error { - // Create the directory - dirPath := filepath.Join(dstDir, d.Permalink) - if err := os.MkdirAll(dirPath, 0755); err != nil { - return err - } - - // Write static files - for path := range d.Files { - dstPath := filepath.Join(dstDir, path) - f, err := os.Create(dstPath) - if err != nil { - return err - } - data := d.Files[path] - if _, err := f.Write(data); err != nil { - return err - } - } - - // Write the pages - for _, page := range d.Pages { - path, content := format(page) - dstPath := filepath.Join(dstDir, path) - dir := filepath.Dir(dstPath) - os.MkdirAll(dir, 0755) - f, err := os.Create(dstPath) - if err != nil { - return err - } - if _, err := f.Write(content); err != nil { - return err - } - } - - // Write the index file - if d.index != nil { - path, content := format(d.index) - dstPath := filepath.Join(dstDir, path) - f, err := os.Create(dstPath) - if err != nil { - return err - } - if _, err := f.Write(content); err != nil { - return err - } - } - - // Write subdirectories - for _, dir := range d.Dirs { - dir.write(dstDir, format) - } - return nil -} - -// sort sorts the directory's pages by date. -func (d *Dir) sort() { - sort.Slice(d.Pages, func(i, j int) bool { - return d.Pages[i].Date.After(d.Pages[j].Date) - }) - // Sort subdirectories - for _, d := range d.Dirs { - d.sort() - } -} - // outputFormat represents an output format. -type outputFormat func(*Page) (path string, content []byte) +type outputFormat func(*Page, *Config) (path string, content []byte) -func outputGemini(p *Page) (path string, content []byte) { - path = filepath.Join(p.Permalink, indexPath) - content = p.content +// outputGemini outputs the page as Gemini text. +func outputGemini(p *Page, cfg *Config) (path string, content []byte) { + path = p.Path + if strings.HasSuffix(path, "/") { + path += "index.gmi" + } else { + path += "/index.gmi" + } + content = []byte(p.Content) return } -func outputHTML(p *Page) (path string, content []byte) { - const indexPath = "index.html" - path = filepath.Join(p.Permalink, indexPath) +// outputHTML outputs the page as HTML. +func outputHTML(p *Page, cfg *Config) (path string, content []byte) { + path = p.Path + if strings.HasSuffix(path, "/") { + path += "index.html" + } else { + path += "/index.html" + } - r := bytes.NewReader(p.content) + r := strings.NewReader(p.Content) text := gemini.ParseText(r) - content = []byte(textToHTML(text)) + content = textToHTML(text) - type tmplCtx struct { - Title string - Content string + // html template context + type htmlCtx struct { + Title string // page title + Content string // page HTML contents } var b bytes.Buffer - tmpl := templates[htmlTmpl] - tmpl.Execute(&b, &tmplCtx{ + tmpl := cfg.Templates.FindTemplate(pathpkg.Dir(path), "output.html") + tmpl.Execute(&b, &htmlCtx{ Title: p.Title, Content: string(content), }) diff --git a/page.go b/page.go new file mode 100644 index 0000000..f64a4ea --- /dev/null +++ b/page.go @@ -0,0 +1,62 @@ +package main + +import ( + pathpkg "path" + "regexp" + "strings" + "time" +) + +// Page represents a page. +type Page struct { + Title string // The title of this page. + Path string // The path to this page. + Date time.Time // The date of the page. + Content string // The content of this page. +} + +// titleRe is a regexp to parse titles from Gemini files. +// It also matches the next line if it is empty. +var titleRE = regexp.MustCompile("^# ?([^#\r\n]+)\r?\n?\r?\n?") + +// NewPage returns a new Page with the given path and content. +func NewPage(path string, content []byte) *Page { + var page Page + + // Try to parse the date from the page filename + const layout = "2006-01-02" + base := pathpkg.Base(path) + if len(base) >= len(layout) { + dateStr := base[:len(layout)] + if time, err := time.Parse(layout, dateStr); err == nil { + page.Date = time + } + // Remove the date from the path + base = base[len(layout):] + if len(base) > 0 { + // Remove a leading dash + if base[0] == '-' { + base = base[1:] + } + if len(base) > 0 { + dir := pathpkg.Dir(path) + if dir == "." { + dir = "" + } + path = pathpkg.Join(dir, base) + } + } + } + + // Try to parse the title from the contents + if submatches := titleRE.FindSubmatch(content); submatches != nil { + page.Title = string(submatches[1]) + // Remove the title from the contents + content = content[len(submatches[0]):] + } + + // Remove extension from path + page.Path = "/" + strings.TrimSuffix(path, ".gmi") + page.Content = string(content) + return &page +} diff --git a/templates.go b/templates.go index 9f5e317..a4022e2 100644 --- a/templates.go +++ b/templates.go @@ -1,33 +1,86 @@ package main -// TODO: Use go:embed +import ( + "io/ioutil" + "os" + "path/filepath" + "strings" + "text/template" +) -// Default atom feed template -const atom_xml = ` -