wip writable fs

infogulch · Mar 29, 2024 · 81cb143 · 81cb143
1 parent 9db9399
commit 81cb143
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 8 deletions.
diff --git a/TODO.md b/TODO.md
@@ -1,5 +1,10 @@
 # TODO
 
+- [ ] Add fs methods to write files, save file upload
+  - https://github.com/golang/go/issues/45757#issuecomment-1675157698
+  - https://github.com/hack-pad/hackpadfs
+  - https://github.com/jarxorg/wfs
+  - Add separate "wfs" for writable fs?
 - [ ] Update `xtemplate-caddy`. Note only caddy 2.8.0 uses Go 1.22
   - [ ] Figure out how to run caddy with xtemplate
   - [ ] Must test on caddy head?
@@ -49,6 +54,7 @@
 
 # BACKLOG
 
+- [ ] Review https://github.com/hairyhenderson/gomplate for data source ideas
 - [ ] Fix `superfluous response.WriteHeader call from github.com/felixge/httpsnoop.(*Metrics).CaptureMetrics` https://go.dev/play/p/spBB4w7nBCZ
 - [ ] Accept Env configuration
 - [ ] Built-in CSRF handling?

diff --git a/providers/fs.go b/providers/fs.go
@@ -202,3 +202,17 @@ func (c *DotFS) Open(path_ string) (fs.File, error) {
 
 	return file, nil
 }
+
+// func (c *DotFS) Create(path_ string) (fs.File, error) {
+// 	path_ = path.Clean(path_)
+
+// 	dir, ok := (c.fs).(string)
+
+// 	if !ok {
+// 		return nil, fmt.Errorf("failed to open file")
+// 	}
+
+// 	f, err := os.Create(filepath.Join(dir, path_))
+
+// 	return f, err
+// }
diff --git a/test/config.json b/test/config.json
@@ -2,8 +2,8 @@
     "dot": [
         {
             "type": "fs",
-            "name": "FS2",
-            "path": "./data"
+            "name": "FSW",
+            "path": "./dataw"
         },
         {
             "type": "kv",

diff --git a/test/templates/fs/index.html b/test/templates/fs/index.html
@@ -8,4 +8,4 @@
 at the same time. (Though in this case it's the same dir twice, which is
 admittedly not as useful.)
 
-{{.FS2.Read "hello.txt"}}
+{{.FSW.List "."}}
diff --git a/test/templates/fs/serve.html b/test/templates/fs/serve.html
@@ -5,9 +5,8 @@
 You can still set headers that are added to the response.
 {{.Resp.AddHeader "Content-Type" "text/customcontenttype; charset=utf-8"}}
 
-{{with $file := .FS.Open "foo.txt"}}
-    {{$stat := $file.Stat}}
-    {{.Resp.ServeContent $stat.Name $stat.ModTime $file}}
-{{end}}
+{{$file := .FS.Open "foo.txt"}}
+{{$stat := $file.Stat}}
+{{.Resp.ServeContent $stat.Name $stat.ModTime $file}}
 
 Opened files are automatically closed when the request completes.
diff --git a/test/test.go b/test/test.go
@@ -22,6 +22,13 @@ func main() {
 	try(log.Seek(0, 0))("seek to beginning")
 	defer log.Close()
 
+	// recreate the rw directory
+	{
+		path := filepath.Join(testdir, "dataw")
+		try0(os.RemoveAll(path), "delete dataw dir")
+		try0(os.Mkdir(path, os.ModeDir|os.ModePerm), "create dataw dir")
+	}
+
 	defer func() {
 		if err := recover(); err != nil {
 			fmt.Printf("exiting because: %v\n", err)

diff --git a/test/tests/fs.hurl b/test/tests/fs.hurl
@@ -5,7 +5,6 @@ HTTP 200
 [Asserts]
 body contains "<!doctype html>"
 body contains "bar"
-body contains "world"
 
 # serve content
 GET http://localhost:8080/fs/serve