Skip to content

Commit 1ec989f

Browse files
committed
use variable for uploadStatus WS identifier
1 parent d5d3ae2 commit 1ec989f

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

conn.go

+9-7
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,14 @@ type Upload struct {
6363
Rewrite string `json:"rewrite"`
6464
Commandline string `json:"commandline"`
6565
Signature string `json:"signature"`
66-
Extra upload.Extra `json:"extra"`
66+
Extra upload.Extra `json:"extra"`
6767
Hex []byte `json:"hex"`
6868
Filename string `json:"filename"`
6969
ExtraFiles []AdditionalFile `json:"extrafiles"`
7070
}
7171

72+
var uploadStatusStr string = "ProgrammerStatus"
73+
7274
func uploadHandler(c *gin.Context) {
7375
data := new(Upload)
7476
c.BindJSON(data)
@@ -130,27 +132,27 @@ func uploadHandler(c *gin.Context) {
130132
// Resolve commandline
131133
commandline, err := upload.Resolve(data.Port, data.Board, filePath, data.Commandline, data.Extra, &Tools)
132134
if err != nil {
133-
send(map[string]string{"uploadStatus": "Error", "Msg": err.Error()})
135+
send(map[string]string{uploadStatusStr: "Error", "Msg": err.Error()})
134136
return
135137
}
136138

137139
l := PLogger{Verbose: data.Extra.Verbose}
138140

139141
// Upload
140142
if data.Extra.Network {
141-
send(map[string]string{"uploadStatus": "Starting", "Cmd": "Network"})
143+
send(map[string]string{uploadStatusStr: "Starting", "Cmd": "Network"})
142144
err = upload.Network(data.Port, data.Board, filePath, commandline, data.Extra.Auth, l)
143145
} else {
144-
send(map[string]string{"uploadStatus": "Starting", "Cmd": "Serial"})
146+
send(map[string]string{uploadStatusStr: "Starting", "Cmd": "Serial"})
145147
err = upload.Serial(data.Port, commandline, data.Extra, l)
146148
}
147149

148150
// Handle result
149151
if err != nil {
150-
send(map[string]string{"uploadStatus": "Error", "Msg": err.Error()})
152+
send(map[string]string{uploadStatusStr: "Error", "Msg": err.Error()})
151153
return
152154
}
153-
send(map[string]string{"uploadStatus": "Done", "Flash": "Ok"})
155+
send(map[string]string{uploadStatusStr: "Done", "Flash": "Ok"})
154156
}()
155157

156158
c.String(http.StatusAccepted, "")
@@ -172,7 +174,7 @@ func (l PLogger) Debug(args ...interface{}) {
172174
func (l PLogger) Info(args ...interface{}) {
173175
output := fmt.Sprint(args...)
174176
log.Println(output)
175-
send(map[string]string{"uploadStatus": "Busy", "Msg": output})
177+
send(map[string]string{uploadStatusStr: "Busy", "Msg": output})
176178
}
177179

178180
func send(args map[string]string) {

0 commit comments

Comments
 (0)