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: consider all Machine/UserAgent entries

Browse Source
This commit is contained in:
jabra98 2022-01-01 20:33:58 +01:00
parent aaa907a7b2
commit c7e12ba3b5
3 changed files with 59 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
models/compat/wakatime/v1/machine.go
View File

@ -4,6 +4,7 @@ package v1
type MachineViewModel struct { type MachineViewModel struct {
Data []*MachineEntry `json:"data"` Data []*MachineEntry `json:"data"`
TotalPages int `json:"total_pages"`
} }
type MachineEntry struct { type MachineEntry struct {

1
models/compat/wakatime/v1/user_agent.go
View File

@ -2,6 +2,7 @@ package v1
type UserAgentsViewModel struct { type UserAgentsViewModel struct {
Data []*UserAgentEntry `json:"data"` Data []*UserAgentEntry `json:"data"`
TotalPages int `json:"total_pages"`
} }
type UserAgentEntry struct { type UserAgentEntry struct {

29
services/imports/wakatime.go
View File

@ -15,6 +15,7 @@ import (
"golang.org/x/sync/semaphore" "golang.org/x/sync/semaphore"
"net/http" "net/http"
"time" "time"
"strconv"
) )
const OriginWakatime = "wakatime" const OriginWakatime = "wakatime"
@ -174,7 +175,14 @@ func (w *WakatimeHeartbeatImporter) fetchRange() (time.Time, time.Time, error) {
func (w *WakatimeHeartbeatImporter) fetchUserAgents() (map[string]*wakatime.UserAgentEntry, error) { func (w *WakatimeHeartbeatImporter) fetchUserAgents() (map[string]*wakatime.UserAgentEntry, error) {
httpClient := &http.Client{Timeout: 10 * time.Second} httpClient := &http.Client{Timeout: 10 * time.Second}
req, err := http.NewRequest(http.MethodGet, config.WakatimeApiUrl+config.WakatimeApiUserAgentsUrl, nil) userAgents := make(map[string]*wakatime.UserAgentEntry)
done := false
for i:=1; !done; i++ {
queryStr := "?page="+strconv.Itoa(i)
req, err := http.NewRequest(http.MethodGet, config.WakatimeApiUrl+
config.WakatimeApiUserAgentsUrl+queryStr, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -188,11 +196,14 @@ func (w *WakatimeHeartbeatImporter) fetchUserAgents() (map[string]*wakatime.User
if err := json.NewDecoder(res.Body).Decode(&userAgentsData); err != nil { if err := json.NewDecoder(res.Body).Decode(&userAgentsData); err != nil {
return nil, err return nil, err
} }
if i == userAgentsData.TotalPages {
done = true
}
userAgents := make(map[string]*wakatime.UserAgentEntry)
for _, ua := range userAgentsData.Data { for _, ua := range userAgentsData.Data {
userAgents[ua.Id] = ua userAgents[ua.Id] = ua
} }
}
return userAgents, nil return userAgents, nil
} }
@ -202,7 +213,14 @@ func (w *WakatimeHeartbeatImporter) fetchUserAgents() (map[string]*wakatime.User
func (w *WakatimeHeartbeatImporter) fetchMachineNames() (map[string]*wakatime.MachineEntry, error) { func (w *WakatimeHeartbeatImporter) fetchMachineNames() (map[string]*wakatime.MachineEntry, error) {
httpClient := &http.Client{Timeout: 10 * time.Second} httpClient := &http.Client{Timeout: 10 * time.Second}
req, err := http.NewRequest(http.MethodGet, config.WakatimeApiUrl+config.WakatimeApiMachineNamesUrl, nil) machines := make(map[string]*wakatime.MachineEntry)
done := false
for i:=1; !done; i++ {
queryStr := "?page="+strconv.Itoa(i)
req, err := http.NewRequest(http.MethodGet, config.WakatimeApiUrl+
config.WakatimeApiMachineNamesUrl+queryStr, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -216,11 +234,14 @@ func (w *WakatimeHeartbeatImporter) fetchMachineNames() (map[string]*wakatime.Ma
if err := json.NewDecoder(res.Body).Decode(&machineData); err != nil { if err := json.NewDecoder(res.Body).Decode(&machineData); err != nil {
return nil, err return nil, err
} }
if i == machineData.TotalPages {
done = true
}
machines := make(map[string]*wakatime.MachineEntry)
for _, ma := range machineData.Data { for _, ma := range machineData.Data {
machines[ma.Id] = ma machines[ma.Id] = ma
} }
}
return machines, nil return machines, nil
} }