mirror of
https://github.com/facundoolano/jorge.git
synced 2024-11-16 07:47:40 +01:00
extract commands to another package
This commit is contained in:
facundoolano
parent
3ea5864906
commit
afc5cf4912
2 changed files with 187 additions and 161 deletions
170
commands/commands.go
Normal file
170
commands/commands.go
Normal file
|
|
@ -0,0 +1,170 @@
|
|||
package commands
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"bytes"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io/fs"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
"github.com/niklasfasching/go-org/org"
|
||||
"gopkg.in/yaml.v3"
|
||||
)
|
||||
|
||||
func Init() error {
|
||||
// get working directory
|
||||
// default to .
|
||||
// if not exist, create directory
|
||||
// copy over default files
|
||||
fmt.Println("not implemented yet")
|
||||
return nil
|
||||
}
|
||||
|
||||
// Read the files in src/ render them and copy the result to target/
|
||||
func Build() error {
|
||||
const FILE_MODE = 0777
|
||||
|
||||
// fail if no src dir
|
||||
_, err := os.ReadDir("src")
|
||||
if os.IsNotExist(err) {
|
||||
return errors.New("missing src/ directory")
|
||||
} else if err != nil {
|
||||
return errors.New("couldn't read src")
|
||||
}
|
||||
|
||||
// clear previous target contents
|
||||
os.RemoveAll("target")
|
||||
os.Mkdir("target", FILE_MODE)
|
||||
|
||||
// render each source file and copy it over to target
|
||||
err = filepath.WalkDir("src", func(path string, entry fs.DirEntry, err error) error {
|
||||
if entry.IsDir() {
|
||||
subpath, _ := filepath.Rel("src", path)
|
||||
targetSubpath := filepath.Join("target", subpath)
|
||||
os.MkdirAll(targetSubpath, FILE_MODE)
|
||||
} else {
|
||||
|
||||
// FIXME what if non text file?
|
||||
data, targetPath, err := render(path)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to render %s", path)
|
||||
}
|
||||
|
||||
// write the file contents over to target at the same location
|
||||
err = os.WriteFile(targetPath, []byte(data), FILE_MODE)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to load %s", targetPath)
|
||||
}
|
||||
fmt.Printf("wrote %v\n", targetPath)
|
||||
}
|
||||
|
||||
return nil
|
||||
})
|
||||
|
||||
return err
|
||||
}
|
||||
|
||||
func New() error {
|
||||
// prompt for title
|
||||
// slugify
|
||||
// fail if file already exist
|
||||
// create a new .org file with the slug
|
||||
// add front matter and org options
|
||||
fmt.Println("not implemented yet")
|
||||
return nil
|
||||
}
|
||||
|
||||
func Serve() error {
|
||||
// build
|
||||
// serve target with file server
|
||||
// (later watch and live reload)
|
||||
fmt.Println("not implemented yet")
|
||||
return nil
|
||||
}
|
||||
|
||||
// TODO move elsewhere?
|
||||
// TODO doc
|
||||
func render(sourcePath string) (string, string, error) {
|
||||
subpath, _ := filepath.Rel("src", sourcePath)
|
||||
targetPath := filepath.Join("target", subpath)
|
||||
isOrgFile := filepath.Ext(sourcePath) == ".org"
|
||||
if isOrgFile {
|
||||
targetPath = strings.TrimSuffix(targetPath, "org") + "html"
|
||||
}
|
||||
|
||||
file, err := os.Open(sourcePath)
|
||||
if err != nil {
|
||||
return "", "", err
|
||||
}
|
||||
defer file.Close()
|
||||
|
||||
fileContent, _, err := extractFrontMatter(file)
|
||||
if err != nil {
|
||||
return "", "", (fmt.Errorf("error in %s: %s", sourcePath, err))
|
||||
}
|
||||
|
||||
var html string
|
||||
// FIXME this should be renamed to .html
|
||||
// (in general, the render process should be able to instruct a differnt target path)
|
||||
if isOrgFile {
|
||||
doc := org.New().Parse(bytes.NewReader(fileContent), sourcePath)
|
||||
html, err = doc.Write(org.NewHTMLWriter())
|
||||
if err != nil {
|
||||
return "", "", err
|
||||
}
|
||||
|
||||
} else {
|
||||
// TODO render liquid template
|
||||
}
|
||||
|
||||
// TODO if yaml contains layout, pass to parent
|
||||
|
||||
// TODO minify
|
||||
|
||||
return html, targetPath, nil
|
||||
}
|
||||
|
||||
func extractFrontMatter(file *os.File) ([]byte, map[string]interface{}, error) {
|
||||
const FM_SEPARATOR = "---"
|
||||
|
||||
var outContent, yamlContent []byte
|
||||
|
||||
scanner := bufio.NewScanner(file)
|
||||
for scanner.Scan() {
|
||||
line := scanner.Text()
|
||||
|
||||
// if line starts front matter, write lines to yaml until front matter is closed
|
||||
if strings.TrimSpace(line) == FM_SEPARATOR {
|
||||
closed := false
|
||||
for scanner.Scan() {
|
||||
line := scanner.Text()
|
||||
if strings.TrimSpace(line) == FM_SEPARATOR {
|
||||
closed = true
|
||||
break
|
||||
}
|
||||
yamlContent = append(yamlContent, []byte(line+"\n")...)
|
||||
}
|
||||
if !closed {
|
||||
return nil, nil, errors.New("front matter not closed")
|
||||
}
|
||||
} else {
|
||||
// non front matter/yaml content goes to the output slice
|
||||
outContent = append(outContent, []byte(line+"\n")...)
|
||||
}
|
||||
}
|
||||
// drop the extraneous last line break
|
||||
outContent = bytes.TrimRight(outContent, "\n")
|
||||
|
||||
var frontMatter map[string]interface{}
|
||||
if len(yamlContent) != 0 {
|
||||
err := yaml.Unmarshal([]byte(yamlContent), &frontMatter)
|
||||
if err != nil {
|
||||
return nil, nil, fmt.Errorf("invalid yaml: ", err)
|
||||
}
|
||||
}
|
||||
|
||||
return outContent, frontMatter, nil
|
||||
}
|
||||
178
main.go
178
main.go
|
|
@ -1,192 +1,48 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"bytes"
|
||||
"errors"
|
||||
"flag"
|
||||
"fmt"
|
||||
"io/fs"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
"github.com/niklasfasching/go-org/org"
|
||||
"gopkg.in/yaml.v3"
|
||||
"github.com/facundoolano/blorg/commands"
|
||||
)
|
||||
|
||||
func main() {
|
||||
err := run(os.Args)
|
||||
|
||||
if err != nil {
|
||||
fmt.Println("error:", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
}
|
||||
|
||||
func run(args []string) error {
|
||||
// TODO consider using cobra or something else to make cli more declarative
|
||||
// and get a better ux out of the box
|
||||
initCmd := flag.NewFlagSet("init", flag.ExitOnError)
|
||||
newCmd := flag.NewFlagSet("new", flag.ExitOnError)
|
||||
serveCmd := flag.NewFlagSet("serve", flag.ExitOnError)
|
||||
|
||||
if len(os.Args) < 2 {
|
||||
// TODO print usage
|
||||
exit("expected subcommand")
|
||||
return errors.New("expected subcommand")
|
||||
}
|
||||
|
||||
switch os.Args[1] {
|
||||
case "init":
|
||||
initCmd.Parse(os.Args[2:])
|
||||
// get working directory
|
||||
// default to .
|
||||
// if not exist, create directory
|
||||
// copy over default files
|
||||
fmt.Println("not implemented yet")
|
||||
commands.Init()
|
||||
case "build":
|
||||
build()
|
||||
commands.Build()
|
||||
case "new":
|
||||
newCmd.Parse(os.Args[2:])
|
||||
// prompt for title
|
||||
// slugify
|
||||
// fail if file already exist
|
||||
// create a new .org file with the slug
|
||||
// add front matter and org options
|
||||
fmt.Println("not implemented yet")
|
||||
commands.New()
|
||||
case "serve":
|
||||
// build
|
||||
// serve target with file server
|
||||
// (later watch and live reload)
|
||||
serveCmd.Parse(os.Args[2:])
|
||||
fmt.Println("not implemented yet")
|
||||
commands.Serve()
|
||||
default:
|
||||
// TODO print usage
|
||||
exit("unknown subcommand")
|
||||
return errors.New("unknown subcommand")
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// Read the files in src/ render them and copy the result to target/
|
||||
// TODO move elsewhere ?
|
||||
func build() {
|
||||
const FILE_MODE = 0777
|
||||
|
||||
// fail if no src dir
|
||||
_, err := os.ReadDir("src")
|
||||
if os.IsNotExist(err) {
|
||||
exit("missing src/ directory")
|
||||
} else if err != nil {
|
||||
panic("couldn't read src")
|
||||
}
|
||||
|
||||
// clear previous target contents
|
||||
os.RemoveAll("target")
|
||||
os.Mkdir("target", FILE_MODE)
|
||||
|
||||
// render each source file and copy it over to target
|
||||
filepath.WalkDir("src", func(path string, entry fs.DirEntry, err error) error {
|
||||
if entry.IsDir() {
|
||||
subpath, _ := filepath.Rel("src", path)
|
||||
targetSubpath := filepath.Join("target", subpath)
|
||||
os.MkdirAll(targetSubpath, FILE_MODE)
|
||||
} else {
|
||||
|
||||
// FIXME what if non text file?
|
||||
data, targetPath, err := render(path)
|
||||
|
||||
if err != nil {
|
||||
panic(fmt.Sprintf("failed to load %s", targetPath))
|
||||
}
|
||||
|
||||
// write the file contents over to target at the same location
|
||||
err = os.WriteFile(targetPath, []byte(data), FILE_MODE)
|
||||
if err != nil {
|
||||
panic(fmt.Sprintf("failed to load %s", targetPath))
|
||||
}
|
||||
fmt.Printf("wrote %v\n", targetPath)
|
||||
}
|
||||
|
||||
return nil
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
// TODO move elsewhere?
|
||||
func render(sourcePath string) (string, string, error) {
|
||||
subpath, _ := filepath.Rel("src", sourcePath)
|
||||
targetPath := filepath.Join("target", subpath)
|
||||
isOrgFile := filepath.Ext(sourcePath) == ".org"
|
||||
if isOrgFile {
|
||||
targetPath = strings.TrimSuffix(targetPath, "org") + "html"
|
||||
}
|
||||
|
||||
file, err := os.Open(sourcePath)
|
||||
if err != nil {
|
||||
return "", "", err
|
||||
}
|
||||
defer file.Close()
|
||||
|
||||
fileContent, _, err := extractFrontMatter(file)
|
||||
if err != nil {
|
||||
return "", "", (fmt.Errorf("error in %s: %s", sourcePath, err))
|
||||
}
|
||||
|
||||
var html string
|
||||
// FIXME this should be renamed to .html
|
||||
// (in general, the render process should be able to instruct a differnt target path)
|
||||
if isOrgFile {
|
||||
doc := org.New().Parse(bytes.NewReader(fileContent), sourcePath)
|
||||
html, err = doc.Write(org.NewHTMLWriter())
|
||||
if err != nil {
|
||||
return "", "", err
|
||||
}
|
||||
|
||||
} else {
|
||||
// TODO render liquid template
|
||||
}
|
||||
|
||||
// TODO if yaml contains layout, pass to parent
|
||||
|
||||
// TODO minify
|
||||
|
||||
return html, targetPath, nil
|
||||
}
|
||||
|
||||
func extractFrontMatter(file *os.File) ([]byte, map[string]interface{}, error) {
|
||||
const FM_SEPARATOR = "---"
|
||||
|
||||
var outContent, yamlContent []byte
|
||||
|
||||
scanner := bufio.NewScanner(file)
|
||||
for scanner.Scan() {
|
||||
line := scanner.Text()
|
||||
|
||||
// if line starts front matter, write lines to yaml until front matter is closed
|
||||
if strings.TrimSpace(line) == FM_SEPARATOR {
|
||||
closed := false
|
||||
for scanner.Scan() {
|
||||
line := scanner.Text()
|
||||
if strings.TrimSpace(line) == FM_SEPARATOR {
|
||||
closed = true
|
||||
break
|
||||
}
|
||||
yamlContent = append(yamlContent, []byte(line+"\n")...)
|
||||
}
|
||||
if !closed {
|
||||
return nil, nil, errors.New("front matter not closed")
|
||||
}
|
||||
} else {
|
||||
// non front matter/yaml content goes to the output slice
|
||||
outContent = append(outContent, []byte(line+"\n")...)
|
||||
}
|
||||
}
|
||||
// drop the extraneous last line break
|
||||
outContent = bytes.TrimRight(outContent, "\n")
|
||||
|
||||
var frontMatter map[string]interface{}
|
||||
if len(yamlContent) != 0 {
|
||||
err := yaml.Unmarshal([]byte(yamlContent), &frontMatter)
|
||||
if err != nil {
|
||||
return nil, nil, fmt.Errorf("invalid yaml: ", err)
|
||||
}
|
||||
}
|
||||
|
||||
return outContent, frontMatter, nil
|
||||
}
|
||||
|
||||
func exit(message string) {
|
||||
fmt.Println(message)
|
||||
os.Exit(1)
|
||||
return nil
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue