{{- range .Containers }}
- -
-
+ -
+
-
{{ end }}
diff --git a/internal/glance/templates/videos-vertical-list.html b/internal/glance/templates/videos-vertical-list.html
index a735a74..b7ea6b2 100644
--- a/internal/glance/templates/videos-vertical-list.html
+++ b/internal/glance/templates/videos-vertical-list.html
@@ -6,7 +6,7 @@
{{ .Image }}
@@ -22,7 +22,7 @@
+
{{- end }}
{{- define "state-icon" }}
{{- if eq . "ok" }}
-
{{- if .URL }}
{{ .Title }}
{{- else }}
@@ -33,33 +33,31 @@
{{- end }}
-
+
{{- else }}
{{ template "state-icon" .StateIcon }}
-
-
-
+ No containers available to show.
{{- end }}
-
+
- {{ .Title }}
+ {{ .Title }}
-
diff --git a/internal/glance/utils.go b/internal/glance/utils.go
index a614bda..72d5a28 100644
--- a/internal/glance/utils.go
+++ b/internal/glance/utils.go
@@ -119,6 +119,14 @@ func parseRFC3339Time(t string) time.Time {
return parsed
}
+func boolToString(b bool, trueValue, falseValue string) string {
+ if b {
+ return trueValue
+ }
+
+ return falseValue
+}
+
func normalizeVersionFormat(version string) string {
version = strings.ToLower(strings.TrimSpace(version))
diff --git a/internal/glance/widget-custom-api.go b/internal/glance/widget-custom-api.go
index 93d51c0..c8e3773 100644
--- a/internal/glance/widget-custom-api.go
+++ b/internal/glance/widget-custom-api.go
@@ -3,7 +3,6 @@ package glance
import (
"bytes"
"context"
- "encoding/json"
"errors"
"fmt"
"html/template"
@@ -11,11 +10,6 @@ import (
"log/slog"
"math"
"net/http"
- "regexp"
- "sort"
- "strconv"
- "strings"
- "sync"
"time"
"github.com/tidwall/gjson"
@@ -23,41 +17,22 @@ import (
var customAPIWidgetTemplate = mustParseTemplate("custom-api.html", "widget-base.html")
-// Needs to be exported for the YAML unmarshaler to work
-type CustomAPIRequest struct {
- URL string `yaml:"url"`
- AllowInsecure bool `yaml:"allow-insecure"`
- Headers map[string]string `yaml:"headers"`
- Parameters queryParametersField `yaml:"parameters"`
- Method string `yaml:"method"`
- BodyType string `yaml:"body-type"`
- Body any `yaml:"body"`
- SkipJSONValidation bool `yaml:"skip-json-validation"`
- bodyReader io.ReadSeeker `yaml:"-"`
- httpRequest *http.Request `yaml:"-"`
-}
-
type customAPIWidget struct {
- widgetBase `yaml:",inline"`
- *CustomAPIRequest `yaml:",inline"` // the primary request
- Subrequests map[string]*CustomAPIRequest `yaml:"subrequests"`
- Template string `yaml:"template"`
- Frameless bool `yaml:"frameless"`
- compiledTemplate *template.Template `yaml:"-"`
- CompiledHTML template.HTML `yaml:"-"`
+ widgetBase `yaml:",inline"`
+ URL string `yaml:"url"`
+ Template string `yaml:"template"`
+ Frameless bool `yaml:"frameless"`
+ Headers map[string]string `yaml:"headers"`
+ APIRequest *http.Request `yaml:"-"`
+ compiledTemplate *template.Template `yaml:"-"`
+ CompiledHTML template.HTML `yaml:"-"`
}
func (widget *customAPIWidget) initialize() error {
widget.withTitle("Custom API").withCacheDuration(1 * time.Hour)
- if err := widget.CustomAPIRequest.initialize(); err != nil {
- return fmt.Errorf("initializing primary request: %v", err)
- }
-
- for key := range widget.Subrequests {
- if err := widget.Subrequests[key].initialize(); err != nil {
- return fmt.Errorf("initializing subrequest %q: %v", key, err)
- }
+ if widget.URL == "" {
+ return errors.New("URL is required")
}
if widget.Template == "" {
@@ -71,11 +46,22 @@ func (widget *customAPIWidget) initialize() error {
widget.compiledTemplate = compiledTemplate
+ req, err := http.NewRequest(http.MethodGet, widget.URL, nil)
+ if err != nil {
+ return err
+ }
+
+ for key, value := range widget.Headers {
+ req.Header.Add(key, value)
+ }
+
+ widget.APIRequest = req
+
return nil
}
func (widget *customAPIWidget) update(ctx context.Context) {
- compiledHTML, err := fetchAndParseCustomAPI(widget.CustomAPIRequest, widget.Subrequests, widget.compiledTemplate)
+ compiledHTML, err := fetchAndParseCustomAPI(widget.APIRequest, widget.compiledTemplate)
if !widget.canContinueUpdateAfterHandlingErr(err) {
return
}
@@ -87,207 +73,39 @@ func (widget *customAPIWidget) Render() template.HTML {
return widget.renderTemplate(widget, customAPIWidgetTemplate)
}
-func (req *CustomAPIRequest) initialize() error {
- if req.URL == "" {
- return errors.New("URL is required")
- }
+func fetchAndParseCustomAPI(req *http.Request, tmpl *template.Template) (template.HTML, error) {
+ emptyBody := template.HTML("")
- if req.Body != nil {
- if req.Method == "" {
- req.Method = http.MethodPost
- }
-
- if req.BodyType == "" {
- req.BodyType = "json"
- }
-
- if req.BodyType != "json" && req.BodyType != "string" {
- return errors.New("invalid body type, must be either 'json' or 'string'")
- }
-
- switch req.BodyType {
- case "json":
- encoded, err := json.Marshal(req.Body)
- if err != nil {
- return fmt.Errorf("marshaling body: %v", err)
- }
-
- req.bodyReader = bytes.NewReader(encoded)
- case "string":
- bodyAsString, ok := req.Body.(string)
- if !ok {
- return errors.New("body must be a string when body-type is 'string'")
- }
-
- req.bodyReader = strings.NewReader(bodyAsString)
- }
-
- } else if req.Method == "" {
- req.Method = http.MethodGet
- }
-
- httpReq, err := http.NewRequest(strings.ToUpper(req.Method), req.URL, req.bodyReader)
+ resp, err := defaultHTTPClient.Do(req)
if err != nil {
- return err
- }
-
- if len(req.Parameters) > 0 {
- httpReq.URL.RawQuery = req.Parameters.toQueryString()
- }
-
- if req.BodyType == "json" {
- httpReq.Header.Set("Content-Type", "application/json")
- }
-
- for key, value := range req.Headers {
- httpReq.Header.Add(key, value)
- }
-
- req.httpRequest = httpReq
-
- return nil
-}
-
-type customAPIResponseData struct {
- JSON decoratedGJSONResult
- Response *http.Response
-}
-
-type customAPITemplateData struct {
- *customAPIResponseData
- subrequests map[string]*customAPIResponseData
-}
-
-func (data *customAPITemplateData) JSONLines() []decoratedGJSONResult {
- result := make([]decoratedGJSONResult, 0, 5)
-
- gjson.ForEachLine(data.JSON.Raw, func(line gjson.Result) bool {
- result = append(result, decoratedGJSONResult{line})
- return true
- })
-
- return result
-}
-
-func (data *customAPITemplateData) Subrequest(key string) *customAPIResponseData {
- req, exists := data.subrequests[key]
- if !exists {
- // We have to panic here since there's nothing sensible we can return and the
- // lack of an error would cause requested data to return zero values which
- // would be confusing from the user's perspective. Go's template module
- // handles recovering from panics and will return the panic message as an
- // error during template execution.
- panic(fmt.Sprintf("subrequest with key %q has not been defined", key))
- }
-
- return req
-}
-
-func fetchCustomAPIRequest(ctx context.Context, req *CustomAPIRequest) (*customAPIResponseData, error) {
- if req.bodyReader != nil {
- req.bodyReader.Seek(0, io.SeekStart)
- }
-
- client := ternary(req.AllowInsecure, defaultInsecureHTTPClient, defaultHTTPClient)
- resp, err := client.Do(req.httpRequest.WithContext(ctx))
- if err != nil {
- return nil, err
+ return emptyBody, err
}
defer resp.Body.Close()
bodyBytes, err := io.ReadAll(resp.Body)
if err != nil {
- return nil, err
+ return emptyBody, err
}
- body := strings.TrimSpace(string(bodyBytes))
+ body := string(bodyBytes)
- if !req.SkipJSONValidation && body != "" && !gjson.Valid(body) {
+ if !gjson.Valid(body) {
truncatedBody, isTruncated := limitStringLength(body, 100)
if isTruncated {
truncatedBody += "...
" } - slog.Error("Invalid response JSON in custom API widget", "url", req.httpRequest.URL.String(), "body", truncatedBody) - return nil, errors.New("invalid response JSON") + slog.Error("Invalid response JSON in custom API widget", "url", req.URL.String(), "body", truncatedBody) + return emptyBody, errors.New("invalid response JSON") } - data := &customAPIResponseData{ + var templateBuffer bytes.Buffer + + data := customAPITemplateData{ JSON: decoratedGJSONResult{gjson.Parse(body)}, Response: resp, } - return data, nil -} - -func fetchAndParseCustomAPI( - primaryReq *CustomAPIRequest, - subReqs map[string]*CustomAPIRequest, - tmpl *template.Template, -) (template.HTML, error) { - var primaryData *customAPIResponseData - subData := make(map[string]*customAPIResponseData, len(subReqs)) - var err error - - if len(subReqs) == 0 { - // If there are no subrequests, we can fetch the primary request in a much simpler way - primaryData, err = fetchCustomAPIRequest(context.Background(), primaryReq) - } else { - // If there are subrequests, we need to fetch them concurrently - // and cancel all requests if any of them fail. There's probably - // a more elegant way to do this, but this works for now. - ctx, cancel := context.WithCancel(context.Background()) - defer cancel() - - var wg sync.WaitGroup - var mu sync.Mutex // protects subData and err - - wg.Add(1) - go func() { - defer wg.Done() - var localErr error - primaryData, localErr = fetchCustomAPIRequest(ctx, primaryReq) - mu.Lock() - if localErr != nil && err == nil { - err = localErr - cancel() - } - mu.Unlock() - }() - - for key, req := range subReqs { - wg.Add(1) - go func() { - defer wg.Done() - var localErr error - var data *customAPIResponseData - data, localErr = fetchCustomAPIRequest(ctx, req) - mu.Lock() - if localErr == nil { - subData[key] = data - } else if err == nil { - err = localErr - cancel() - } - mu.Unlock() - }() - } - - wg.Wait() - } - - emptyBody := template.HTML("") - - if err != nil { - return emptyBody, err - } - - data := customAPITemplateData{ - customAPIResponseData: primaryData, - subrequests: subData, - } - - var templateBuffer bytes.Buffer err = tmpl.Execute(&templateBuffer, &data) if err != nil { return emptyBody, err @@ -300,6 +118,11 @@ type decoratedGJSONResult struct { gjson.Result } +type customAPITemplateData struct { + JSON decoratedGJSONResult + Response *http.Response +} + func gJsonResultArrayToDecoratedResultArray(results []gjson.Result) []decoratedGJSONResult { decoratedResults := make([]decoratedGJSONResult, len(results)) @@ -330,12 +153,12 @@ func (r *decoratedGJSONResult) String(key string) string { return r.Get(key).String() } -func (r *decoratedGJSONResult) Int(key string) int { +func (r *decoratedGJSONResult) Int(key string) int64 { if key == "" { - return int(r.Result.Int()) + return r.Result.Int() } - return int(r.Get(key).Int()) + return r.Get(key).Int() } func (r *decoratedGJSONResult) Float(key string) float64 { @@ -354,206 +177,29 @@ func (r *decoratedGJSONResult) Bool(key string) bool { return r.Get(key).Bool() } -func customAPIDoMathOp[T int | float64](a, b T, op string) T { - switch op { - case "add": - return a + b - case "sub": - return a - b - case "mul": - return a * b - case "div": - if b == 0 { - return 0 - } - return a / b - } - return 0 -} - var customAPITemplateFuncs = func() template.FuncMap { - var regexpCacheMu sync.Mutex - var regexpCache = make(map[string]*regexp.Regexp) - - getCachedRegexp := func(pattern string) *regexp.Regexp { - regexpCacheMu.Lock() - defer regexpCacheMu.Unlock() - - regex, exists := regexpCache[pattern] - if !exists { - regex = regexp.MustCompile(pattern) - regexpCache[pattern] = regex - } - - return regex - } - - doMathOpWithAny := func(a, b any, op string) any { - switch at := a.(type) { - case int: - switch bt := b.(type) { - case int: - return customAPIDoMathOp(at, bt, op) - case float64: - return customAPIDoMathOp(float64(at), bt, op) - default: - return math.NaN() - } - case float64: - switch bt := b.(type) { - case int: - return customAPIDoMathOp(at, float64(bt), op) - case float64: - return customAPIDoMathOp(at, bt, op) - default: - return math.NaN() - } - default: - return math.NaN() - } - } - funcs := template.FuncMap{ - "toFloat": func(a int) float64 { + "toFloat": func(a int64) float64 { return float64(a) }, - "toInt": func(a float64) int { - return int(a) + "toInt": func(a float64) int64 { + return int64(a) }, - "add": func(a, b any) any { - return doMathOpWithAny(a, b, "add") + "add": func(a, b float64) float64 { + return a + b }, - "sub": func(a, b any) any { - return doMathOpWithAny(a, b, "sub") + "sub": func(a, b float64) float64 { + return a - b }, - "mul": func(a, b any) any { - return doMathOpWithAny(a, b, "mul") + "mul": func(a, b float64) float64 { + return a * b }, - "div": func(a, b any) any { - return doMathOpWithAny(a, b, "div") - }, - "now": func() time.Time { - return time.Now() - }, - "offsetNow": func(offset string) time.Time { - d, err := time.ParseDuration(offset) - if err != nil { - return time.Now() - } - return time.Now().Add(d) - }, - "duration": func(str string) time.Duration { - d, err := time.ParseDuration(str) - if err != nil { - return 0 + "div": func(a, b float64) float64 { + if b == 0 { + return math.NaN() } - return d - }, - "parseTime": customAPIFuncParseTime, - "toRelativeTime": dynamicRelativeTimeAttrs, - "parseRelativeTime": func(layout, value string) template.HTMLAttr { - // Shorthand to do both of the above with a single function call - return dynamicRelativeTimeAttrs(customAPIFuncParseTime(layout, value)) - }, - // The reason we flip the parameter order is so that you can chain multiple calls together like this: - // {{ .JSON.String "foo" | trimPrefix "bar" | doSomethingElse }} - // instead of doing this: - // {{ trimPrefix (.JSON.String "foo") "bar" | doSomethingElse }} - // since the piped value gets passed as the last argument to the function. - "trimPrefix": func(prefix, s string) string { - return strings.TrimPrefix(s, prefix) - }, - "trimSuffix": func(suffix, s string) string { - return strings.TrimSuffix(s, suffix) - }, - "trimSpace": strings.TrimSpace, - "replaceAll": func(old, new, s string) string { - return strings.ReplaceAll(s, old, new) - }, - "replaceMatches": func(pattern, replacement, s string) string { - if s == "" { - return "" - } - - return getCachedRegexp(pattern).ReplaceAllString(s, replacement) - }, - "findMatch": func(pattern, s string) string { - if s == "" { - return "" - } - - return getCachedRegexp(pattern).FindString(s) - }, - "findSubmatch": func(pattern, s string) string { - if s == "" { - return "" - } - - regex := getCachedRegexp(pattern) - return itemAtIndexOrDefault(regex.FindStringSubmatch(s), 1, "") - }, - "sortByString": func(key, order string, results []decoratedGJSONResult) []decoratedGJSONResult { - sort.Slice(results, func(a, b int) bool { - if order == "asc" { - return results[a].String(key) < results[b].String(key) - } - - return results[a].String(key) > results[b].String(key) - }) - - return results - }, - "sortByInt": func(key, order string, results []decoratedGJSONResult) []decoratedGJSONResult { - sort.Slice(results, func(a, b int) bool { - if order == "asc" { - return results[a].Int(key) < results[b].Int(key) - } - - return results[a].Int(key) > results[b].Int(key) - }) - - return results - }, - "sortByFloat": func(key, order string, results []decoratedGJSONResult) []decoratedGJSONResult { - sort.Slice(results, func(a, b int) bool { - if order == "asc" { - return results[a].Float(key) < results[b].Float(key) - } - - return results[a].Float(key) > results[b].Float(key) - }) - - return results - }, - "sortByTime": func(key, layout, order string, results []decoratedGJSONResult) []decoratedGJSONResult { - sort.Slice(results, func(a, b int) bool { - timeA := customAPIFuncParseTime(layout, results[a].String(key)) - timeB := customAPIFuncParseTime(layout, results[b].String(key)) - - if order == "asc" { - return timeA.Before(timeB) - } - - return timeA.After(timeB) - }) - - return results - }, - "concat": func(items ...string) string { - return strings.Join(items, "") - }, - "unique": func(key string, results []decoratedGJSONResult) []decoratedGJSONResult { - seen := make(map[string]struct{}) - out := make([]decoratedGJSONResult, 0, len(results)) - for _, result := range results { - val := result.String(key) - if _, ok := seen[val]; !ok { - seen[val] = struct{}{} - out = append(out, result) - } - } - return out + return a / b }, } @@ -565,30 +211,3 @@ var customAPITemplateFuncs = func() template.FuncMap { return funcs }() - -func customAPIFuncParseTime(layout, value string) time.Time { - switch strings.ToLower(layout) { - case "unix": - asInt, err := strconv.ParseInt(value, 10, 64) - if err != nil { - return time.Unix(0, 0) - } - - return time.Unix(asInt, 0) - case "rfc3339": - layout = time.RFC3339 - case "rfc3339nano": - layout = time.RFC3339Nano - case "datetime": - layout = time.DateTime - case "dateonly": - layout = time.DateOnly - } - - parsed, err := time.Parse(layout, value) - if err != nil { - return time.Unix(0, 0) - } - - return parsed -} diff --git a/internal/glance/widget-dns-stats.go b/internal/glance/widget-dns-stats.go index eb42b5a..9c04fbe 100644 --- a/internal/glance/widget-dns-stats.go +++ b/internal/glance/widget-dns-stats.go @@ -42,12 +42,6 @@ type dnsStatsWidget struct { Password string `yaml:"password"` } -const ( - dnsServiceAdguard = "adguard" - dnsServicePihole = "pihole" - dnsServicePiholeV6 = "pihole-v6" -) - func makeDNSWidgetTimeLabels(format string) [8]string { now := time.Now() var labels [dnsStatsBars]string @@ -66,11 +60,11 @@ func (widget *dnsStatsWidget) initialize() error { withCacheDuration(10 * time.Minute) switch widget.Service { - case dnsServiceAdguard: - case dnsServicePiholeV6: - case dnsServicePihole: + case "adguard": + case "pihole-v6": + case "pihole": default: - return fmt.Errorf("service must be one of: %s, %s, %s", dnsServiceAdguard, dnsServicePihole, dnsServicePiholeV6) + return errors.New("service must be one of: adguard, pihole-v6, pihole") } return nil @@ -81,11 +75,11 @@ func (widget *dnsStatsWidget) update(ctx context.Context) { var err error switch widget.Service { - case dnsServiceAdguard: + case "adguard": stats, err = fetchAdguardStats(widget.URL, widget.AllowInsecure, widget.Username, widget.Password, widget.HideGraph) - case dnsServicePihole: + case "pihole": stats, err = fetchPihole5Stats(widget.URL, widget.AllowInsecure, widget.Token, widget.HideGraph) - case dnsServicePiholeV6: + case "pihole6": var newSessionID string stats, newSessionID, err = fetchPiholeStats( widget.URL, @@ -539,6 +533,8 @@ func fetchPiholeStats( DomainsBlocked: statsResponse.Gravity.DomainsBlocked, } + ItsUsedTrustMeBro(seriesResponse, topDomainsResponse) + if includeGraph && seriesErr == nil { if len(seriesResponse.History) != 145 { slog.Error( @@ -644,10 +640,7 @@ func fetchPiholeSessionID(instanceURL string, client *http.Client, password stri } if jsonResponse.Session.SID == "" { - return "", fmt.Errorf( - "authentication response returned empty session ID, status code %d, message '%s'", - response.StatusCode, jsonResponse.Session.Message, - ) + return "", errors.New("authentication response returned empty session ID") } return jsonResponse.Session.SID, nil diff --git a/internal/glance/widget-extension.go b/internal/glance/widget-extension.go index c2b11f5..72a4a09 100644 --- a/internal/glance/widget-extension.go +++ b/internal/glance/widget-extension.go @@ -19,13 +19,12 @@ const extensionWidgetDefaultTitle = "Extension" type extensionWidget struct { widgetBase `yaml:",inline"` - URL string `yaml:"url"` - FallbackContentType string `yaml:"fallback-content-type"` - Parameters queryParametersField `yaml:"parameters"` - Headers map[string]string `yaml:"headers"` - AllowHtml bool `yaml:"allow-potentially-dangerous-html"` - Extension extension `yaml:"-"` - cachedHTML template.HTML `yaml:"-"` + URL string `yaml:"url"` + FallbackContentType string `yaml:"fallback-content-type"` + Parameters map[string]string `yaml:"parameters"` + AllowHtml bool `yaml:"allow-potentially-dangerous-html"` + Extension extension `yaml:"-"` + cachedHTML template.HTML `yaml:"-"` } func (widget *extensionWidget) initialize() error { @@ -47,7 +46,6 @@ func (widget *extensionWidget) update(ctx context.Context) { URL: widget.URL, FallbackContentType: widget.FallbackContentType, Parameters: widget.Parameters, - Headers: widget.Headers, AllowHtml: widget.AllowHtml, }) @@ -59,10 +57,6 @@ func (widget *extensionWidget) update(ctx context.Context) { widget.Title = extension.Title } - if widget.TitleURL == "" && extension.TitleURL != "" { - widget.TitleURL = extension.TitleURL - } - widget.cachedHTML = widget.renderTemplate(widget, extensionWidgetTemplate) } @@ -73,8 +67,8 @@ func (widget *extensionWidget) Render() template.HTML { type extensionType int const ( - extensionContentHTML extensionType = iota - extensionContentUnknown + extensionContentHTML extensionType = iota + extensionContentUnknown = iota ) var extensionStringToType = map[string]extensionType{ @@ -83,22 +77,19 @@ var extensionStringToType = map[string]extensionType{ const ( extensionHeaderTitle = "Widget-Title" - extensionHeaderTitleURL = "Widget-Title-URL" extensionHeaderContentType = "Widget-Content-Type" extensionHeaderContentFrameless = "Widget-Content-Frameless" ) type extensionRequestOptions struct { - URL string `yaml:"url"` - FallbackContentType string `yaml:"fallback-content-type"` - Parameters queryParametersField `yaml:"parameters"` - Headers map[string]string `yaml:"headers"` - AllowHtml bool `yaml:"allow-potentially-dangerous-html"` + URL string `yaml:"url"` + FallbackContentType string `yaml:"fallback-content-type"` + Parameters map[string]string `yaml:"parameters"` + AllowHtml bool `yaml:"allow-potentially-dangerous-html"` } type extension struct { Title string - TitleURL string Content template.HTML Frameless bool } @@ -118,13 +109,14 @@ func convertExtensionContent(options extensionRequestOptions, content []byte, co func fetchExtension(options extensionRequestOptions) (extension, error) { request, _ := http.NewRequest("GET", options.URL, nil) - if len(options.Parameters) > 0 { - request.URL.RawQuery = options.Parameters.toQueryString() + + query := url.Values{} + + for key, value := range options.Parameters { + query.Set(key, value) } - for key, value := range options.Headers { - request.Header.Add(key, value) - } + request.URL.RawQuery = query.Encode() response, err := http.DefaultClient.Do(request) if err != nil { @@ -148,10 +140,6 @@ func fetchExtension(options extensionRequestOptions) (extension, error) { extension.Title = response.Header.Get(extensionHeaderTitle) } - if response.Header.Get(extensionHeaderTitleURL) != "" { - extension.TitleURL = response.Header.Get(extensionHeaderTitleURL) - } - contentType, ok := extensionStringToType[response.Header.Get(extensionHeaderContentType)] if !ok { diff --git a/internal/glance/widget-markets.go b/internal/glance/widget-markets.go index b53b10a..a3bb325 100644 --- a/internal/glance/widget-markets.go +++ b/internal/glance/widget-markets.go @@ -79,7 +79,6 @@ type market struct { Name string Currency string Price float64 - PriceHint int PercentChange float64 SvgChartPoints string } @@ -107,7 +106,6 @@ type marketResponseJson struct { RegularMarketPrice float64 `json:"regularMarketPrice"` ChartPreviousClose float64 `json:"chartPreviousClose"` ShortName string `json:"shortName"` - PriceHint int `json:"priceHint"` } `json:"meta"` Indicators struct { Quote []struct { @@ -154,14 +152,13 @@ func fetchMarketsDataFromYahoo(marketRequests []marketRequest) (marketList, erro continue } - result := &response.Chart.Result[0] - prices := result.Indicators.Quote[0].Close + prices := response.Chart.Result[0].Indicators.Quote[0].Close if len(prices) > marketChartDays { prices = prices[len(prices)-marketChartDays:] } - previous := result.Meta.RegularMarketPrice + previous := response.Chart.Result[0].Meta.RegularMarketPrice if len(prices) >= 2 && prices[len(prices)-2] != 0 { previous = prices[len(prices)-2] @@ -169,22 +166,21 @@ func fetchMarketsDataFromYahoo(marketRequests []marketRequest) (marketList, erro points := svgPolylineCoordsFromYValues(100, 50, maybeCopySliceWithoutZeroValues(prices)) - currency, exists := currencyToSymbol[strings.ToUpper(result.Meta.Currency)] + currency, exists := currencyToSymbol[strings.ToUpper(response.Chart.Result[0].Meta.Currency)] if !exists { - currency = result.Meta.Currency + currency = response.Chart.Result[0].Meta.Currency } markets = append(markets, market{ marketRequest: marketRequests[i], - Price: result.Meta.RegularMarketPrice, + Price: response.Chart.Result[0].Meta.RegularMarketPrice, Currency: currency, - PriceHint: result.Meta.PriceHint, Name: ternary(marketRequests[i].CustomName == "", - result.Meta.ShortName, + response.Chart.Result[0].Meta.ShortName, marketRequests[i].CustomName, ), PercentChange: percentChange( - result.Meta.RegularMarketPrice, + response.Chart.Result[0].Meta.RegularMarketPrice, previous, ), SvgChartPoints: points, diff --git a/internal/glance/widget-rss.go b/internal/glance/widget-rss.go index 1598371..e7d2e8b 100644 --- a/internal/glance/widget-rss.go +++ b/internal/glance/widget-rss.go @@ -331,7 +331,6 @@ func fetchItemsFromRSSFeeds(requests []rssFeedRequest) (rssFeedItemList, error) failed := 0 entries := make(rssFeedItemList, 0, len(feeds)*10) - seen := make(map[string]struct{}) for i := range feeds { if errs[i] != nil { @@ -340,13 +339,7 @@ func fetchItemsFromRSSFeeds(requests []rssFeedRequest) (rssFeedItemList, error) continue } - for _, item := range feeds[i] { - if _, exists := seen[item.Link]; exists { - continue - } - entries = append(entries, item) - seen[item.Link] = struct{}{} - } + entries = append(entries, feeds[i]...) } if failed == len(requests) { diff --git a/internal/glance/widget-twitch-channels.go b/internal/glance/widget-twitch-channels.go index 1290a26..f3ab206 100644 --- a/internal/glance/widget-twitch-channels.go +++ b/internal/glance/widget-twitch-channels.go @@ -196,10 +196,6 @@ func fetchChannelFromTwitchTask(channel string) (twitchChannel, error) { slog.Warn("Failed to parse Twitch stream started at", "error", err, "started_at", streamMetadata.UserOrNull.Stream.StartedAt) } } - } else { - // This prevents live channels with 0 viewers from being - // incorrectly sorted lower than offline channels - result.ViewersCount = -1 } return result, nil diff --git a/internal/glance/widget-utils.go b/internal/glance/widget-utils.go index 9489cbf..8fb76dd 100644 --- a/internal/glance/widget-utils.go +++ b/internal/glance/widget-utils.go @@ -181,11 +181,6 @@ func workerPoolDo[I any, O any](job *workerPoolJob[I, O]) ([]O, []error, error) return results, errs, nil } - if len(job.data) == 1 { - results[0], errs[0] = job.task(job.data[0]) - return results, errs, nil - } - tasksQueue := make(chan *workerPoolTask[I, O]) resultsQueue := make(chan *workerPoolTask[I, O]) diff --git a/internal/glance/widget-videos.go b/internal/glance/widget-videos.go index ff79864..fdc654c 100644 --- a/internal/glance/widget-videos.go +++ b/internal/glance/widget-videos.go @@ -56,7 +56,7 @@ func (widget *videosWidget) initialize() error { widget.Channels = append(widget.Channels, make([]string, len(widget.Playlists))...) for i := range widget.Playlists { - widget.Channels[initialLen+i] = videosWidgetPlaylistPrefix + widget.Playlists[i] + widget.Channels[initialLen+i] = "playlist:" + widget.Playlists[i] } } diff --git a/pkg/sysinfo/sysinfo.go b/pkg/sysinfo/sysinfo.go index 1ed8c75..673b9d2 100644 --- a/pkg/sysinfo/sysinfo.go +++ b/pkg/sysinfo/sysinfo.go @@ -227,50 +227,35 @@ func Collect(req *SystemInfoRequest) (*SystemInfo, []error) { } } - addedMountpoints := map[string]struct{}{} - addMountpointInfo := func(requestedPath string, mpReq MointpointRequest) { - if _, exists := addedMountpoints[requestedPath]; exists { - return - } - - isHidden := req.HideMountpointsByDefault - if mpReq.Hide != nil { - isHidden = *mpReq.Hide - } - if isHidden { - return - } - - usage, err := disk.Usage(requestedPath) - if err == nil { - mpInfo := MountpointInfo{ - Path: requestedPath, - Name: mpReq.Name, - TotalMB: usage.Total / 1024 / 1024, - UsedMB: usage.Used / 1024 / 1024, - UsedPercent: uint8(math.Min(usage.UsedPercent, 100)), + filesystems, err := disk.Partitions(false) + if err == nil { + for _, fs := range filesystems { + mpReq, ok := req.Mountpoints[fs.Mountpoint] + isHidden := req.HideMountpointsByDefault + if ok && mpReq.Hide != nil { + isHidden = *mpReq.Hide + } + if isHidden { + continue } - info.Mountpoints = append(info.Mountpoints, mpInfo) - addedMountpoints[requestedPath] = struct{}{} - } else { - addErr(fmt.Errorf("getting filesystem usage for %s: %v", requestedPath, err)) - } - } + usage, err := disk.Usage(fs.Mountpoint) + if err == nil { + mpInfo := MountpointInfo{ + Path: fs.Mountpoint, + Name: mpReq.Name, + TotalMB: usage.Total / 1024 / 1024, + UsedMB: usage.Used / 1024 / 1024, + UsedPercent: uint8(math.Min(usage.UsedPercent, 100)), + } - if !req.HideMountpointsByDefault { - filesystems, err := disk.Partitions(false) - if err == nil { - for _, fs := range filesystems { - addMountpointInfo(fs.Mountpoint, req.Mountpoints[fs.Mountpoint]) + info.Mountpoints = append(info.Mountpoints, mpInfo) + } else { + addErr(fmt.Errorf("getting filesystem usage for %s: %v", fs.Mountpoint, err)) } - } else { - addErr(fmt.Errorf("getting filesystems: %v", err)) } - } - - for mountpoint, mpReq := range req.Mountpoints { - addMountpointInfo(mountpoint, mpReq) + } else { + addErr(fmt.Errorf("getting filesystems: %v", err)) } sort.Slice(info.Mountpoints, func(a, b int) bool {