progresses on #49
parent
bec1c3c510
commit
b97ef80596
File diff suppressed because one or more lines are too long
|
@ -312,14 +312,23 @@ $(document).on('page:browse', function() {
|
||||||
}));
|
}));
|
||||||
request.onreadystatechange = function() {
|
request.onreadystatechange = function() {
|
||||||
if (request.readyState == 4) {
|
if (request.readyState == 4) {
|
||||||
|
var data = JSON.parse(request.responseText);
|
||||||
|
var type = "success"
|
||||||
|
var timeout = 5000
|
||||||
|
|
||||||
if (request.status == 200) {
|
if (request.status == 200) {
|
||||||
|
if (data.success == "false") {
|
||||||
} else {
|
type = "error"
|
||||||
|
timeout = false
|
||||||
|
}
|
||||||
|
|
||||||
notification({
|
notification({
|
||||||
text: 'Something went wrong.',
|
text: data.message,
|
||||||
type: 'error'
|
type: type,
|
||||||
|
timeout: timeout
|
||||||
});
|
});
|
||||||
console.log(request.responseText);
|
} else {
|
||||||
|
console.log(request.responseText)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,6 +25,6 @@ func ServeHTTP(w http.ResponseWriter, r *http.Request, c *config.Config) (int, e
|
||||||
case "PUT":
|
case "PUT":
|
||||||
return PUT(w, r, c)
|
return PUT(w, r, c)
|
||||||
default:
|
default:
|
||||||
return 400, errors.New("Invalid method.")
|
return http.StatusMethodNotAllowed, errors.New("Invalid method.")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -19,6 +19,6 @@ func ServeHTTP(w http.ResponseWriter, r *http.Request, c *config.Config) (int, e
|
||||||
case "GET":
|
case "GET":
|
||||||
return GET(w, r, c, filename)
|
return GET(w, r, c, filename)
|
||||||
default:
|
default:
|
||||||
return 400, errors.New("Invalid method.")
|
return http.StatusMethodNotAllowed, errors.New("Invalid method.")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,6 +13,6 @@ func ServeHTTP(w http.ResponseWriter, r *http.Request, c *config.Config) (int, e
|
||||||
case "POST":
|
case "POST":
|
||||||
return POST(w, r, c)
|
return POST(w, r, c)
|
||||||
default:
|
default:
|
||||||
return 400, errors.New("Invalid method.")
|
return http.StatusMethodNotAllowed, errors.New("Invalid method.")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
61
git/post.go
61
git/post.go
|
@ -1,15 +1,72 @@
|
||||||
package git
|
package git
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"bytes"
|
||||||
|
"encoding/json"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
"os/exec"
|
||||||
|
"strings"
|
||||||
|
|
||||||
"github.com/hacdias/caddy-hugo/config"
|
"github.com/hacdias/caddy-hugo/config"
|
||||||
)
|
)
|
||||||
|
|
||||||
// POST handles the POST method on GIT page which is only an API.
|
// POST handles the POST method on GIT page which is only an API.
|
||||||
func POST(w http.ResponseWriter, r *http.Request, c *config.Config) (int, error) {
|
func POST(w http.ResponseWriter, r *http.Request, c *config.Config) (int, error) {
|
||||||
|
if _, err := exec.LookPath("git"); err != nil {
|
||||||
|
jsonMessage(w, "Git is not installed on your computer.", false)
|
||||||
|
return 200, nil
|
||||||
|
}
|
||||||
|
|
||||||
w.Header().Set("Content-Type", "application/json")
|
// Get the JSON information sent using a buffer
|
||||||
w.Write([]byte("{}"))
|
buff := new(bytes.Buffer)
|
||||||
|
buff.ReadFrom(r.Body)
|
||||||
|
|
||||||
|
// Creates the raw file "map" using the JSON
|
||||||
|
var info map[string]interface{}
|
||||||
|
json.Unmarshal(buff.Bytes(), &info)
|
||||||
|
|
||||||
|
if _, ok := info["command"]; !ok {
|
||||||
|
jsonMessage(w, "Command not specified.", false)
|
||||||
|
return 200, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
command := info["command"].(string)
|
||||||
|
args := strings.Split(command, " ")
|
||||||
|
|
||||||
|
if len(args) > 0 && args[0] == "git" {
|
||||||
|
args = append(args[:0], args[1:]...)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(args) == 0 {
|
||||||
|
jsonMessage(w, "Command not specified.", false)
|
||||||
|
return 200, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
cmd := exec.Command("git", args...)
|
||||||
|
cmd.Dir = c.Path
|
||||||
|
output, err := cmd.CombinedOutput()
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
jsonMessage(w, err.Error(), false)
|
||||||
|
return 200, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
jsonMessage(w, string(output), true)
|
||||||
return http.StatusOK, nil
|
return http.StatusOK, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type jsonMSG struct {
|
||||||
|
Message string `json:"message"`
|
||||||
|
Success bool `json:"success"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func jsonMessage(w http.ResponseWriter, message string, success bool) {
|
||||||
|
msg := &jsonMSG{
|
||||||
|
Message: message,
|
||||||
|
Success: success,
|
||||||
|
}
|
||||||
|
|
||||||
|
m, _ := json.Marshal(msg)
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
w.Write(m)
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue