diff --git a/main.go b/main.go index b01d6d92b4c819b2e675b42268a0c87206ba9e25..ce647c46a6f795ef63dc255dbe3066cea0f3f5ae 100644 --- a/main.go +++ b/main.go @@ -3,7 +3,6 @@ //go:generate go run . package main import ( - "bytes" "context" "embed" "flag" @@ -67,13 +66,6 @@ article.path = path categories[article.Category] = append(categories[article.Category], article) articles = append(articles, article) if err := writeArticle(*outFlag, article); err != nil { - return err - } - dstRaw, err := os.Create(filepath.Join(*outFlag, article.Slug()+".md")) - if err := copyFile(dstRaw, bytes.NewReader(content)); err != nil { - return err - } - if err := dstRaw.Close(); err != nil { return err } } @@ -208,10 +200,23 @@ } return nil } -func copyFile(dst io.Writer, src io.Reader) error { - if _, err := io.Copy(dst, src); err != nil { +func copyFile(dst, src string) error { + srcFi, err := os.Open(src) + if err != nil { + return err + } + defer srcFi.Close() + + dstFi, err := os.Create(dst) + if err != nil { return err } + defer dstFi.Close() + + if _, err := io.Copy(dstFi, srcFi); err != nil { + return err + } + return nil } diff --git a/templates.templ b/templates.templ index bbccc691c784ba56337e3dd2df920009ef5938ea..3a91de9045e39fa9e3801f2450714a0f97fde423 100644 --- a/templates.templ +++ b/templates.templ @@ -59,11 +59,7 @@
@templ.Raw(article.Content)
- + } } diff --git a/templates_templ.go b/templates_templ.go index a264aa9532c73c9b0541dd38be7f971b784a0ef7..ca1c7675eb01e3e71590d6427c765a1dbdebfdf9 100644 --- a/templates_templ.go +++ b/templates_templ.go @@ -296,26 +296,13 @@ } var templ_7745c5c3_Var16 templ.SafeURL templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(fmt.Sprintf("https://git.jolheiser.com/blog/tree/%s/%s", ref, article.path))) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates.templ`, Line: 63, Col: 103} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates.templ`, Line: 62, Col: 110} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var16)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "\">(source) · (raw)") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "\">source") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err }