Fix & refactor adguard stats

releases: Add support for Codeberg

docs/configuration.md

@@ -307,6 +307,7 @@ pages:
 | title | string | yes | |
 | slug | string | no | |
 | width | string | no | |
+| center-vertically | boolean | no | false |
 | hide-desktop-navigation | boolean | no | false |
 | show-mobile-header | boolean | no | false |
 | columns | array | yes | |
@@ -328,6 +329,8 @@ The maximum width of the page on desktop. Possible values are `slim` and `wide`.
 >
 > When using `slim`, the maximum number of columns allowed for that page is `2`.
 
+#### `center-vertically`
+When set to `true`, vertically centers the content on the page. Has no effect if the content is taller than the height of the viewport.
 
 #### `hide-desktop-navigation`
 Whether to show the navigation links at the top of the page on desktop.
@@ -1111,7 +1114,7 @@ Whether to ignore invalid/self-signed certificates.
 Whether to open the link in the same or a new tab.
 
 ### Releases
-Display a list of latest releases for specific repositories on Github, GitLab or Docker Hub.
+Display a list of latest releases for specific repositories on Github, GitLab, Codeberg or Docker Hub.
 
 Example:
 
@@ -1122,6 +1125,7 @@ Example:
     - go-gitea/gitea
     - jellyfin/jellyfin
     - glanceapp/glance
+    - codeberg:redict/redict
     - gitlab:fdroid/fdroidclient
     - dockerhub:gotify/server
 ```
@@ -1142,12 +1146,13 @@ Preview:
 | collapse-after | integer | no | 5 |
 
 ##### `repositories`
-A list of repositores to fetch the latest release for. Only the name/repo is required, not the full URL. A prefix can be specified for repositories hosted elsewhere such as GitLab and Docker Hub. Example:
+A list of repositores to fetch the latest release for. Only the name/repo is required, not the full URL. A prefix can be specified for repositories hosted elsewhere such as GitLab, Codeberg and Docker Hub. Example:
 
 ```yaml
 repositories:
   - gitlab:inkscape/inkscape
   - dockerhub:glanceapp/glance
+  - codeberg:redict/redict
 ```
 
 Official images on Docker Hub can be specified by ommiting the owner:
@@ -1169,7 +1174,7 @@ repositories:
 
 
 ##### `show-source-icon`
-Shows an icon of the source (GitHub/GitLab/Docker Hub) next to the repository name when set to `true`.
+Shows an icon of the source (GitHub/GitLab/Codeberg/Docker Hub) next to the repository name when set to `true`.
 
 ##### `token`
 Without authentication Github allows for up to 60 requests per hour. You can easily exceed this limit and start seeing errors if you're tracking lots of repositories or your cache time is low. To circumvent this you can [create a read only token from your Github account](https://github.com/settings/personal-access-tokens/new) and provide it here.

internal/assets/static/icons/codeberg.svg

@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M11.955.49A12 12 0 0 0 0 12.49a12 12 0 0 0 1.832 6.373L11.838 5.928a.187.14 0 0 1 .324 0l10.006 12.935A12 12 0 0 0 24 12.49a12 12 0 0 0-12-12 12 12 0 0 0-.045 0zm.375 6.467l4.416 16.553a12 12 0 0 0 5.137-4.213z"/></svg>

internal/assets/static/main.css

@@ -851,6 +851,7 @@ details[open] .summary::after {
     border-bottom: 2px solid transparent;
     transition: color .3s, border-color .3s;
     font-size: var(--font-size-h3);
+    flex-shrink: 0;
 }
 
 .nav-item:not(.nav-item-current):hover {

internal/feed/adguard.go

@@ -31,10 +31,13 @@ func FetchAdguardStats(instanceURL, username, password string) (*DNSStats, error
 		return nil, err
 	}
 
+	var topBlockedDomainsCount = min(len(responseJson.TopBlockedDomains), 5)
+
 	stats := &DNSStats{
-		TotalQueries:   responseJson.TotalQueries,
+		TotalQueries:      responseJson.TotalQueries,
-		BlockedQueries: responseJson.BlockedQueries,
+		BlockedQueries:    responseJson.BlockedQueries,
-		ResponseTime:   int(responseJson.ResponseTime * 1000),
+		ResponseTime:      int(responseJson.ResponseTime * 1000),
+		TopBlockedDomains: make([]DNSStatsBlockedDomain, 0, topBlockedDomainsCount),
 	}
 
 	if stats.TotalQueries <= 0 {
@@ -43,8 +46,6 @@ func FetchAdguardStats(instanceURL, username, password string) (*DNSStats, error
 
 	stats.BlockedPercent = int(float64(responseJson.BlockedQueries) / float64(responseJson.TotalQueries) * 100)
 
-	var topBlockedDomainsCount = min(len(responseJson.TopBlockedDomains), 5)
-
 	for i := 0; i < topBlockedDomainsCount; i++ {
 		domain := responseJson.TopBlockedDomains[i]
 		var firstDomain string
@@ -59,31 +60,51 @@ func FetchAdguardStats(instanceURL, username, password string) (*DNSStats, error
 		}
 
 		stats.TopBlockedDomains = append(stats.TopBlockedDomains, DNSStatsBlockedDomain{
-			Domain:         firstDomain,
+			Domain: firstDomain,
-			PercentBlocked: int(float64(domain[firstDomain]) / float64(responseJson.BlockedQueries) * 100),
 		})
+
+		if stats.BlockedQueries > 0 {
+			stats.TopBlockedDomains[i].PercentBlocked = int(float64(domain[firstDomain]) / float64(responseJson.BlockedQueries) * 100)
+		}
 	}
 
-	// Adguard _should_ return data for the last 24 hours in a 1 hour interval
+	queriesSeries := responseJson.QueriesSeries
-	if len(responseJson.QueriesSeries) != 24 || len(responseJson.BlockedSeries) != 24 {
+	blockedSeries := responseJson.BlockedSeries
-		return stats, nil
+
+	const bars = 8
+	const hoursSpan = 24
+	const hoursPerBar int = hoursSpan / bars
+
+	if len(queriesSeries) > hoursSpan {
+		queriesSeries = queriesSeries[len(queriesSeries)-hoursSpan:]
+	} else if len(queriesSeries) < hoursSpan {
+		queriesSeries = append(make([]int, hoursSpan-len(queriesSeries)), queriesSeries...)
+	}
+
+	if len(blockedSeries) > hoursSpan {
+		blockedSeries = blockedSeries[len(blockedSeries)-hoursSpan:]
+	} else if len(blockedSeries) < hoursSpan {
+		blockedSeries = append(make([]int, hoursSpan-len(blockedSeries)), blockedSeries...)
 	}
 
 	maxQueriesInSeries := 0
 
-	for i := 0; i < 8; i++ {
+	for i := 0; i < bars; i++ {
 		queries := 0
 		blocked := 0
 
-		for j := 0; j < 3; j++ {
+		for j := 0; j < hoursPerBar; j++ {
-			queries += responseJson.QueriesSeries[i*3+j]
+			queries += queriesSeries[i*hoursPerBar+j]
-			blocked += responseJson.BlockedSeries[i*3+j]
+			blocked += blockedSeries[i*hoursPerBar+j]
 		}
 
 		stats.Series[i] = DNSStatsSeries{
-			Queries:        queries,
+			Queries: queries,
-			Blocked:        blocked,
+			Blocked: blocked,
-			PercentBlocked: int(float64(blocked) / float64(queries) * 100),
+		}
+
+		if queries > 0 {
+			stats.Series[i].PercentBlocked = int(float64(blocked) / float64(queries) * 100)
 		}
 
 		if queries > maxQueriesInSeries {
@@ -91,7 +112,7 @@ func FetchAdguardStats(instanceURL, username, password string) (*DNSStats, error
 		}
 	}
 
-	for i := 0; i < 8; i++ {
+	for i := 0; i < bars; i++ {
 		stats.Series[i].PercentTotal = int(float64(stats.Series[i].Queries) / float64(maxQueriesInSeries) * 100)
 	}
 

internal/feed/codeberg.go

@@ -0,0 +1,39 @@
+package feed
+
+import (
+	"fmt"
+	"net/http"
+)
+
+type codebergReleaseResponseJson struct {
+	TagName     string `json:"tag_name"`
+	PublishedAt string `json:"published_at"`
+	HtmlUrl     string `json:"html_url"`
+}
+
+func fetchLatestCodebergRelease(request *ReleaseRequest) (*AppRelease, error) {
+	httpRequest, err := http.NewRequest(
+		"GET",
+		fmt.Sprintf(
+			"https://codeberg.org/api/v1/repos/%s/releases/latest",
+			request.Repository,
+		),
+		nil,
+	)
+	if err != nil {
+		return nil, err
+	}
+
+	response, err := decodeJsonFromRequest[codebergReleaseResponseJson](defaultClient, httpRequest)
+
+	if err != nil {
+		return nil, err
+	}
+	return &AppRelease{
+		Source:       ReleaseSourceCodeberg,
+		Name:         request.Repository,
+		Version:      normalizeVersionFormat(response.TagName),
+		NotesUrl:     response.HtmlUrl,
+		TimeReleased: parseRFC3339Time(response.PublishedAt),
+	}, nil
+}

internal/feed/pihole.go

@@ -2,6 +2,7 @@ package feed
 
 import (
 	"errors"
+	"log/slog"
 	"net/http"
 	"sort"
 	"strings"
@@ -63,6 +64,11 @@ func FetchPiholeStats(instanceURL, token string) (*DNSStats, error) {
 
 	// Pihole _should_ return data for the last 24 hours in a 10 minute interval, 6*24 = 144
 	if len(responseJson.QueriesSeries) != 144 || len(responseJson.BlockedSeries) != 144 {
+		slog.Warn(
+			"DNS stats for pihole: did not get expected 144 data points",
+			"len(queries)", len(responseJson.QueriesSeries),
+			"len(blocked)", len(responseJson.BlockedSeries),
+		)
 		return stats, nil
 	}
 

internal/feed/releases.go

@@ -9,6 +9,7 @@ import (
 type ReleaseSource string
 
 const (
+	ReleaseSourceCodeberg  ReleaseSource = "codeberg"
 	ReleaseSourceGithub    ReleaseSource = "github"
 	ReleaseSourceGitlab    ReleaseSource = "gitlab"
 	ReleaseSourceDockerHub ReleaseSource = "dockerhub"
@@ -57,6 +58,8 @@ func FetchLatestReleases(requests []*ReleaseRequest) (AppReleases, error) {
 
 func fetchLatestReleaseTask(request *ReleaseRequest) (*AppRelease, error) {
 	switch request.Source {
+	case ReleaseSourceCodeberg:
+		return fetchLatestCodebergRelease(request)
 	case ReleaseSourceGithub:
 		return fetchLatestGithubRelease(request)
 	case ReleaseSourceGitlab:

internal/widget/releases.go

@@ -40,7 +40,6 @@ func (widget *Releases) Initialize() error {
 	for _, repository := range widget.Repositories {
 		parts := strings.SplitN(repository, ":", 2)
 		var request *feed.ReleaseRequest
-
 		if len(parts) == 1 {
 			request = &feed.ReleaseRequest{
 				Source:     feed.ReleaseSourceGithub,
@@ -65,6 +64,11 @@ func (widget *Releases) Initialize() error {
 					Source:     feed.ReleaseSourceDockerHub,
 					Repository: parts[1],
 				}
+			} else if parts[0] == string(feed.ReleaseSourceCodeberg) {
+				request = &feed.ReleaseRequest{
+					Source:     feed.ReleaseSourceCodeberg,
+					Repository: parts[1],
+				}
 			} else {
 				return errors.New("invalid repository source " + parts[0])
 			}