mirror of https://github.com/muety/wakapi.git
refactor: remove repeated code in readyPollTimer
This commit is contained in:
parent
7b0bbcefe6
commit
583ddcab7a
|
@ -162,22 +162,20 @@ func (w *WakatimeDumpImporter) Import(user *models.User, minFrom time.Time, maxT
|
|||
// start polling for dump to be ready
|
||||
readyPollTimer, err = w.queue.DispatchEvery(func() {
|
||||
u := *user
|
||||
var ok bool
|
||||
var dump *wakatime.DataDumpData
|
||||
var err error
|
||||
if dump_exist {
|
||||
ok, dump, err := getLatestDump(&u)
|
||||
if err != nil {
|
||||
onDumpFailed(err, &u)
|
||||
} else if ok {
|
||||
onDumpReady(dump, &u, out)
|
||||
}
|
||||
ok, dump, err = getLatestDump(&u)
|
||||
} else {
|
||||
ok, dump, err := checkDumpReady(datadumpData.Data.Id, &u)
|
||||
logbuch.Info("waiting for data dump '%s' for user '%s' to become downloadable (%.2f percent complete)", datadumpData.Data.Id, u.ID, dump.PercentComplete)
|
||||
ok, dump, err = checkDumpReady(datadumpData.Data.Id, &u)
|
||||
}
|
||||
logbuch.Info("waiting for data dump '%s' for user '%s' to become downloadable (%.2f percent complete)", dump.Id, u.ID, dump.PercentComplete)
|
||||
if err != nil {
|
||||
onDumpFailed(err, &u)
|
||||
} else if ok {
|
||||
onDumpReady(dump, &u, out)
|
||||
}
|
||||
}
|
||||
}, 10*time.Second)
|
||||
|
||||
return out, nil
|
||||
|
|
Loading…
Reference in New Issue