From 6d762f5fd6b8e843e2c1396b47271d6aa1a4891f Mon Sep 17 00:00:00 2001 From: Steven Tang Date: Thu, 17 Feb 2022 22:20:22 +1100 Subject: [PATCH] ref: remove unnecessary unicode characters --- config/config.go | 8 ++++---- config/sentry.go | 2 +- middlewares/custom/wakatime.go | 4 ++-- migrations/migrations.go | 4 ++-- models/duration.go | 2 +- models/filters.go | 2 +- models/heartbeat.go | 2 +- routes/api/heartbeat.go | 4 ++-- routes/api/metrics.go | 2 +- routes/login.go | 2 +- routes/settings.go | 12 ++++++------ services/aggregation.go | 4 ++-- services/imports/wakatime.go | 10 +++++----- services/report.go | 6 +++--- testing/run_api_tests.sh | 4 ++-- ...json => wakapi_api_tests.postman_collection.json} | 0 views/index.tpl.html | 2 +- 17 files changed, 35 insertions(+), 35 deletions(-) rename testing/{Wakapi API Tests.postman_collection.json => wakapi_api_tests.postman_collection.json} (100%) diff --git a/config/config.go b/config/config.go index a4b5680..1182a53 100644 --- a/config/config.go +++ b/config/config.go @@ -269,12 +269,12 @@ func IsDev(env string) bool { func readColors() map[string]map[string]string { // Read language colors // Source: - // – https://raw.githubusercontent.com/ozh/github-colors/master/colors.json - // – https://wakatime.com/colors/operating_systems + // - https://raw.githubusercontent.com/ozh/github-colors/master/colors.json + // - https://wakatime.com/colors/operating_systems // - https://wakatime.com/colors/editors // Extracted from Wakatime website with XPath (see below) and did a bit of regex magic after. - // – $x('//span[@class="editor-icon tip"]/@data-original-title').map(e => e.nodeValue) - // – $x('//span[@class="editor-icon tip"]/div[1]/text()').map(e => e.nodeValue) + // - $x('//span[@class="editor-icon tip"]/@data-original-title').map(e => e.nodeValue) + // - $x('//span[@class="editor-icon tip"]/div[1]/text()').map(e => e.nodeValue) raw := data.ColorsFile if IsDev(env) { diff --git a/config/sentry.go b/config/sentry.go index 943abae..2a0ad51 100644 --- a/config/sentry.go +++ b/config/sentry.go @@ -140,7 +140,7 @@ func initSentry(config sentryConfig, debug bool) { return event }, }); err != nil { - logbuch.Fatal("failed to initialized sentry – %v", err) + logbuch.Fatal("failed to initialized sentry - %v", err) } } diff --git a/middlewares/custom/wakatime.go b/middlewares/custom/wakatime.go index 154f5c3..cea46cd 100644 --- a/middlewares/custom/wakatime.go +++ b/middlewares/custom/wakatime.go @@ -105,7 +105,7 @@ func (m *WakatimeRelayMiddleware) ServeHTTP(w http.ResponseWriter, r *http.Reque func (m *WakatimeRelayMiddleware) send(method, url string, body io.Reader, headers http.Header, forUser *models.User) { request, err := http.NewRequest(method, url, body) if err != nil { - logbuch.Warn("error constructing relayed request – %v", err) + logbuch.Warn("error constructing relayed request - %v", err) return } @@ -117,7 +117,7 @@ func (m *WakatimeRelayMiddleware) send(method, url string, body io.Reader, heade response, err := m.httpClient.Do(request) if err != nil { - logbuch.Warn("error executing relayed request – %v", err) + logbuch.Warn("error executing relayed request - %v", err) return } diff --git a/migrations/migrations.go b/migrations/migrations.go index 038ae5e..e08705f 100644 --- a/migrations/migrations.go +++ b/migrations/migrations.go @@ -46,7 +46,7 @@ func RunPreMigrations(db *gorm.DB, cfg *config.Config) { for _, m := range preMigrations { logbuch.Info("potentially running migration '%s'", m.name) if err := m.f(db, cfg); err != nil { - logbuch.Fatal("migration '%s' failed – %v", m.name, err) + logbuch.Fatal("migration '%s' failed - %v", m.name, err) } } } @@ -57,7 +57,7 @@ func RunPostMigrations(db *gorm.DB, cfg *config.Config) { for _, m := range postMigrations { logbuch.Info("potentially running migration '%s'", m.name) if err := m.f(db, cfg); err != nil { - logbuch.Fatal("migration '%s' failed – %v", m.name, err) + logbuch.Fatal("migration '%s' failed - %v", m.name, err) } } } diff --git a/models/duration.go b/models/duration.go index d74b715..d83656c 100644 --- a/models/duration.go +++ b/models/duration.go @@ -40,7 +40,7 @@ func NewDurationFromHeartbeat(h *Heartbeat) *Duration { func (d *Duration) Hashed() *Duration { hash, err := hashstructure.Hash(d, hashstructure.FormatV2, nil) if err != nil { - logbuch.Error("CRITICAL ERROR: failed to hash struct – %v", err) + logbuch.Error("CRITICAL ERROR: failed to hash struct - %v", err) } d.GroupHash = fmt.Sprintf("%x", hash) return d diff --git a/models/filters.go b/models/filters.go index 6e5d33f..db7db19 100644 --- a/models/filters.go +++ b/models/filters.go @@ -103,7 +103,7 @@ func (f *Filters) IsEmpty() bool { func (f *Filters) Hash() string { hash, err := hashstructure.Hash(f, hashstructure.FormatV2, nil) if err != nil { - logbuch.Error("CRITICAL ERROR: failed to hash struct – %v", err) + logbuch.Error("CRITICAL ERROR: failed to hash struct - %v", err) } return fmt.Sprintf("%x", hash) // "uint64 values with high bit set are not supported" } diff --git a/models/heartbeat.go b/models/heartbeat.go index 291659c..8b176d7 100644 --- a/models/heartbeat.go +++ b/models/heartbeat.go @@ -94,7 +94,7 @@ func (h *Heartbeat) String() string { func (h *Heartbeat) Hashed() *Heartbeat { hash, err := hashstructure.Hash(h, hashstructure.FormatV2, nil) if err != nil { - logbuch.Error("CRITICAL ERROR: failed to hash struct – %v", err) + logbuch.Error("CRITICAL ERROR: failed to hash struct - %v", err) } h.Hash = fmt.Sprintf("%x", hash) // "uint64 values with high bit set are not supported" return h diff --git a/routes/api/heartbeat.go b/routes/api/heartbeat.go index 856556c..fca3f86 100644 --- a/routes/api/heartbeat.go +++ b/routes/api/heartbeat.go @@ -98,7 +98,7 @@ func (h *HeartbeatApiHandler) Post(w http.ResponseWriter, r *http.Request) { if err := h.heartbeatSrvc.InsertBatch(heartbeats); err != nil { w.WriteHeader(http.StatusInternalServerError) w.Write([]byte(conf.ErrInternalServerError)) - conf.Log().Request(r).Error("failed to batch-insert heartbeats – %v", err) + conf.Log().Request(r).Error("failed to batch-insert heartbeats - %v", err) return } @@ -107,7 +107,7 @@ func (h *HeartbeatApiHandler) Post(w http.ResponseWriter, r *http.Request) { if _, err := h.userSrvc.Update(user); err != nil { w.WriteHeader(http.StatusInternalServerError) w.Write([]byte(conf.ErrInternalServerError)) - conf.Log().Request(r).Error("failed to update user – %v", err) + conf.Log().Request(r).Error("failed to update user - %v", err) return } } diff --git a/routes/api/metrics.go b/routes/api/metrics.go index fc40b27..aedadfa 100644 --- a/routes/api/metrics.go +++ b/routes/api/metrics.go @@ -260,7 +260,7 @@ func (h *MetricsHandler) getAdminMetrics(user *models.User) (*mm.Metrics, error) activeUsers, err := h.userSrvc.GetActive(false) if err != nil { - logbuch.Error("failed to retrieve active users for metric – %v", err) + logbuch.Error("failed to retrieve active users for metric - %v", err) return nil, err } diff --git a/routes/login.go b/routes/login.go index 0542321..9ad3c8e 100644 --- a/routes/login.go +++ b/routes/login.go @@ -284,7 +284,7 @@ func (h *LoginHandler) PostResetPassword(w http.ResponseWriter, r *http.Request) go func(user *models.User) { link := fmt.Sprintf("%s/set-password?token=%s", h.config.Server.GetPublicUrl(), user.ResetToken) if err := h.mailSrvc.SendPasswordReset(user, link); err != nil { - conf.Log().Request(r).Error("failed to send password reset mail to %s – %v", user.ID, err) + conf.Log().Request(r).Error("failed to send password reset mail to %s - %v", user.ID, err) } else { logbuch.Info("sent password reset mail to %s", user.ID) } diff --git a/routes/settings.go b/routes/settings.go index 9f137ae..fd500fb 100644 --- a/routes/settings.go +++ b/routes/settings.go @@ -492,7 +492,7 @@ func (h *SettingsHandler) actionImportWakatime(w http.ResponseWriter, r *http.Re insert := func(batch []*models.Heartbeat) { if err := h.heartbeatSrvc.InsertBatch(batch); err != nil { - logbuch.Warn("failed to insert imported heartbeat, already existing? – %v", err) + logbuch.Warn("failed to insert imported heartbeat, already existing? - %v", err) } } @@ -518,13 +518,13 @@ func (h *SettingsHandler) actionImportWakatime(w http.ResponseWriter, r *http.Re if !user.HasData { user.HasData = true if _, err := h.userSrvc.Update(user); err != nil { - conf.Log().Request(r).Error("failed to set 'has_data' flag for user %s – %v", user.ID, err) + conf.Log().Request(r).Error("failed to set 'has_data' flag for user %s - %v", user.ID, err) } } if user.Email != "" { if err := h.mailSrvc.SendImportNotification(user, time.Now().Sub(start), int(countAfter-countBefore)); err != nil { - conf.Log().Request(r).Error("failed to send import notification mail to %s – %v", user.ID, err) + conf.Log().Request(r).Error("failed to send import notification mail to %s - %v", user.ID, err) } else { logbuch.Info("sent import notification mail to %s", user.ID) } @@ -546,11 +546,11 @@ func (h *SettingsHandler) actionRegenerateSummaries(w http.ResponseWriter, r *ht go func(user *models.User) { if err := h.regenerateSummaries(user); err != nil { - conf.Log().Request(r).Error("failed to regenerate summaries for user '%s' – %v", user.ID, err) + conf.Log().Request(r).Error("failed to regenerate summaries for user '%s' - %v", user.ID, err) } }(middlewares.GetPrincipal(r)) - return http.StatusAccepted, "summaries are being regenerated – this may take a up to a couple of minutes, please come back later", "" + return http.StatusAccepted, "summaries are being regenerated - this may take a up to a couple of minutes, please come back later", "" } func (h *SettingsHandler) actionDeleteUser(w http.ResponseWriter, r *http.Request) (int, string, string) { @@ -563,7 +563,7 @@ func (h *SettingsHandler) actionDeleteUser(w http.ResponseWriter, r *http.Reques logbuch.Info("deleting user '%s' shortly", user.ID) time.Sleep(5 * time.Minute) if err := h.userSrvc.Delete(user); err != nil { - conf.Log().Request(r).Error("failed to delete user '%s' – %v", user.ID, err) + conf.Log().Request(r).Error("failed to delete user '%s' - %v", user.ID, err) } else { logbuch.Info("successfully deleted user '%s'", user.ID) } diff --git a/services/aggregation.go b/services/aggregation.go index d400228..c45ce79 100644 --- a/services/aggregation.go +++ b/services/aggregation.go @@ -84,7 +84,7 @@ func (srv *AggregationService) Run(userIds map[string]bool) error { func (srv *AggregationService) summaryWorker(jobs <-chan *AggregationJob, summaries chan<- *models.Summary) { for job := range jobs { if summary, err := srv.summaryService.Summarize(job.From, job.To, &models.User{ID: job.UserID}, nil); err != nil { - config.Log().Error("failed to generate summary (%v, %v, %s) – %v", job.From, job.To, job.UserID, err) + config.Log().Error("failed to generate summary (%v, %v, %s) - %v", job.From, job.To, job.UserID, err) } else { logbuch.Info("successfully generated summary (%v, %v, %s)", job.From, job.To, job.UserID) summaries <- summary @@ -95,7 +95,7 @@ func (srv *AggregationService) summaryWorker(jobs <-chan *AggregationJob, summar func (srv *AggregationService) persistWorker(summaries <-chan *models.Summary) { for summary := range summaries { if err := srv.summaryService.Insert(summary); err != nil { - config.Log().Error("failed to save summary (%v, %v, %s) – %v", summary.UserID, summary.FromTime, summary.ToTime, err) + config.Log().Error("failed to save summary (%v, %v, %s) - %v", summary.UserID, summary.FromTime, summary.ToTime, err) } } } diff --git a/services/imports/wakatime.go b/services/imports/wakatime.go index 8b979eb..0fdbabb 100644 --- a/services/imports/wakatime.go +++ b/services/imports/wakatime.go @@ -45,7 +45,7 @@ func (w *WakatimeHeartbeatImporter) Import(user *models.User, minFrom time.Time, startDate, endDate, err := w.fetchRange(baseUrl) if err != nil { - config.Log().Error("failed to fetch date range while importing wakatime heartbeats for user '%s' – %v", user.ID, err) + config.Log().Error("failed to fetch date range while importing wakatime heartbeats for user '%s' - %v", user.ID, err) return } @@ -58,13 +58,13 @@ func (w *WakatimeHeartbeatImporter) Import(user *models.User, minFrom time.Time, 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) + 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) + config.Log().Error("failed to fetch machine names while importing wakatime heartbeats for user '%s' - %v", user.ID, err) return } @@ -76,7 +76,7 @@ func (w *WakatimeHeartbeatImporter) Import(user *models.User, minFrom time.Time, for _, d := range days { if err := sem.Acquire(ctx, 1); err != nil { - logbuch.Error("failed to acquire semaphore – %v", err) + logbuch.Error("failed to acquire semaphore - %v", err) break } @@ -87,7 +87,7 @@ func (w *WakatimeHeartbeatImporter) Import(user *models.User, minFrom time.Time, d := day.Format(config.SimpleDateFormat) heartbeats, err := w.fetchHeartbeats(d, baseUrl) if err != nil { - config.Log().Error("failed to fetch heartbeats for day '%s' and user '%s' – &v", d, user.ID, err) + config.Log().Error("failed to fetch heartbeats for day '%s' and user '%s' - &v", d, user.ID, err) } for _, h := range heartbeats { diff --git a/services/report.go b/services/report.go index e28f5c9..c332c29 100644 --- a/services/report.go +++ b/services/report.go @@ -89,7 +89,7 @@ func (srv *ReportService) SyncSchedule(u *models.User) bool { At(t). Tag(u.ID). Do(srv.Run, u, 7*24*time.Hour); err != nil { - config.Log().Error("failed to schedule report job for user '%s' – %v", u.ID, err) + config.Log().Error("failed to schedule report job for user '%s' - %v", u.ID, err) } else { logbuch.Info("next report for user %s is scheduled for %v", u.ID, job.NextRun()) } @@ -114,7 +114,7 @@ func (srv *ReportService) Run(user *models.User, duration time.Duration) error { summary, err := srv.summaryService.Aliased(start, end, user, srv.summaryService.Retrieve, nil, false) if err != nil { - config.Log().Error("failed to generate report for '%s' – %v", user.ID, err) + config.Log().Error("failed to generate report for '%s' - %v", user.ID, err) return err } @@ -126,7 +126,7 @@ func (srv *ReportService) Run(user *models.User, duration time.Duration) error { } if err := srv.mailService.SendReport(user, report); err != nil { - config.Log().Error("failed to send report for '%s' – %v", user.ID, err) + config.Log().Error("failed to send report for '%s' - %v", user.ID, err) return err } diff --git a/testing/run_api_tests.sh b/testing/run_api_tests.sh index 8155d02..4e17b1c 100755 --- a/testing/run_api_tests.sh +++ b/testing/run_api_tests.sh @@ -30,7 +30,7 @@ done echo "" echo "Running test collection ..." -newman run "Wakapi API Tests.postman_collection.json" +newman run "wakapi_api_tests.postman_collection.json" exit_code=$? echo "Shutting down Wakapi ..." @@ -39,4 +39,4 @@ kill -TERM $pid echo "Deleting database ..." rm wakapi_testing.db -exit $exit_code \ No newline at end of file +exit $exit_code diff --git a/testing/Wakapi API Tests.postman_collection.json b/testing/wakapi_api_tests.postman_collection.json similarity index 100% rename from testing/Wakapi API Tests.postman_collection.json rename to testing/wakapi_api_tests.postman_collection.json diff --git a/views/index.tpl.html b/views/index.tpl.html index 5c57161..459dd31 100644 --- a/views/index.tpl.html +++ b/views/index.tpl.html @@ -12,7 +12,7 @@
-  Login️ +  Login