mirror/wakapi
1
0
Fork 0
mirror of https://github.com/muety/wakapi.git synced 2023-08-10 21:12:56 +03:00
Code Issues Projects Releases Wiki Activity

fix: import bug with small number of heartbeats (fix #160)

Browse Source
This commit is contained in:
Ferdinand Mütsch 2021-04-04 09:43:49 +02:00
parent 2b57da224c
commit 7f3a654b26
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
routes/settings.go
View File

@ -419,19 +419,26 @@ func (h *SettingsHandler) actionImportWaktime(w http.ResponseWriter, r *http.Req
count := 0 count := 0
batch := make([]*models.Heartbeat, 0) batch := make([]*models.Heartbeat, 0)
insert := func(batch []*models.Heartbeat) {
if err := h.heartbeatSrvc.InsertBatch(batch); err != nil {
logbuch.Warn("failed to insert imported heartbeat, already existing? – %v", err)
}
}
for hb := range stream { for hb := range stream {
count++ count++
batch = append(batch, hb) batch = append(batch, hb)
if len(batch) == h.config.App.ImportBatchSize { if len(batch) == h.config.App.ImportBatchSize {
if err := h.heartbeatSrvc.InsertBatch(batch); err != nil { insert(batch)
logbuch.Warn("failed to insert imported heartbeat, already existing? – %v", err)
}
batch = make([]*models.Heartbeat, 0) batch = make([]*models.Heartbeat, 0)
} }
} }
if len(batch) > 0 {
insert(batch)
}
countAfter, _ := h.heartbeatSrvc.CountByUser(user) countAfter, _ := h.heartbeatSrvc.CountByUser(user)
logbuch.Info("downloaded %d heartbeats for user '%s' (%d actually imported)", count, user.ID, countAfter-countBefore) logbuch.Info("downloaded %d heartbeats for user '%s' (%d actually imported)", count, user.ID, countAfter-countBefore)

2
services/imports/wakatime.go
View File

@ -76,7 +76,7 @@ func (w *WakatimeHeartbeatImporter) Import(user *models.User, minFrom time.Time,
d := day.Format(config.SimpleDateFormat) d := day.Format(config.SimpleDateFormat)
heartbeats, err := w.fetchHeartbeats(d) heartbeats, err := w.fetchHeartbeats(d)
if err != nil { if err != nil {
logbuch.Error("failed to fetch heartbeats for day '%s' and user '%s' – &v", day, user.ID, err) logbuch.Error("failed to fetch heartbeats for day '%s' and user '%s' – &v", d, user.ID, err)
} }
for _, h := range heartbeats { for _, h := range heartbeats {