Changeset 11 in code for trunk

Timestamp:

Oct 13, 2021, 2:57:27 PM (4 years ago)

Author:

dev

Message:

Add templating system for pages

Location:

trunk

Files:

• go.mod (modified) (1 diff)
• partage.go (modified) (4 diffs)
• templates (added)
• templates/index.html (added)

trunk/go.mod

@@ -2 +2 @@
 
 go 1.17
+
+require github.com/dustin/go-humanize v1.0.0 // indirect

trunk/partage.go

@@ -9 +9 @@
         "path"
         "path/filepath"
+        "html/template"
+
+        "github.com/dustin/go-humanize"
 )
+
+type templatedata struct {
+        Maxsize string
+}
 
 var conf struct {
         bind     string
+        baseuri  string
         filepath string
         rootdir  string
-        baseuri  string
+        templatedir string
         filectx  string
         maxsize  int64
 }
+
 
 func contenttype(f *os.File) string {
@@ -93 +102 @@
 }
 
+func servetemplate(w http.ResponseWriter, f string, d templatedata) {
+        t, err := template.ParseFiles(conf.templatedir + "/" + f)
+        if err != nil {
+                w.WriteHeader(http.StatusInternalServerError)
+                return
+        }
+
+        err = t.Execute(w, d)
+        if err != nil {
+                fmt.Println(err)
+        }
+}
+
 func uploaderPut(w http.ResponseWriter, r *http.Request) {
         // Max 15 Gb uploads
@@ -120 +142 @@
         // r.URL.Path is sanitized regarding "." and ".."
         filename := r.URL.Path
-        if r.URL.Path == "/" {
-                filename = "/index.html"
+        if r.URL.Path == "/" || r.URL.Path == "/index" {
+                data := templatedata{ Maxsize: humanize.IBytes(uint64(conf.maxsize))}
+                servetemplate(w, "/index.html", data)
+                return
         }
 
@@ -146 +170 @@
 func main() {
         conf.bind = "0.0.0.0:8080"
-        conf.maxsize = 28 * 1024 * 1024
+        conf.maxsize = 30064771072 // 28Gib
         conf.filepath = "/tmp"
         conf.rootdir = "./static"
         conf.baseuri = "http://192.168.0.3:8080"
         conf.filectx = "/f/"
+        conf.templatedir = "./templates"
 
         http.HandleFunc("/", uploader)