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: importing data from wakapi instance (resolve #428)

Browse Source
This commit is contained in:
Ferdinand Mütsch
2022-11-13 19:27:44 +01:00
parent f182b804bb
commit 4cc8c21f67
2 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
services/imports/wakatime.go
View File

@ -57,17 +57,19 @@ func (w *WakatimeHeartbeatImporter) Import(user *models.User, minFrom time.Time,
endDate = maxTo
}
userAgents, err := w.fetchUserAgents(baseUrl)
if err != nil {
config.Log().Error("failed to fetch user agents while importing wakatime heartbeats for user '%s' - %v", user.ID, err)
return
}
userAgents := map[string]*wakatime.UserAgentEntry{}
//userAgents, err := w.fetchUserAgents(baseUrl)
// if err != nil {
// config.Log().Error("failed to fetch user agents while importing wakatime heartbeats for user '%s' - %v", user.ID, err)
// return
// }
machinesNames, err := w.fetchMachineNames(baseUrl)
if err != nil {
config.Log().Error("failed to fetch machine names while importing wakatime heartbeats for user '%s' - %v", user.ID, err)
return
}
machinesNames := map[string]*wakatime.MachineEntry{}
// machinesNames, err := w.fetchMachineNames(baseUrl)
// if err != nil {
// config.Log().Error("failed to fetch machine names while importing wakatime heartbeats for user '%s' - %v", user.ID, err)
// return
// }
days := generateDays(startDate, endDate)
@ -259,9 +261,17 @@ func mapHeartbeat(
) *models.Heartbeat {
ua := userAgents[entry.UserAgentId]
if ua == nil {
ua = &wakatime.UserAgentEntry{
Editor: "unknown",
Os: "unknown",
// try to parse id as an actual user agent string (as returned by wakapi)
if opSys, editor, err := utils.ParseUserAgent(entry.UserAgentId); err == nil {
ua = &wakatime.UserAgentEntry{
Editor: opSys,
Os: editor,
}
} else {
ua = &wakatime.UserAgentEntry{
Editor: "unknown",
Os: "unknown",
}
}
}