diff options
Diffstat (limited to 'src/helsinki.at/rhimportd/ctrlWebSocket.go')
| -rw-r--r-- | src/helsinki.at/rhimportd/ctrlWebSocket.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/helsinki.at/rhimportd/ctrlWebSocket.go b/src/helsinki.at/rhimportd/ctrlWebSocket.go index 7f4ae0d..2345db7 100644 --- a/src/helsinki.at/rhimportd/ctrlWebSocket.go +++ b/src/helsinki.at/rhimportd/ctrlWebSocket.go @@ -164,13 +164,13 @@ type webSocketSession struct { refId string session *rhimport.SessionChan progresschan chan rhimport.ProgressData - donechan chan rhimport.ImportResult + donechan chan rhimport.Result } func newWebSocketSession() *webSocketSession { session := &webSocketSession{} session.progresschan = make(chan rhimport.ProgressData, 10) - session.donechan = make(chan rhimport.ImportResult, 1) + session.donechan = make(chan rhimport.Result, 1) return session } @@ -186,14 +186,14 @@ func webSocketProgress(step int, stepName string, progress float64, userdata int return true } -func webSocketDone(res rhimport.ImportResult, userdata interface{}) bool { - c := userdata.(chan<- rhimport.ImportResult) +func webSocketDone(res rhimport.Result, userdata interface{}) bool { + c := userdata.(chan<- rhimport.Result) c <- res return true } func (self *webSocketSession) startNewSession(reqdata *webSocketRequestData, conf *rhimport.Config, sessions *rhimport.SessionStoreChan) (int, string) { - ctx := rhimport.NewImportContext(conf, nil, reqdata.UserName) + ctx := rhimport.NewContext(conf, nil, reqdata.UserName) ctx.Password = reqdata.Password ctx.Trusted = false ctx.ShowId = reqdata.ShowId @@ -215,7 +215,7 @@ func (self *webSocketSession) startNewSession(reqdata *webSocketRequestData, con self.id = id self.refId = reqdata.RefId self.session = s - if err := s.AddDoneHandler((chan<- rhimport.ImportResult)(self.donechan), webSocketDone); err != nil { + if err := s.AddDoneHandler((chan<- rhimport.Result)(self.donechan), webSocketDone); err != nil { return http.StatusInternalServerError, err.Error() } if err := s.AddProgressHandler((chan<- rhimport.ProgressData)(self.progresschan), webSocketProgress); err != nil { @@ -233,7 +233,7 @@ func (self *webSocketSession) reconnectSession(reqdata *webSocketRequestData, se self.id = reqdata.Id self.refId = refId self.session = s - if err := s.AddDoneHandler((chan<- rhimport.ImportResult)(self.donechan), webSocketDone); err != nil { + if err := s.AddDoneHandler((chan<- rhimport.Result)(self.donechan), webSocketDone); err != nil { return http.StatusInternalServerError, err.Error() } if err := s.AddProgressHandler((chan<- rhimport.ProgressData)(self.progresschan), webSocketProgress); err != nil { |