diff --git a/docs/configuration.md b/docs/configuration.md index adb73c41..c097f536 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -997,6 +997,7 @@ Preview: | search-engine | string | no | duckduckgo | | new-tab | boolean | no | false | | autofocus | boolean | no | false | +| target | string | no | _blank | | placeholder | string | no | Type here to search… | | bangs | array | no | | @@ -1018,6 +1019,9 @@ When set to `true`, swaps the shortcuts for showing results in the same or new t ##### `autofocus` When set to `true`, automatically focuses the search input on page load. +##### `target` +The target to use when opening the search results in a new tab. Possible values are `_blank`, `_self`, `_parent` and `_top`. + ##### `placeholder` When set, modifies the text displayed in the input field before typing. @@ -2158,9 +2162,15 @@ Preview: #### Properties -| Name | Type | Required | -| ---- | ---- | -------- | -| groups | array | yes | +| Name | Type | Required | Default | +| ---- | ---- | -------- | ------- | +| groups | array | yes | | +| style | string | no | list | + +##### `style` +The display style of the bookmarks. Possible values are: +- `list` - Traditional list view (default) +- `cards` - Grid of cards with icons and descriptions. Cards automatically adjust their height based on content. ##### `groups` An array of groups which can optionally have a title and a custom color. diff --git a/docs/custom-api.md b/docs/custom-api.md index d42d1fc5..3a37df26 100644 --- a/docs/custom-api.md +++ b/docs/custom-api.md @@ -378,6 +378,7 @@ The following helper functions provided by Glance are available: - `offsetNow(offset string) time.Time`: Returns the current time with an offset. The offset can be positive or negative and must be in the format "3h" "-1h" or "2h30m10s". - `duration(str string) time.Duration`: Parses a string such as `1h`, `24h`, `5h30m`, etc into a `time.Duration`. - `parseTime(layout string, s string) time.Time`: Parses a string into time.Time. The layout must be provided in Go's [date format](https://pkg.go.dev/time#pkg-constants). You can alternatively use these values instead of the literal format: "unix", "RFC3339", "RFC3339Nano", "DateTime", "DateOnly". +- `parseLocalTime(layout string, s string) time.Time`: Same as the above, except in the absence of a timezone, it will use the local timezone instead of UTC. - `parseRelativeTime(layout string, s string) time.Time`: A shorthand for `{{ .String "date" | parseTime "rfc3339" | toRelativeTime }}`. - `add(a, b float) float`: Adds two numbers. - `sub(a, b float) float`: Subtracts two numbers. diff --git a/internal/glance/cli.go b/internal/glance/cli.go index 47bb2897..0a76e66c 100644 --- a/internal/glance/cli.go +++ b/internal/glance/cli.go @@ -136,7 +136,7 @@ func cliMountpointInfo(requestedPath string) int { fmt.Println("Path:", usage.Path) fmt.Println("FS type:", ternary(usage.Fstype == "", "unknown", usage.Fstype)) - fmt.Printf("Used percent: %.1f%%", usage.UsedPercent) + fmt.Printf("Used percent: %.1f%%\n", usage.UsedPercent) return 0 } diff --git a/internal/glance/static/js/main.js b/internal/glance/static/js/main.js index 41d2ae3a..dca713bb 100644 --- a/internal/glance/static/js/main.js +++ b/internal/glance/static/js/main.js @@ -104,6 +104,7 @@ function setupSearchBoxes() { for (let i = 0; i < searchWidgets.length; i++) { const widget = searchWidgets[i]; const defaultSearchUrl = widget.dataset.defaultSearchUrl; + const target = widget.dataset.target || "_blank"; const newTab = widget.dataset.newTab === "true"; const inputElement = widget.getElementsByClassName("search-input")[0]; const bangElement = widget.getElementsByClassName("search-bang")[0]; @@ -143,7 +144,7 @@ function setupSearchBoxes() { const url = searchUrlTemplate.replace("!QUERY!", encodeURIComponent(query)); if (newTab && !event.ctrlKey || !newTab && event.ctrlKey) { - window.open(url, '_blank').focus(); + window.open(url, target).focus(); } else { window.location.href = url; } diff --git a/internal/glance/templates/bookmarks.html b/internal/glance/templates/bookmarks.html index 1952cdb2..1167787c 100644 --- a/internal/glance/templates/bookmarks.html +++ b/internal/glance/templates/bookmarks.html @@ -1,6 +1,35 @@ {{ template "widget-base.html" . }} {{ define "widget-content" }} +{{ if eq .Style "cards" }} +
+ {{ range .Groups }} +
+ {{ if ne .Title "" }}
{{ .Title }}
{{ end }} +
+ {{ range .Links }} + + {{ if ne "" .Icon.URL }} +
+ +
+ {{ end }} +

{{ .Title }}

+ {{ if ne .Description "" }} +

{{ .Description }}

+ {{ end }} + {{ if ne .ButtonText "" }} +
+ {{ .ButtonText }} +
+ {{ end }} + + {{ end }} +
+
+ {{ end }} +
+{{ else }}
{{- range .Groups }}
@@ -28,3 +57,4 @@ {{- end }}
{{ end }} +{{ end }} diff --git a/internal/glance/templates/search.html b/internal/glance/templates/search.html index 6e8fc43d..ae981c63 100644 --- a/internal/glance/templates/search.html +++ b/internal/glance/templates/search.html @@ -3,7 +3,7 @@ {{ define "widget-content-classes" }}widget-content-frameless{{ end }} {{ define "widget-content" }} -
+
{{ range .Bangs }} diff --git a/internal/glance/widget-bookmarks.go b/internal/glance/widget-bookmarks.go index 2245e2e1..9daa7481 100644 --- a/internal/glance/widget-bookmarks.go +++ b/internal/glance/widget-bookmarks.go @@ -9,6 +9,7 @@ var bookmarksWidgetTemplate = mustParseTemplate("bookmarks.html", "widget-base.h type bookmarksWidget struct { widgetBase `yaml:",inline"` cachedHTML template.HTML `yaml:"-"` + Style string `yaml:"style"` Groups []struct { Title string `yaml:"title"` Color *hslColorField `yaml:"color"` @@ -30,6 +31,7 @@ type bookmarksWidget struct { HideArrowRaw *bool `yaml:"hide-arrow"` HideArrow bool `yaml:"-"` Target string `yaml:"target"` + ButtonText string `yaml:"button-text"` } `yaml:"links"` } `yaml:"groups"` } diff --git a/internal/glance/widget-custom-api.go b/internal/glance/widget-custom-api.go index dbad2a3b..9a1bce22 100644 --- a/internal/glance/widget-custom-api.go +++ b/internal/glance/widget-custom-api.go @@ -454,11 +454,16 @@ var customAPITemplateFuncs = func() template.FuncMap { return d }, - "parseTime": customAPIFuncParseTime, + "parseTime": func(layout, value string) time.Time { + return customAPIFuncParseTimeInLocation(layout, value, time.UTC) + }, + "parseLocalTime": func(layout, value string) time.Time { + return customAPIFuncParseTimeInLocation(layout, value, time.Local) + }, "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)) + return dynamicRelativeTimeAttrs(customAPIFuncParseTimeInLocation(layout, value, time.UTC)) }, // The reason we flip the parameter order is so that you can chain multiple calls together like this: // {{ .JSON.String "foo" | trimPrefix "bar" | doSomethingElse }} @@ -532,8 +537,8 @@ var customAPITemplateFuncs = func() template.FuncMap { }, "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)) + timeA := customAPIFuncParseTimeInLocation(layout, results[a].String(key), time.UTC) + timeB := customAPIFuncParseTimeInLocation(layout, results[b].String(key), time.UTC) if order == "asc" { return timeA.Before(timeB) @@ -570,7 +575,7 @@ var customAPITemplateFuncs = func() template.FuncMap { return funcs }() -func customAPIFuncParseTime(layout, value string) time.Time { +func customAPIFuncParseTimeInLocation(layout, value string, loc *time.Location) time.Time { switch strings.ToLower(layout) { case "unix": asInt, err := strconv.ParseInt(value, 10, 64) @@ -589,7 +594,7 @@ func customAPIFuncParseTime(layout, value string) time.Time { layout = time.DateOnly } - parsed, err := time.Parse(layout, value) + parsed, err := time.ParseInLocation(layout, value, loc) if err != nil { return time.Unix(0, 0) } diff --git a/internal/glance/widget-reddit.go b/internal/glance/widget-reddit.go index e7109fa8..86832b5d 100644 --- a/internal/glance/widget-reddit.go +++ b/internal/glance/widget-reddit.go @@ -194,7 +194,7 @@ func fetchSubredditPosts( var client requestDoer = defaultHTTPClient if requestUrlTemplate != "" { - requestUrl = strings.ReplaceAll(requestUrlTemplate, "{REQUEST-URL}", requestUrl) + requestUrl = strings.ReplaceAll(requestUrlTemplate, "{REQUEST-URL}", url.QueryEscape(requestUrl)) } else if proxyClient != nil { client = proxyClient } diff --git a/internal/glance/widget-search.go b/internal/glance/widget-search.go index 4b5fbe3a..300361d9 100644 --- a/internal/glance/widget-search.go +++ b/internal/glance/widget-search.go @@ -20,6 +20,7 @@ type searchWidget struct { SearchEngine string `yaml:"search-engine"` Bangs []SearchBang `yaml:"bangs"` NewTab bool `yaml:"new-tab"` + Target string `yaml:"target"` Autofocus bool `yaml:"autofocus"` Placeholder string `yaml:"placeholder"` } diff --git a/internal/glance/widget-utils.go b/internal/glance/widget-utils.go index 2688473d..c6b77451 100644 --- a/internal/glance/widget-utils.go +++ b/internal/glance/widget-utils.go @@ -180,8 +180,8 @@ func workerPoolDo[I any, O any](job *workerPoolJob[I, O]) ([]O, []error, error) } if len(job.data) == 1 { - output, err := job.task(job.data[0]) - return append(results, output), append(errs, err), nil + results[0], errs[0] = job.task(job.data[0]) + return results, errs, nil } tasksQueue := make(chan *workerPoolTask[I, O])