marvin/marvinblum
1
0
Fork 0
mirror of https://github.com/Kugelschieber/marvinblum.git synced 2026-01-18 14:50:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated pirsch, simplified statistics code.

Browse Source
This commit is contained in:
Marvin Blum
2020-06-25 15:38:23 +02:00
committed by Marvin Blum
parent 6d2687c9b3
commit 65d19fdf51
4 changed files with 17 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
tracking/statistics.go
View File

@@ -2,7 +2,6 @@ package tracking
import (
"fmt"
"github.com/emvi/logbuch"
"github.com/emvi/pirsch"
"html/template"
"strings"
@@ -20,63 +19,33 @@ type PageVisits struct {
}
func GetTotalVisitors(start int) (template.JS, template.JS) {
query := `SELECT "date" "day",
CASE WHEN "visitors_per_day".visitors IS NULL THEN 0 ELSE "visitors_per_day".visitors END
FROM (SELECT * FROM generate_series(date($1), date(now()), interval '1 day') "date") AS date_series
LEFT JOIN "visitors_per_day" ON date("visitors_per_day"."day") = date("date")
ORDER BY "date" ASC`
startTime := today()
startTime = startTime.Add(-time.Hour * 24 * time.Duration(start-1))
logbuch.Debug("Reading total visitors since", logbuch.Fields{"since": startTime})
var visitors []pirsch.VisitorsPerDay
if err := db.Select(&visitors, query, startTime); err != nil {
logbuch.Error("Error reading total visitors", logbuch.Fields{"err": err, "since": startTime})
return "", ""
}
today := today()
visitorsToday, err := store.VisitorsPerDay(today)
analyzer := pirsch.NewAnalyzer(store)
visitors, err := analyzer.Visitors(&pirsch.Filter{From: startTime, To: today()})
if err != nil {
logbuch.Error("Error reading total visitors for today", logbuch.Fields{"err": err, "since": startTime})
return "", ""
}
visitors[len(visitors)-1].Visitors = visitorsToday
return getLabelsAndData(visitors)
}
func GetPageVisits(start int) []PageVisits {
pathsQuery := `SELECT * FROM (SELECT DISTINCT "path" FROM "visitors_per_page" WHERE day >= $1) AS paths ORDER BY length("path") ASC`
query := `SELECT "date" "day",
CASE WHEN "visitors_per_page".visitors IS NULL THEN 0 ELSE "visitors_per_page".visitors END
FROM (SELECT * FROM generate_series(date($1), date(now() - INTERVAL '1 day'), interval '1 day') "date") AS date_series
LEFT JOIN "visitors_per_page" ON date("visitors_per_page"."day") = date("date") AND "visitors_per_page"."path" = $2
ORDER BY "date" ASC, length("visitors_per_page"."path") ASC`
startTime := today()
startTime = startTime.Add(-time.Hour * 24 * time.Duration(start-1))
logbuch.Debug("Reading page visits", logbuch.Fields{"since": startTime})
var paths []string
analyzer := pirsch.NewAnalyzer(store)
visits, err := analyzer.PageVisits(&pirsch.Filter{From: startTime, To: today()})
if err := db.Select(&paths, pathsQuery, startTime); err != nil {
logbuch.Error("Error reading distinct paths", logbuch.Fields{"err": err})
if err != nil {
return nil
}
// TODO add visitors for today
pageVisits := make([]PageVisits, len(paths))
pageVisits := make([]PageVisits, len(visits))
for i, path := range paths {
var visitors []pirsch.VisitorsPerDay
if err := db.Select(&visitors, query, startTime, path); err != nil {
logbuch.Error("Error reading visitor for path", logbuch.Fields{"err": err, "since": startTime})
return nil
}
labels, data := getLabelsAndData(visitors)
pageVisits[i] = PageVisits{path, labels, data}
for i, visit := range visits {
labels, data := getLabelsAndData(visit.Visits)
pageVisits[i] = PageVisits{visit.Path, labels, data}
}
return pageVisits
@@ -98,5 +67,5 @@ func getLabelsAndData(visitors []pirsch.VisitorsPerDay) (template.JS, template.J
func today() time.Time {
now := time.Now()
return time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location())
return time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, time.UTC)
}