Changeset 14 in code

Timestamp:

Oct 18, 2021, 8:27:26 AM (4 years ago)

Author:

dev

Message:

Replace servefile() with built-in http.ServeFile()

File:

• trunk/partage.go (modified) (2 diffs)

trunk/partage.go

@@ -78 +78 @@
 }
 
-func servefile(f *os.File, w http.ResponseWriter) {
-        buffer := make([]byte, 4096)
-
-        mime := contenttype(f)
-        w.Header().Set("Content-Type", mime)
-
-        f.Seek(0, 0)
-        for {
-                n, err := f.Read(buffer)
-
-                if err != nil {
-                        if err == io.EOF {
-                                if _, err := w.Write(buffer[:n]); err != nil {
-                                        fmt.Println(err)
-                                }
-                                break
-                        }
-                        fmt.Println(err)
-                        return
-                }
-
-                if _, err = w.Write(buffer[:n]); err != nil {
-                        fmt.Println(err)
-                }
-        }
-}
-
 func servetemplate(w http.ResponseWriter, f string, d templatedata) {
         t, err := template.ParseFiles(conf.templatedir + "/" + f)
@@ -198 +171 @@
         }
 
-        f, err := os.Open(conf.rootdir + filename)
-        if err != nil {
-                w.WriteHeader(http.StatusNotFound)
-                fmt.Println(err)
-                return
-        }
-        defer f.Close()
-
-        servefile(f, w)
+        http.ServeFile(w, r, conf.rootdir + filename)
 }