aboutsummaryrefslogtreecommitdiff
path: root/page/page.go
diff options
context:
space:
mode:
authorMitchell Riedstra <mitch@riedstra.dev>2022-09-17 16:13:09 -0400
committerMitchell Riedstra <mitch@riedstra.dev>2022-09-17 16:13:09 -0400
commit8e789a73a07d0741e6c53068c517a38bb730c8ba (patch)
treec762a67ac6073b91e5d6a9b70b306b5305ad6f4f /page/page.go
parentccc26c3a0bb65ae2613e222c3ead7f6db377b483 (diff)
downloadgo-website-8e789a73a07d0741e6c53068c517a38bb730c8ba.tar.gz
go-website-8e789a73a07d0741e6c53068c517a38bb730c8ba.tar.xz
Remove fs / FileSystem library support since it is broken on Windows.
Diffstat (limited to 'page/page.go')
-rw-r--r--page/page.go34
1 files changed, 14 insertions, 20 deletions
diff --git a/page/page.go b/page/page.go
index adb2362..d34a1f7 100644
--- a/page/page.go
+++ b/page/page.go
@@ -10,18 +10,18 @@
//
// Usage:
//
-// import (
-// "fmt"
-// "os"
-// site "riedstra.dev/mitch/go-website/page"
-// )
-// // Where some/path.md exists
-// p := site.NewPage("/some/path")
-// // Dump the rendered HTML to stdout
-// err := p.Render(os.Stdout)
-// if err != nil {
-// fmt.Fprintln(os.Stderr, err)
-// }
+// import (
+// "fmt"
+// "os"
+// site "riedstra.dev/mitch/go-website/page"
+// )
+// // Where some/path.md exists
+// p := site.NewPage("/some/path")
+// // Dump the rendered HTML to stdout
+// err := p.Render(os.Stdout)
+// if err != nil {
+// fmt.Fprintln(os.Stderr, err)
+// }
package page
import (
@@ -30,7 +30,6 @@ import (
"errors"
"fmt"
"io"
- "io/fs"
"log"
"os"
"path/filepath"
@@ -71,11 +70,6 @@ var Funcs template.FuncMap
// or rebuilt on each call.
var CacheIndex = true
-// FileSystem can be replaced with anything that implements the fs.FS interface
-// and the website should be able to continue working with a different
-// backend.
-var FileSystem = os.DirFS(".")
-
// TemplateDirectory is the parent directory which templates are stored,
// usually the BaseTemplate is stored here as well, though it does not
// have to be. Currently this is used for the 4xx and 5xx pages. ( 4xx.md
@@ -165,7 +159,7 @@ func (p *Page) Render(wr io.Writer) error {
return err
}
- templateContent, err := fs.ReadFile(FileSystem, BaseTemplate)
+ templateContent, err := os.ReadFile(BaseTemplate)
if err != nil {
return fmt.Errorf("reading base template: %w", err)
}
@@ -185,7 +179,7 @@ func (p *Page) Read() error {
yamlBuf := bytes.NewBuffer(nil)
markdownBuf := bytes.NewBuffer(nil)
- fh, err := FileSystem.Open(p.path + Suffix)
+ fh, err := os.Open(p.path + Suffix)
if err != nil {
return fmt.Errorf("opening markdown: %w", err)
}