refactor: Skip and log if parsing fails (#11)

glass-cms · May 14, 2024 · 37592c7 · 37592c7
1 parent bc9d2ca
commit 37592c7
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 3 deletions.
diff --git a/cmd/convert.go b/cmd/convert.go
@@ -4,13 +4,16 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"log/slog"
 	"os"
 	"path"
 	"strings"
+	"time"
 
 	"github.com/glass-cms/glasscms/item"
 	"github.com/glass-cms/glasscms/parser"
 	"github.com/glass-cms/glasscms/sourcer"
+	"github.com/lmittmann/tint"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"gopkg.in/yaml.v3"
@@ -34,10 +37,20 @@ var (
 
 type ConvertCommand struct {
 	*cobra.Command
+
+	logger *slog.Logger
 }
 
 func NewConvertCommand() *ConvertCommand {
-	c := &ConvertCommand{}
+	c := &ConvertCommand{
+		logger: slog.New(
+			tint.NewHandler(os.Stdout, &tint.Options{
+				Level:      slog.LevelDebug,
+				TimeFormat: time.TimeOnly,
+			}),
+		),
+	}
+
 	c.Command = &cobra.Command{
 		Use:   "convert <source>",
 		Short: "Convert source files",
@@ -71,6 +84,8 @@ func NewConvertCommand() *ConvertCommand {
 	flagset.StringP(ArgFormat, ArgFormatShorthand, "json", "Output format (json, yaml)")
 	_ = viper.BindPFlag(ArgFormat, flagset.Lookup(ArgFormat))
 
+	// TODO: Add a flag to pretty print the output.
+
 	return c
 }
 
@@ -104,7 +119,8 @@ func (c *ConvertCommand) Execute(_ *cobra.Command, args []string) error {
 		var i *item.Item
 		i, err = parser.Parse(src)
 		if err != nil {
-			return err
+			c.logger.Warn(fmt.Sprintf("Failed to parse %s: %s", src.Name(), err))
+			continue
 		}
 
 		items = append(items, i)

diff --git a/go.mod b/go.mod
@@ -4,6 +4,7 @@ go 1.22.0
 
 require (
 	github.com/djherbis/times v1.6.0
+	github.com/lmittmann/tint v1.0.4
 	github.com/spf13/cobra v1.8.0
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.18.2

diff --git a/go.sum b/go.sum
@@ -20,6 +20,8 @@ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/lmittmann/tint v1.0.4 h1:LeYihpJ9hyGvE0w+K2okPTGUdVLfng1+nDNVR4vWISc=
+github.com/lmittmann/tint v1.0.4/go.mod h1:HIS3gSy7qNwGCj+5oRjAutErFBl4BzdQP6cJZ0NfMwE=
 github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
 github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=

diff --git a/parser/parser.go b/parser/parser.go
@@ -10,6 +10,10 @@ import (
 	"gopkg.in/yaml.v3"
 )
 
+var (
+	ErrInvalidFrontMatter = errors.New("invalid front matter yaml")
+)
+
 const (
 	numParts = 3
 )
@@ -22,10 +26,12 @@ func Parse(src sourcer.Source) (*item.Item, error) {
 	}
 	defer src.Close()
 
+	// FIXME: This is a naive implementation that breaks if the content contains "---\n".
+
 	// Split the content into front matter and markdown
 	parts := bytes.SplitN(c, []byte("---\n"), numParts)
 	if len(parts) < numParts {
-		return nil, errors.New("invalid content")
+		return nil, ErrInvalidFrontMatter
 	}
 
 	// Parse the YAML front matter