Merge branch 'api-proto'

Conflicts:
	server/server.go

diff --cc server/server.go
index da47cc738fcbbc113a4a6c18a6627132a4c6764d,1cc52ab25852950d9bb87aab21994ee6a335dcc8..31701135beaf60fb52776f408b4e4768a9308df3
--- 1/server/server.go
--- 2/server/server.go
+++ b/server/server.go
@@@ -53,63 -52,81 +52,81 @@@ func listService(rw http.ResponseWriter
                return
        }
  
-       switch request.FormValue("action") {
-       case "list":
-               files, err := ListPath(request.FormValue("path"))
-               if err != nil {
-                       errorResponse(response, err.Error())
-               } else {
-                       okResponse(response, files)
-               }
-       case "remove":
-               err := RemovePath(request.FormValue("path"))
-               if err != nil {
-                       errorResponse(response, err.Error())
-               } else {
-                       data := map[string]int{
-                               "error": 0,
-                       }
-                       okResponse(response, data)
+       files, err := ListPath(req.FormValue("path"))
+       if err != nil {
+               httpError(rw, err.Error(), http.StatusNotFound)
+       } else {
+               okResponse(rw, files)
+       }
+ }
+ 
+ func removeService(rw http.ResponseWriter, req *http.Request) {
+       if !requestIsPOST(rw, req) {
+               return
+       }
+ 
+       err := RemovePath(req.FormValue("path"))
+       if err != nil {
+               httpError(rw, err.Error(), http.StatusNotFound)
+       } else {
+               data := map[string]int{
+                       "error": 0,
                }
-       case "move":
-               source := request.FormValue("source")
-               target := request.FormValue("target")
-               err := MovePath(source, target)
-               if err != nil {
-                       errorResponse(response, err.Error())
-               } else {
-                       data := map[string]interface{}{
-                               "path":  target,
-                               "error": 0,
-                       }
-                       okResponse(response, data)
+               okResponse(rw, data)
+       }
+ }
+ 
+ func moveService(rw http.ResponseWriter, req *http.Request) {
+       if !requestIsPOST(rw, req) {
+               return
+       }
+ 
+       source := req.FormValue("source")
+       target := req.FormValue("target")
+       err := MovePath(source, target)
+       if err != nil {
+               httpError(rw, err.Error(), http.StatusNotFound)
+       } else {
+               data := map[string]interface{}{
+                       "path":  target,
+                       "error": 0,
                }
-       case "mkdir":
-               path := request.FormValue("path")
-               err := MakeDir(path)
-               if err != nil {
-                       errorResponse(response, err.Error())
-               } else {
-                       data := map[string]interface{}{
-                               "path":  path,
-                               "error": 0,
-                       }
-                       okResponse(response, data)
+               okResponse(rw, data)
+       }
+ }
+ 
+ func mkdirService(rw http.ResponseWriter, req *http.Request) {
+       if !requestIsPOST(rw, req) {
+               return
+       }
+ 
+       path := req.FormValue("path")
+       err := MakeDir(path)
+       if err != nil {
+               httpError(rw, err.Error(), http.StatusUnauthorized)
+       } else {
+               data := map[string]interface{}{
+                       "path":  path,
+                       "error": 0,
                }
-       case "tv_rename":
-               newPath, err := RenameTVEpisode(request.FormValue("path"))
-               if err != nil {
-                       errorResponse(response, err.Error())
-               } else {
-                       data := map[string]interface{}{
-                               "path":  newPath,
-                               "error": 0,
-                       }
-                       okResponse(response, data)
+               okResponse(rw, data)
+       }
+ }
+ 
+ func tvRenameService(rw http.ResponseWriter, req *http.Request) {
+       if !requestIsPOST(rw, req) {
+               return
+       }
+ 
+       newPath, err := RenameTVEpisode(req.FormValue("path"))
+       if err != nil {
+               httpError(rw, err.Error(), http.StatusBadRequest)
+       } else {
+               data := map[string]interface{}{
 -                      "path":  *newPath,
++                      "path":  newPath,
+                       "error": 0,
                }
-       default:
-               fmt.Printf("Invalid action: '%s'\n", request.FormValue("action"))
-               errorResponse(response, "Unhandled action")
+               okResponse(rw, data)
        }
  }