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

chore: minor code changes

Browse Source
This commit is contained in:
Ferdinand Mütsch 2022-01-02 11:06:00 +01:00
parent d561ce1766
commit f363135261
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
services/imports/wakatime.go
View File

@ -15,7 +15,6 @@ import (
"golang.org/x/sync/semaphore"
"net/http"
"time"
"strconv"
)
const OriginWakatime = "wakatime"
@ -177,12 +176,9 @@ func (w *WakatimeHeartbeatImporter) fetchUserAgents() (map[string]*wakatime.User
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)
for page := 1; ; page++ {
url := fmt.Sprintf("%s%s?page=%d", config.WakatimeApiUrl, config.WakatimeApiUserAgentsUrl, page)
req, err := http.NewRequest(http.MethodGet, url, nil)
if err != nil {
return nil, err
}
@ -196,13 +192,14 @@ func (w *WakatimeHeartbeatImporter) fetchUserAgents() (map[string]*wakatime.User
if err := json.NewDecoder(res.Body).Decode(&userAgentsData); err != nil {
return nil, err
}
if i == userAgentsData.TotalPages {
done = true
}
for _, ua := range userAgentsData.Data {
userAgents[ua.Id] = ua
}
if page == userAgentsData.TotalPages {
break
}
}
return userAgents, nil
@ -215,12 +212,9 @@ func (w *WakatimeHeartbeatImporter) fetchMachineNames() (map[string]*wakatime.Ma
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)
for page := 1; ; page++ {
url := fmt.Sprintf("%s%s?page=%d", config.WakatimeApiUrl, config.WakatimeApiMachineNamesUrl, page)
req, err := http.NewRequest(http.MethodGet, url, nil)
if err != nil {
return nil, err
}
@ -232,15 +226,16 @@ func (w *WakatimeHeartbeatImporter) fetchMachineNames() (map[string]*wakatime.Ma
var machineData wakatime.MachineViewModel
if err := json.NewDecoder(res.Body).Decode(&machineData); err != nil {
return nil, err
}
if i == machineData.TotalPages {
done = true
return nil, err
}
for _, ma := range machineData.Data {
machines[ma.Id] = ma
}
if page == machineData.TotalPages {
break
}
}
return machines, nil