diff --git a/main.go b/main.go index 9351892..9a03731 100644 --- a/main.go +++ b/main.go @@ -1,18 +1,20 @@ package main import ( - "github.com/nkanaev/yarr/storage" + //"github.com/nkanaev/yarr/storage" //"github.com/nkanaev/yarr/worker" "github.com/nkanaev/yarr/server" - "log" + //"log" ) func main() { + /* store, err := storage.New() if err != nil { log.Fatal(err) } log.Print(store) + */ /* folder := store.CreateFolder("foo") store.RenameFolder(folder.Id, "bar") diff --git a/server/handlers.go b/server/handlers.go index 79204a1..6d5f9fc 100644 --- a/server/handlers.go +++ b/server/handlers.go @@ -1,13 +1,37 @@ package server -import "net/http" +import ( + "net/http" + "os" + "log" + "io" + "fmt" + "mime" +) func Index(rw http.ResponseWriter, req *http.Request) { - rw.Write([]byte("index")) + fmt.Println(os.Getwd()) + f, err := os.Open("template/index.html") + if err != nil { + log.Fatal(err) + } + defer f.Close() + + rw.Header().Set("Content-Type", "text/html") + io.Copy(rw, f) + } func Static(rw http.ResponseWriter, req *http.Request) { - rw.Write([]byte("static:" + Vars(req)["path"])) + path := "template/static/" + Vars(req)["path"] + f, err := os.Open(path) + if err != nil { + rw.WriteHeader(http.StatusNotFound) + return + } + defer f.Close() + rw.Header().Set("Content-Type", mime.TypeByExtension(path)) + io.Copy(rw, f) } func FolderList(rw http.ResponseWriter, req *http.Request) {