LumeWeb
/
tusd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

conflict fix

This commit is contained in:
tim-kos 2013-03-18 18:28:57 +01:00
parent 7aa733c7de
commit 08745ff59a
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/cmd/tusd/http.go
View File

@ -40,9 +40,12 @@ func route(w http.ResponseWriter, r *http.Request) {
log.Printf("request: %s %s", r.Method, r.URL.RequestURI()) log.Printf("request: %s %s", r.Method, r.URL.RequestURI())
w.Header().Set("Server", "tusd") w.Header().Set("Server", "tusd")
w.Header().Add("Access-Control-Allow-Origin", "*")
if r.Method == "POST" && r.URL.Path == "/files" { if r.Method == "POST" && r.URL.Path == "/files" {
postFiles(w, r) postFiles(w, r)
} else if r.Method == "OPTIONS" && r.URL.Path == "/files" {
reply(w, http.StatusOK, "Cool")
} else if match := fileRoute.FindStringSubmatch(r.URL.Path); match != nil { } else if match := fileRoute.FindStringSubmatch(r.URL.Path); match != nil {
id := match[1] id := match[1]
switch r.Method { switch r.Method {
@ -68,11 +71,13 @@ func reply(w http.ResponseWriter, code int, message string) {
func postFiles(w http.ResponseWriter, r *http.Request) { func postFiles(w http.ResponseWriter, r *http.Request) {
contentRange, err := parseContentRange(r.Header.Get("Content-Range")) contentRange, err := parseContentRange(r.Header.Get("Content-Range"))
if err != nil { if err != nil {
log.Print("FOO")
reply(w, http.StatusBadRequest, err.Error()) reply(w, http.StatusBadRequest, err.Error())
return return
} }
if contentRange.Size == -1 { if contentRange.Size == -1 {
log.Print("FOO2")
reply(w, http.StatusBadRequest, "Content-Range must indicate total file size.") reply(w, http.StatusBadRequest, "Content-Range must indicate total file size.")
return return
} }
@ -83,7 +88,12 @@ func postFiles(w http.ResponseWriter, r *http.Request) {
} }
id := uid() id := uid()
<<<<<<< HEAD
if err := dataStore.CreateFile(id, contentRange.Size, contentType); err != nil { if err := dataStore.CreateFile(id, contentRange.Size, contentType); err != nil {
=======
if err := initFile(id, contentRange.Size, contentType); err != nil {
log.Print("FOO4")
>>>>>>> conflict fix
reply(w, http.StatusInternalServerError, err.Error()) reply(w, http.StatusInternalServerError, err.Error())
return return
} }