diff --git a/database/db.go b/database/db.go index 923254e..516c2cb 100644 --- a/database/db.go +++ b/database/db.go @@ -3,6 +3,7 @@ package database import ( "fmt" "log" + "pool-stats/models" "time" "github.com/ostafen/clover/v2" @@ -76,3 +77,25 @@ func PrintAllHashes(db *clover.DB) { fmt.Println(hash) } } + +func ListShares(db *clover.DB, offset int, count int) []models.ShareLog { + results, err := db.FindAll( + c.NewQuery(CollectionName). + Sort(c.SortOption{Field: "CreateDate", Direction: -1}). + Skip(offset). + Limit(count), + ) + if err != nil { + log.Printf("failed to list shares: %v", err) + return nil + } + + shareLogs := make([]models.ShareLog, len(results)) + for idx, doc := range results { + var shareLog models.ShareLog + doc.Unmarshal(&shareLog) + shareLogs[idx] = shareLog + } + + return shareLogs +} diff --git a/helpers/helpers.go b/helpers/helpers.go new file mode 100644 index 0000000..b87237d --- /dev/null +++ b/helpers/helpers.go @@ -0,0 +1,39 @@ +package helpers + +import ( + "fmt" + "strconv" + "strings" + "time" +) + +func HumanDiff(diff float64) string { + units := []string{"", "K", "M", "G", "T"} + i := 0 + for diff >= 1000 && i < len(units)-1 { + diff /= 1000 + i++ + } + return fmt.Sprintf("%.2f%s", diff, units[i]) +} + +func ParseCreateDate(createdate string) time.Time { + parts := strings.Split(createdate, ",") + if len(parts) == 2 { + sec, _ := strconv.ParseInt(parts[0], 10, 64) + nsec, _ := strconv.ParseInt(parts[1], 10, 64) + return time.Unix(sec, nsec) + } + return time.Time{} +} + +func FormatCreateDate(createdate string) string { + parts := strings.Split(createdate, ",") + if len(parts) == 2 { + sec, _ := strconv.ParseInt(parts[0], 10, 64) + nsec, _ := strconv.ParseInt(parts[1], 10, 64) + t := time.Unix(sec, nsec) + return t.Format(time.DateTime) + } + return "" +} diff --git a/stats/stats.go b/stats/stats.go index 3aa0266..4b4fcdb 100644 --- a/stats/stats.go +++ b/stats/stats.go @@ -1,37 +1,15 @@ package stats import ( - "fmt" - "strconv" - "strings" "time" "github.com/ostafen/clover/v2" "pool-stats/database" + "pool-stats/helpers" "pool-stats/models" ) -func parseCreatedate(createdate string) time.Time { - parts := strings.Split(createdate, ",") - if len(parts) == 2 { - sec, _ := strconv.ParseInt(parts[0], 10, 64) - nsec, _ := strconv.ParseInt(parts[1], 10, 64) - return time.Unix(sec, nsec) - } - return time.Time{} -} - -func humanDiff(diff float64) string { - units := []string{"", "K", "M", "G", "T"} - i := 0 - for diff >= 1000 && i < len(units)-1 { - diff /= 1000 - i++ - } - return fmt.Sprintf("%.2f%s", diff, units[i]) -} - func GetStats(db *clover.DB) ([]models.ShareStat, error) { now := time.Now() ranges := []struct { @@ -50,8 +28,8 @@ func GetStats(db *clover.DB) ([]models.ShareStat, error) { if doc != nil { stats = append(stats, models.ShareStat{ Label: "All Time", - Diff: humanDiff(doc.Get("SDiff").(float64)), - Time: parseCreatedate(doc.Get("CreateDate").(string)).Format(time.RFC822), + Diff: helpers.HumanDiff(doc.Get("SDiff").(float64)), + Time: helpers.ParseCreateDate(doc.Get("CreateDate").(string)).Format(time.RFC822), }) } @@ -60,8 +38,8 @@ func GetStats(db *clover.DB) ([]models.ShareStat, error) { if doc != nil { stats = append(stats, models.ShareStat{ Label: r.Label, - Diff: humanDiff(doc.Get("SDiff").(float64)), - Time: parseCreatedate(doc.Get("CreateDate").(string)).Format(time.RFC822), + Diff: helpers.HumanDiff(doc.Get("SDiff").(float64)), + Time: helpers.ParseCreateDate(doc.Get("CreateDate").(string)).Format(time.RFC822), }) } else { stats = append(stats, models.ShareStat{Label: r.Label, Diff: "-", Time: "-"}) diff --git a/templates/index.html b/templates/index.html index d6c12b9..f3532b5 100644 --- a/templates/index.html +++ b/templates/index.html @@ -26,10 +26,19 @@ tr:nth-child(even) { background-color: #1a1a1a; } + a { + color: #0af; + text-decoration: none; + } + li { + display: inline; + margin: 0 10px; + } -

🌟 ckpool Share Stats

+

🌟 Pool Share Stats

+ @@ -44,5 +53,10 @@ {{end}}
Range
+ + diff --git a/templates/shares.html b/templates/shares.html new file mode 100644 index 0000000..b903d54 --- /dev/null +++ b/templates/shares.html @@ -0,0 +1,103 @@ +{{ define "share_list" }} + + + + + ckpool Share Browser + + + +

☀️ Pool Share Browser

+ + + + + + + + + + + + + + {{ range .Shares }} + + + + + + + + + {{ else }} + + + + {{ end }} + +
TimeWorkerAddressSDiffResultHash
{{ formatCreateDate .CreateDate }}{{ .WorkerName }}{{ .Address }}{{ humanDiff .SDiff }}{{ if .Result }}✔️{{ else }}❌{{ end }}{{ .Hash }}
No shares found.
+ +
+ {{ if gt .Page 1 }} + « Prev + {{ end }} {{ if gt .Page 2 }} + 1 + {{ if gt .Page 3 }} + ... + {{ end }} {{ end }} + + {{ .Page }} + + {{ if .HasMore }} + ... + Next » + {{ end }} +
+ + + + +{{ end }} diff --git a/web/server.go b/web/server.go index 3439e5f..385190a 100644 --- a/web/server.go +++ b/web/server.go @@ -22,6 +22,8 @@ func NewWebServer(db *clover.DB, port int) *WebServer { func (ws *WebServer) Start() error { http.HandleFunc("/", ws.IndexHandler) + http.HandleFunc("/shares", ws.SharesHandler) + address := ":" + fmt.Sprint(ws.port) println("Listening on", address) return http.ListenAndServe(address, nil) diff --git a/web/sharesHandler.go b/web/sharesHandler.go new file mode 100644 index 0000000..26d030e --- /dev/null +++ b/web/sharesHandler.go @@ -0,0 +1,59 @@ +package web + +import ( + "html/template" + "net/http" + "pool-stats/database" + "pool-stats/helpers" + "pool-stats/models" + "strconv" +) + +type SharePageData struct { + Shares []models.ShareLog + Page int + HasMore bool +} + +func (ws *WebServer) SharesHandler(w http.ResponseWriter, r *http.Request) { + tmpl := template.New("share_list").Funcs(template.FuncMap{ + "add": func(a, b int) int { return a + b }, + "sub": func(a, b int) int { return a - b }, + "humanDiff": helpers.HumanDiff, + "formatCreateDate": helpers.FormatCreateDate, + }) + tmpl, err := tmpl.ParseFiles("templates/shares.html") + if err != nil { + http.Error(w, "Failed to load template", 500) + return + } + + entriesPerPage := 10 + page := r.URL.Query().Get("page") + if page == "" { + page = "1" + } + + offset, err := strconv.Atoi(page) + if err != nil || offset < 1 { + http.Error(w, "Invalid page number", 400) + return + } + + offset = (offset - 1) * entriesPerPage + shareLogs := database.ListShares(ws.db, offset, entriesPerPage) + if shareLogs == nil { + http.Error(w, "Failed to load shares", 500) + return + } + + data := SharePageData{ + Shares: shareLogs, + Page: offset/entriesPerPage + 1, + HasMore: len(shareLogs) == entriesPerPage, + } + if err := tmpl.Execute(w, data); err != nil { + http.Error(w, "Failed to render template", 500) + return + } +}