{{ .Page.Title }}
+ +
+
+
+ Loading
+
+
+View
+
+ +```yaml +services: + immich-server: + image: ghcr.io/immich-app/immich-server + labels: + glance.name: Immich + glance.icon: si:immich + glance.url: https://immich.domain.com + glance.description: Image & video management + glance.id: immich + + redis: + image: docker.io/redis:6.2-alpine + labels: + glance.parent: immich + glance.name: Redis + + database: + image: docker.io/tensorchord/pgvecto-rs:pg14-v0.2.0 + labels: + glance.parent: immich + glance.name: DB + + proxy: + image: nginx:stable + labels: + glance.parent: immich + glance.name: Proxy +``` +
+View docker-compose.yml
++ +```yaml +services: + immich-server: + image: ghcr.io/immich-app/immich-server + labels: + glance.name: Immich + glance.icon: si:immich + glance.url: https://immich.domain.com + glance.description: Image & video management + glance.id: immich + + redis: + image: docker.io/redis:6.2-alpine + labels: + glance.parent: immich + glance.name: Redis + + database: + image: docker.io/tensorchord/pgvecto-rs:pg14-v0.2.0 + labels: + glance.parent: immich + glance.name: DB + + proxy: + image: nginx:stable + labels: + glance.parent: immich + glance.name: Proxy +``` +
+ +This will place all child containers under the `Immich` container when hovering over its icon: + + + +If any of the child containers are down, their status will propagate up to the parent container: + + + +#### Properties + +| Name | Type | Required | Default | +| ---- | ---- | -------- | ------- | +| hide-by-default | boolean | no | false | +| sock-path | string | no | /var/run/docker.sock | + +##### `hide-by-default` +Whether to hide the containers by default. If set to `true` you'll have to manually add a `glance.hide: false` label to each container you want to display. By default all containers will be shown and if you want to hide a specific container you can add a `glance.hide: true` label. + +##### `sock-path` +The path to the Docker socket. + +#### Labels +| Name | Description | +| ---- | ----------- | +| glance.name | The name displayed in the UI. If not specified, the name of the container will be used. | +| glance.icon | The icon displayed in the UI. Can be an external URL or an icon prefixed with si:, sh: or di: like with the bookmarks and monitor widgets | +| glance.url | The URL that the user will be redirected to when clicking on the container. | +| glance.same-tab | Whether to open the link in the same or a new tab. Default is `false`. | +| glance.description | A short description displayed in the UI. Default is empty. | +| glance.hide | Whether to hide the container. If set to `true` the container will not be displayed. Defaults to `false`. | +| glance.id | The custom ID of the container. Used to group containers under a single parent. | +| glance.parent | The ID of the parent container. Used to group containers under a single parent. | + +### DNS Stats +Display statistics from a self-hosted ad-blocking DNS resolver such as AdGuard Home or Pi-hole. + +Example: + +```yaml +- type: dns-stats + service: adguard + url: https://adguard.domain.com/ + username: admin + password: ${ADGUARD_PASSWORD} +``` + +Preview: + + + +> [!NOTE] +> +> When using AdGuard Home the 3rd statistic on top will be the average latency and when using Pi-hole it will be the total number of blocked domains from all adlists. + +#### Properties + +| Name | Type | Required | Default | +| ---- | ---- | -------- | ------- | +| service | string | no | pihole | +| allow-insecure | bool | no | false | +| url | string | yes | | +| username | string | when service is `adguard` | | +| password | string | when service is `adguard` or `pihole-v6` | | +| token | string | when service is `pihole` | | +| hide-graph | bool | no | false | +| hide-top-domains | bool | no | false | +| hour-format | string | no | 12h | + +##### `service` +Either `adguard`, or `pihole` (major version 5 and below) or `pihole-v6` (major version 6 and above). + +##### `allow-insecure` +Whether to allow invalid/self-signed certificates when making the request to the service. + +##### `url` +The base URL of the service. + +##### `username` +Only required when using AdGuard Home. The username used to log into the admin dashboard. + +##### `password` +Required when using AdGuard Home, where the password is the one used to log into the admin dashboard. + +Also requried when using Pi-hole major version 6 and above, where the password is the one used to log into the admin dashboard or the application password, which can be found in `Settings -> Web Interface / API -> Configure app password`. + +##### `token` +Only required when using Pi-hole major version 5 or earlier. The API token which can be found in `Settings -> API -> Show API token`. + +##### `hide-graph` +Whether to hide the graph showing the number of queries over time. + +##### `hide-top-domains` +Whether to hide the list of top blocked domains. + +##### `hour-format` +Whether to display the relative time in the graph in `12h` or `24h` format. + +### Server Stats +Display statistics such as CPU usage, memory usage and disk usage of the server Glance is running on or other servers. + +Example: + +```yaml +- type: server-stats + servers: + - type: local + name: Services +``` + +Preview: + + + +> [!NOTE] +> +> This widget is currently under development, some features might not function as expected or may change. + +To display data from a remote server you need to have the Glance Agent running on that server. You can download the agent from [here](https://github.com/glanceapp/agent), though keep in mind that it is still in development and may not work as expected. Support for other providers such as Glances will be added in the future. + +In the event that the CPU temperature goes over 80°C, a flame icon will appear next to the CPU. The progress indicators will also turn red (or the equivalent of your negative color) to hopefully grab your attention if anything is unusually high: + + + +#### Properties +| Name | Type | Required | Default | +| ---- | ---- | -------- | ------- | +| servers | array | no | | + +##### `servers` +If not provided it will display the statistics of the server Glance is running on. + +##### Properties for both `local` and `remote` servers +| Name | Type | Required | Default | +| ---- | ---- | -------- | ------- | +| type | string | yes | | +| name | string | no | | +| hide-swap | boolean | no | false | + +###### `type` +Whether to display statistics for the local server or a remote server. Possible values are `local` and `remote`. + +###### `name` +The name of the server which will be displayed on the widget. If not provided it will default to the server's hostname. + +###### `hide-swap` +Whether to hide the swap usage. + +##### Properties for the `local` server +| Name | Type | Required | Default | +| ---- | ---- | -------- | ------- | +| cpu-temp-sensor | string | no | | +| hide-mountpoints-by-default | boolean | no | false | +| mountpoints | map\[string\]object | no | | + +###### `cpu-temp-sensor` +The name of the sensor to use for the CPU temperature. When not provided the widget will attempt to find the correct one, if it fails to do so the temperature will not be displayed. To view the available sensors you can use `sensors` command. + +###### `hide-mountpoints-by-default` +If set to `true` you'll have to manually make each mountpoint visible by adding a `hide: false` property to it like so: + +```yaml +- type: server-stats + servers: + - type: local + hide-mountpoints-by-default: true + mountpoints: + "/": + hide: false + "/mnt/data": + hide: false +``` + +This is useful if you're running Glance inside of a container which usually mounts a lot of irrelevant filesystems. + +###### `mountpoints` +A map of mountpoints to display disk usage for. The key is the path to the mountpoint and the value is an object with optional properties. Example: + +```yaml +mountpoints: + "/": + name: Root + "/mnt/data": + name: Data + "/boot/efi": + hide: true +``` + +##### Properties for each `mountpoint` +| Name | Type | Required | Default | +| ---- | ---- | -------- | ------- | +| name | string | no | | +| hide | boolean | no | false | + +###### `name` +The name of the mountpoint which will be displayed on the widget. If not provided it will default to the mountpoint's path. + +###### `hide` +Whether to hide this mountpoint from the widget. + +##### Properties for `remote` servers +| Name | Type | Required | Default | +| ---- | ---- | -------- | ------- | +| url | string | yes | | +| token | string | no | | +| timeout | string | no | 3s | + +###### `url` +The URL and port of the server to fetch the statistics from. + +###### `token` +The authentication token to use when fetching the statistics. + +###### `timeout` +The maximum time to wait for a response from the server. The value is a string and must be a number followed by one of s, m, h, d. Example: `10s` for 10 seconds, `1m` for 1 minute, etc + ### Repository Display general information about a repository as well as a list of the latest open pull requests and issues. @@ -1020,6 +2024,7 @@ Example: repository: glanceapp/glance pull-requests-limit: 5 issues-limit: 3 + commits-limit: 3 ``` Preview: @@ -1034,6 +2039,7 @@ Preview: | token | string | no | | | pull-requests-limit | integer | no | 3 | | issues-limit | integer | no | 3 | +| commits-limit | integer | no | -1 | ##### `repository` The owner and repository name that will have their information displayed. @@ -1047,6 +2053,9 @@ The maximum number of latest open pull requests to show. Set to `-1` to not show ##### `issues-limit` The maximum number of latest open issues to show. Set to `-1` to not show any. +##### `commits-limit` +The maximum number of lastest commits to show from the default branch. Set to `-1` to not show any. + ### Bookmarks Display a list of links which can be grouped. @@ -1096,20 +2105,23 @@ Preview: | Name | Type | Required | | ---- | ---- | -------- | | groups | array | yes | -| style | string | no | ##### `groups` An array of groups which can optionally have a title and a custom color. -##### `style` -To make the widget scale appropriately in a `full` size column, set the style to the experimental `dynamic-columns-experimental` option. - ###### Properties for each group | Name | Type | Required | Default | | ---- | ---- | -------- | ------- | | title | string | no | | | color | HSL | no | the primary color of the theme | | links | array | yes | | +| same-tab | boolean | no | false | +| hide-arrow | boolean | no | false | +| target | string | no | | + +> [!TIP] +> +> You can set `same-tab`, `hide-arrow` and `target` either on the group which will apply them to all links in that group, or on each individual link which will override the value set on the group. ###### Properties for each link | Name | Type | Required | Default | @@ -1119,10 +2131,11 @@ To make the widget scale appropriately in a `full` size column, set the style to | icon | string | no | | | same-tab | boolean | no | false | | hide-arrow | boolean | no | false | +| target | string | no | | `icon` -URL pointing to an image. You can also directly use [Simple Icons](https://simpleicons.org/) via a `si:` prefix: +URL pointing to an image. You can also directly use [Simple Icons](https://simpleicons.org/) via a `si:` prefix or [Dashboard Icons](https://github.com/walkxcode/dashboard-icons) via a `di:` prefix: ```yaml icon: si:gmail @@ -1132,7 +2145,7 @@ icon: si:reddit > [!WARNING] > -> Simple Icons are loaded externally and are hosted on `cdnjs.cloudflare.com`, if you do not wish to depend on a 3rd party you are free to download the icons individually and host them locally. +> Simple Icons are loaded externally and are hosted on `cdn.jsdelivr.net`, if you do not wish to depend on a 3rd party you are free to download the icons individually and host them locally. `same-tab` @@ -1142,6 +2155,10 @@ Whether to open the link in the same tab or a new one. Whether to hide the colored arrow on each link. +`target` + +Set a custom value for the link's `target` attribute. Possible values are `_blank`, `_self`, `_parent` and `_top`, you can read more about what they do [here](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/a#target). This property has precedence over `same-tab`. + ### ChangeDetection.io Display a list watches from changedetection.io. @@ -1241,15 +2258,52 @@ Example: ```yaml - type: calendar + first-day-of-week: monday ``` Preview:  +#### Properties + +| Name | Type | Required | Default | +| ---- | ---- | -------- | ------- | +| first-day-of-week | string | no | monday | + +##### `first-day-of-week` +The day of the week that the calendar starts on. All week days are available as possible values. + +### Calendar (legacy) +Display a calendar. + +Example: + +```yaml +- type: calendar-legacy + start-sunday: false +``` + +Preview: + + + > [!NOTE] > -> There is currently no customizability available for the calendar. Extra features will be added in the future. +> This widget is deprecated and may be removed in a future version. + +#### Properties + +| Name | Type | Required | Default | +| ---- | ---- | -------- | ------- | +| start-sunday | boolean | no | false | + +##### `start-sunday` +Whether calendar weeks start on Sunday or Monday. + +> [!NOTE] +> +> There is currently little customizability available for the calendar. Extra features will be added in the future. ### Markets Display a list of markets, their current value, change for the day and a small 21d chart. Data is taken from Yahoo Finance. @@ -1281,18 +2335,30 @@ Preview: | ---- | ---- | -------- | | markets | array | yes | | sort-by | string | no | -| style | string | no | +| chart-link-template | string | no | +| symbol-link-template | string | no | ##### `markets` An array of markets for which to display information about. ##### `sort-by` -By default the markets are displayed in the order they were defined. You can customize their ordering by setting the `sort-by` property to `absolute-change` for descending order based on the stock's absolute price change. +By default the markets are displayed in the order they were defined. You can customize their ordering by setting the `sort-by` property to `change` for descending order based on the stock's percentage change (e.g. 1% would be sorted higher than -1%) or `absolute-change` for descending order based on the stock's absolute price change (e.g. -1% would be sorted higher than +0.5%). -##### `style` -To make the widget scale appropriately in a `full` size column, set the style to the experimental `dynamic-columns-experimental` option. +##### `chart-link-template` +A template for the link to go to when clicking on the chart that will be applied to all markets. The value `{SYMBOL}` will be replaced with the symbol of the market. You can override this on a per-market basis by specifying a `chart-link` property. Example: -###### Properties for each stock +```yaml +chart-link-template: https://www.tradingview.com/chart/?symbol={SYMBOL} +``` + +##### `symbol-link-template` +A template for the link to go to when clicking on the symbol that will be applied to all markets. The value `{SYMBOL}` will be replaced with the symbol of the market. You can override this on a per-market basis by specifying a `symbol-link` property. Example: + +```yaml +symbol-link-template: https://www.google.com/search?tbm=nws&q={SYMBOL} +``` + +###### Properties for each market | Name | Type | Required | | ---- | ---- | -------- | | symbol | string | yes | @@ -1309,9 +2375,11 @@ The symbol, as seen in Yahoo Finance. The name that will be displayed under the symbol. `symbol-link` + The link to go to when clicking on the symbol. `chart-link` + The link to go to when clicking on the chart. ### Twitch Channels diff --git a/docs/custom-api.md b/docs/custom-api.md new file mode 100644 index 0000000..d42d1fc --- /dev/null +++ b/docs/custom-api.md @@ -0,0 +1,415 @@ +[Jump to function definitions](#functions) + +## Examples + +The best way to get an idea of how the templates work would be with a bunch examples. Here are the most common use cases: + +JSON response: + +```json +{ + "title": "My Title", + "content": "My Content", +} +``` + +To access the two fields in the JSON response, you would use the following: + +```html +
{{ .JSON.String "title" }}
+{{ .JSON.String "content" }}
+```
+
+Output:
+
+```html
+My Title
+My Content
+```
+
++ +JSON response: + +```json +{ + "author": "John Doe", + "posts": [ + { + "title": "My Title", + "content": "My Content" + }, + { + "title": "My Title 2", + "content": "My Content 2" + } + ] +} +``` + +To loop through the array of posts, you would use the following: + +```html +{{ range .JSON.Array "posts" }} +
{{ .String "title" }}
+ {{ .String "content" }}
+{{ end }}
+```
+
+Output:
+
+```html
+My Title
+My Content
+My Title 2
+My Content 2
+```
+
+Notice the missing `.JSON` when accessing the title and content, this is because the range function sets the context to the current array element.
+
+If you want to access the top-level context within the range, you can use the following:
+
+```html
+{{ range .JSON.Array "posts" }}
+ {{ .String "title" }}
+ {{ .String "content" }}
+ {{ $.JSON.String "author" }}
+{{ end }}
+```
+
+Output:
+
+```html
+My Title
+My Content
+John Doe
+My Title 2
+My Content 2
+John Doe
+```
+
++ +JSON response: + +```json +[ + "Apple", + "Banana", + "Cherry", + "Watermelon" +] +``` + +Somewhat awkwardly, when the current context is a basic type that isn't an object, the way you specify its type is to use an empty string as the key. So, to loop through the array of strings, you would use the following: + +```html +{{ range .JSON.Array "" }} +
{{ .String "" }}
+{{ end }}
+```
+
+Output:
+
+```html
+Apple
+Banana
+Cherry
+Watermelon
+```
+
+To access an item at a specific index, you could use the following:
+
+```html
+{{ .JSON.String "0" }}
+```
+
+Output:
+
+```html
+Apple
+```
+
++ +JSON response: + +```json +{ + "user": { + "address": { + "city": "New York", + "state": "NY" + } + } +} +``` + +To easily access deeply nested objects, you can use the following dot notation: + +```html +
{{ .JSON.String "user.address.city" }}
+{{ .JSON.String "user.address.state" }}
+```
+
+Output:
+
+```html
+New York
+NY
+```
+
+Using indexes anywhere in the path is also supported:
+
+```json
+{
+ "users": [
+ {
+ "name": "John Doe"
+ },
+ {
+ "name": "Jane Doe"
+ }
+ ]
+}
+```
+
+```html
+{{ .JSON.String "users.0.name" }}
+{{ .JSON.String "users.1.name" }}
+```
+
+Output:
+
+```html
+John Doe
+Jane Doe
+```
+
++ +JSON response: + +```json +{ + "user": { + "name": "John Doe", + "age": 30 + } +} +``` + +To check if a field exists, you can use the following: + +```html +{{ if .JSON.Exists "user.age" }} +
{{ .JSON.Int "user.age" }}
+{{ else }}
+ Age not provided
+{{ end }}
+```
+
+Output:
+
+```html
+30
+```
+
++ +JSON response: + +```json +{ + "price": 100, + "discount": 10 +} +``` + +Calculations can be performed on either ints or floats. If both numbers are ints, an int will be returned, otherwise a float will be returned. If you try to divide by zero, 0 will be returned. If you provide non-numeric values, `NaN` will be returned. + +```html +
{{ sub (.JSON.Int "price") (.JSON.Int "discount") }}
+```
+
+Output:
+
+```html
+90
+```
+
+Other operations include `add`, `mul`, and `div`.
+
++ +JSON response: + +```json +{ + "posts": [ + { + "title": "Exploring the Depths of Quantum Computing", + "date": "2023-10-27T10:00:00Z" + }, + { + "title": "A Beginner's Guide to Sustainable Living", + "date": "2023-11-15T14:30:00+01:00" + }, + { + "title": "The Art of Baking Sourdough Bread", + "date": "2023-12-03T08:45:22-08:00" + } + ] +} +``` + +To parse the date and display the relative time (e.g. 2h, 1d, etc), you would use the following: + +``` +{{ range .JSON.Array "posts" }} +
{{ .String "title" }}
+
+{{ end }}
+```
+
+The `parseTime` function takes two arguments: the layout of the date string and the date string itself. The layout can be one of the following: "RFC3339", "RFC3339Nano", "DateTime", "DateOnly", "TimeOnly" or a custom layout in Go's [date format](https://pkg.go.dev/time#pkg-constants).
+
+Output:
+
+```html
+Exploring the Depths of Quantum Computing
+
+
+A Beginner's Guide to Sustainable Living
+
+
+The Art of Baking Sourdough Bread
+
+```
+
+You don't have to worry about the internal implementation, this will then be dynamically populated by Glance on the client side to show the correct relative time.
+
+The important thing to notice here is that the return value of `toRelativeTime` must be used as an attribute in an HTML tag, be it a `div`, `li`, `span`, etc.
+
++ +In some instances, you may want to know the status code of the response. This can be done using the following: + +```html +{{ if eq .Response.StatusCode 200 }} +
Success!
+{{ else }} +Failed to fetch data
+{{ end }} +``` + +You can also access the response headers: + +```html +{{ .Response.Header.Get "Content-Type" }}
+```
+
++ +JSON response: + +```json +{"name": "Steve", "age": 30} +{"name": "Alex", "age": 25} +{"name": "John", "age": 35} +``` + +The above format is "[ndjson](https://docs.mulesoft.com/dataweave/latest/dataweave-formats-ndjson)" or "[JSON Lines](https://jsonlines.org/)", where each line is a separate JSON object. To parse this format, you must first disable the JSON validation check in your config, since by default the response is expected to be a single valid JSON object: + +```yaml +- type: custom-api + skip-json-validation: true +``` + +Then, to iterate over each object you can use `.JSONLines`: + +```html +{{ range .JSONLines }} +
{{ .String "name" }} is {{ .Int "age" }} years old
+{{ end }} +``` + +Output: + +```html +Steve is 30 years old
+Alex is 25 years old
+John is 35 years old
+``` + +For other ways of selecting data from a JSON Lines response, have a look at the docs for [tidwall/gjson](https://github.com/tidwall/gjson/tree/master?tab=readme-ov-file#json-lines). For example, to get an array of all names, you can use the following: + +```html +{{ range .JSON.Array "..#.name" }} +{{ .String "" }}
+{{ end }} +``` + +Output: + +```html +Steve
+Alex
+John
+``` + +## Functions + +The following functions are available on the `JSON` object: + +- `String(key string) string`: Returns the value of the key as a string. +- `Int(key string) int`: Returns the value of the key as an integer. +- `Float(key string) float`: Returns the value of the key as a float. +- `Bool(key string) bool`: Returns the value of the key as a boolean. +- `Array(key string) []JSON`: Returns the value of the key as an array of `JSON` objects. +- `Exists(key string) bool`: Returns true if the key exists in the JSON object. + +The following helper functions provided by Glance are available: + +- `toFloat(i int) float`: Converts an integer to a float. +- `toInt(f float) int`: Converts a float to an integer. +- `toRelativeTime(t time.Time) template.HTMLAttr`: Converts Time to a relative time such as 2h, 1d, etc which dynamically updates. **NOTE:** the value of this function should be used as an attribute in an HTML tag, e.g. ``. +- `now() time.Time`: Returns the current time. +- `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". +- `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. +- `mul(a, b float) float`: Multiplies two numbers. +- `div(a, b float) float`: Divides two numbers. +- `formatApproxNumber(n int) string`: Formats a number to be more human-readable, e.g. 1000 -> 1k. +- `formatNumber(n float|int) string`: Formats a number with commas, e.g. 1000 -> 1,000. +- `trimPrefix(prefix string, str string) string`: Trims the prefix from a string. +- `trimSuffix(suffix string, str string) string`: Trims the suffix from a string. +- `trimSpace(str string) string`: Trims whitespace from a string on both ends. +- `replaceAll(old string, new string, str string) string`: Replaces all occurrences of a string in a string. +- `replaceMatches(pattern string, replacement string, str string) string`: Replaces all occurrences of a regular expression in a string. +- `findMatch(pattern string, str string) string`: Finds the first match of a regular expression in a string. +- `findSubmatch(pattern string, str string) string`: Finds the first submatch of a regular expression in a string. +- `sortByString(key string, order string, arr []JSON): []JSON`: Sorts an array of JSON objects by a string key in either ascending or descending order. +- `sortByInt(key string, order string, arr []JSON): []JSON`: Sorts an array of JSON objects by an integer key in either ascending or descending order. +- `sortByFloat(key string, order string, arr []JSON): []JSON`: Sorts an array of JSON objects by a float key in either ascending or descending order. +- `sortByTime(key string, layout string, order string, arr []JSON): []JSON`: Sorts an array of JSON objects by a time key in either ascending or descending order. The format must be provided in Go's [date format](https://pkg.go.dev/time#pkg-constants). +- `concat(strings ...string) string`: Concatenates multiple strings together. +- `unique(key string, arr []JSON) []JSON`: Returns a unique array of JSON objects based on the given key. + +The following helper functions provided by Go's `text/template` are available: + +- `eq(a, b any) bool`: Compares two values for equality. +- `ne(a, b any) bool`: Compares two values for inequality. +- `lt(a, b any) bool`: Compares two values for less than. +- `lte(a, b any) bool`: Compares two values for less than or equal to. +- `gt(a, b any) bool`: Compares two values for greater than. +- `gte(a, b any) bool`: Compares two values for greater than or equal to. +- `and(a, b bool) bool`: Returns true if both values are true. +- `or(a, b bool) bool`: Returns true if either value is true. +- `not(a bool) bool`: Returns the opposite of the value. +- `index(a any, b int) any`: Returns the value at the specified index of an array. +- `len(a any) int`: Returns the length of an array. +- `printf(format string, a ...any) string`: Returns a formatted string. diff --git a/docs/extensions.md b/docs/extensions.md index 06db1ae..b6719c1 100644 --- a/docs/extensions.md +++ b/docs/extensions.md @@ -26,9 +26,15 @@ If you know how to setup an HTTP server and a bit of HTML and CSS you're ready t ### `Widget-Title` Used to specify the title of the widget. If not provided, the widget's title will be "Extension". +### `Widget-Title-URL` +Used to specify the URL that will be opened when the widget's title is clicked. If the user has specified a `title-url` in their config, it will take precedence over this header. + ### `Widget-Content-Type` Used to specify the content type that will be returned by the extension. If not provided, the content will be shown as plain text. +### `Widget-Content-Frameless` +When set to `true`, the widget's content will be displayed without the default background or "frame". + ## Content Types > [!NOTE] diff --git a/docs/glance.yml b/docs/glance.yml new file mode 100644 index 0000000..35dc7cb --- /dev/null +++ b/docs/glance.yml @@ -0,0 +1,105 @@ +pages: + - name: Home + # Optionally, if you only have a single page you can hide the desktop navigation for a cleaner look + # hide-desktop-navigation: true + columns: + - size: small + widgets: + - type: calendar + first-day-of-week: monday + + - type: rss + limit: 10 + collapse-after: 3 + cache: 12h + feeds: + - url: https://selfh.st/rss/ + title: selfh.st + limit: 4 + - url: https://ciechanow.ski/atom.xml + - url: https://www.joshwcomeau.com/rss.xml + title: Josh Comeau + - url: https://samwho.dev/rss.xml + - url: https://ishadeed.com/feed.xml + title: Ahmad Shadeed + + - type: twitch-channels + channels: + - theprimeagen + - j_blow + - piratesoftware + - cohhcarnage + - christitustech + - EJ_SA + + - size: full + widgets: + - type: group + widgets: + - type: hacker-news + - type: lobsters + + - type: videos + channels: + - UCXuqSBlHAE6Xw-yeJA0Tunw # Linus Tech Tips + - UCR-DXc1voovS8nhAvccRZhg # Jeff Geerling + - UCsBjURrPoezykLs9EqgamOA # Fireship + - UCBJycsmduvYEL83R_U4JriQ # Marques Brownlee + - UCHnyfMqiRRG1u-2MsSQLbXA # Veritasium + + - type: group + widgets: + - type: reddit + subreddit: technology + show-thumbnails: true + - type: reddit + subreddit: selfhosted + show-thumbnails: true + + - size: small + widgets: + - type: weather + location: London, United Kingdom + units: metric # alternatively "imperial" + hour-format: 12h # alternatively "24h" + # Optionally hide the location from being displayed in the widget + # hide-location: true + + - type: markets + markets: + - symbol: SPY + name: S&P 500 + - symbol: BTC-USD + name: Bitcoin + - symbol: NVDA + name: NVIDIA + - symbol: AAPL + name: Apple + - symbol: MSFT + name: Microsoft + + - type: releases + cache: 1d + # Without authentication the Github API allows for up to 60 requests per hour. You can create a + # read-only token from your Github account settings and use it here to increase the limit. + # token: ... + repositories: + - glanceapp/glance + - go-gitea/gitea + - immich-app/immich + - syncthing/syncthing + + # Add more pages here: + # - name: Your page name + # columns: + # - size: small + # widgets: + # # Add widgets here + + # - size: full + # widgets: + # # Add widgets here + + # - size: small + # widgets: + # # Add widgets here diff --git a/docs/images/calendar-legacy-widget-preview.png b/docs/images/calendar-legacy-widget-preview.png new file mode 100644 index 0000000..5a161bf Binary files /dev/null and b/docs/images/calendar-legacy-widget-preview.png differ diff --git a/docs/images/calendar-widget-preview.png b/docs/images/calendar-widget-preview.png index 5a161bf..4922a9b 100644 Binary files a/docs/images/calendar-widget-preview.png and b/docs/images/calendar-widget-preview.png differ diff --git a/docs/images/custom-api-preview-1.png b/docs/images/custom-api-preview-1.png new file mode 100644 index 0000000..4cf4c30 Binary files /dev/null and b/docs/images/custom-api-preview-1.png differ diff --git a/docs/images/custom-api-preview-2.png b/docs/images/custom-api-preview-2.png new file mode 100644 index 0000000..481ef85 Binary files /dev/null and b/docs/images/custom-api-preview-2.png differ diff --git a/docs/images/custom-api-preview-3.png b/docs/images/custom-api-preview-3.png new file mode 100644 index 0000000..15d8cb2 Binary files /dev/null and b/docs/images/custom-api-preview-3.png differ diff --git a/docs/images/dns-stats-widget-preview.png b/docs/images/dns-stats-widget-preview.png new file mode 100644 index 0000000..defd139 Binary files /dev/null and b/docs/images/dns-stats-widget-preview.png differ diff --git a/docs/images/docker-container-parent.png b/docs/images/docker-container-parent.png new file mode 100644 index 0000000..479b3e8 Binary files /dev/null and b/docs/images/docker-container-parent.png differ diff --git a/docs/images/docker-container-parent2.png b/docs/images/docker-container-parent2.png new file mode 100644 index 0000000..4562239 Binary files /dev/null and b/docs/images/docker-container-parent2.png differ diff --git a/docs/images/docker-containers-preview.png b/docs/images/docker-containers-preview.png new file mode 100644 index 0000000..ba14fce Binary files /dev/null and b/docs/images/docker-containers-preview.png differ diff --git a/docs/images/docker-widget-preview.png b/docs/images/docker-widget-preview.png new file mode 100644 index 0000000..5b644d4 Binary files /dev/null and b/docs/images/docker-widget-preview.png differ diff --git a/docs/images/gaming-page-preview.png b/docs/images/gaming-page-preview.png new file mode 100644 index 0000000..343d22f Binary files /dev/null and b/docs/images/gaming-page-preview.png differ diff --git a/docs/images/group-widget-preview.png b/docs/images/group-widget-preview.png new file mode 100644 index 0000000..4d1d86b Binary files /dev/null and b/docs/images/group-widget-preview.png differ diff --git a/docs/images/markets-page-preview.png b/docs/images/markets-page-preview.png new file mode 100644 index 0000000..51e9f99 Binary files /dev/null and b/docs/images/markets-page-preview.png differ diff --git a/docs/images/mobile-preview.png b/docs/images/mobile-preview.png index 38acdcf..c27a1d2 100644 Binary files a/docs/images/mobile-preview.png and b/docs/images/mobile-preview.png differ diff --git a/docs/images/monitor-widget-compact-preview.png b/docs/images/monitor-widget-compact-preview.png new file mode 100644 index 0000000..3e81fce Binary files /dev/null and b/docs/images/monitor-widget-compact-preview.png differ diff --git a/docs/images/preconfigured-page-preview.png b/docs/images/preconfigured-page-preview.png index 0a57c14..e10084c 100644 Binary files a/docs/images/preconfigured-page-preview.png and b/docs/images/preconfigured-page-preview.png differ diff --git a/docs/images/readme-main-image.png b/docs/images/readme-main-image.png index 821c35b..cce27fb 100644 Binary files a/docs/images/readme-main-image.png and b/docs/images/readme-main-image.png differ diff --git a/docs/images/reddit-field-search.png b/docs/images/reddit-field-search.png index 97ba04a..a84ee33 100644 Binary files a/docs/images/reddit-field-search.png and b/docs/images/reddit-field-search.png differ diff --git a/docs/images/releases-widget-preview.png b/docs/images/releases-widget-preview.png index 47acfd0..ec712bb 100644 Binary files a/docs/images/releases-widget-preview.png and b/docs/images/releases-widget-preview.png differ diff --git a/docs/images/server-stats-flame-icon.png b/docs/images/server-stats-flame-icon.png new file mode 100644 index 0000000..28cf0b8 Binary files /dev/null and b/docs/images/server-stats-flame-icon.png differ diff --git a/docs/images/server-stats-preview.gif b/docs/images/server-stats-preview.gif new file mode 100644 index 0000000..829679b Binary files /dev/null and b/docs/images/server-stats-preview.gif differ diff --git a/docs/images/split-column-widget-3-columns.png b/docs/images/split-column-widget-3-columns.png new file mode 100644 index 0000000..88192c3 Binary files /dev/null and b/docs/images/split-column-widget-3-columns.png differ diff --git a/docs/images/split-column-widget-4-columns.png b/docs/images/split-column-widget-4-columns.png new file mode 100644 index 0000000..450f53e Binary files /dev/null and b/docs/images/split-column-widget-4-columns.png differ diff --git a/docs/images/split-column-widget-masonry.png b/docs/images/split-column-widget-masonry.png new file mode 100644 index 0000000..145b2d6 Binary files /dev/null and b/docs/images/split-column-widget-masonry.png differ diff --git a/docs/images/split-column-widget-preview.png b/docs/images/split-column-widget-preview.png new file mode 100644 index 0000000..1ee336d Binary files /dev/null and b/docs/images/split-column-widget-preview.png differ diff --git a/docs/images/startpage-preview.png b/docs/images/startpage-preview.png new file mode 100644 index 0000000..2af87ed Binary files /dev/null and b/docs/images/startpage-preview.png differ diff --git a/docs/images/themes/dracula.png b/docs/images/themes/dracula.png new file mode 100644 index 0000000..8dba452 Binary files /dev/null and b/docs/images/themes/dracula.png differ diff --git a/docs/images/themes/gruvbox.png b/docs/images/themes/gruvbox.png new file mode 100644 index 0000000..2e5b7a9 Binary files /dev/null and b/docs/images/themes/gruvbox.png differ diff --git a/docs/images/videos-widget-vertical-list-preview.png b/docs/images/videos-widget-vertical-list-preview.png new file mode 100644 index 0000000..e33ce86 Binary files /dev/null and b/docs/images/videos-widget-vertical-list-preview.png differ diff --git a/docs/preconfigured-pages.md b/docs/preconfigured-pages.md new file mode 100644 index 0000000..b70610b --- /dev/null +++ b/docs/preconfigured-pages.md @@ -0,0 +1,226 @@ +# Preconfigured pages + +Don't want to spend time configuring pages from scratch? No problem! Simply copy the config from the ones below. + +Pull requests with your page configurations are welcome! + +> [!NOTE] +> +> Pages must be placed under a top level `pages:` key, you can read more about that [here](configuration.md#pages). + +## Startpage + + + +
+View config (requires Glance
+
+```yaml
+- name: Startpage
+ width: slim
+ hide-desktop-navigation: true
+ center-vertically: true
+ columns:
+ - size: full
+ widgets:
+ - type: search
+ autofocus: true
+
+ - type: monitor
+ cache: 1m
+ title: Services
+ sites:
+ - title: Jellyfin
+ url: https://yourdomain.com/
+ icon: si:jellyfin
+ - title: Gitea
+ url: https://yourdomain.com/
+ icon: si:gitea
+ - title: qBittorrent # only for Linux ISOs, of course
+ url: https://yourdomain.com/
+ icon: si:qbittorrent
+ - title: Immich
+ url: https://yourdomain.com/
+ icon: si:immich
+ - title: AdGuard Home
+ url: https://yourdomain.com/
+ icon: si:adguard
+ - title: Vaultwarden
+ url: https://yourdomain.com/
+ icon: si:vaultwarden
+
+ - type: bookmarks
+ groups:
+ - title: General
+ links:
+ - title: Gmail
+ url: https://mail.google.com/mail/u/0/
+ - title: Amazon
+ url: https://www.amazon.com/
+ - title: Github
+ url: https://github.com/
+ - title: Entertainment
+ links:
+ - title: YouTube
+ url: https://www.youtube.com/
+ - title: Prime Video
+ url: https://www.primevideo.com/
+ - title: Disney+
+ url: https://www.disneyplus.com/
+ - title: Social
+ links:
+ - title: Reddit
+ url: https://www.reddit.com/
+ - title: Twitter
+ url: https://twitter.com/
+ - title: Instagram
+ url: https://www.instagram.com/
+```
+
+
+## Markets
+
+
+
+View config (requires Glance v0.6.0 or higher)
+
+```yaml
+- name: Startpage
+ width: slim
+ hide-desktop-navigation: true
+ center-vertically: true
+ columns:
+ - size: full
+ widgets:
+ - type: search
+ autofocus: true
+
+ - type: monitor
+ cache: 1m
+ title: Services
+ sites:
+ - title: Jellyfin
+ url: https://yourdomain.com/
+ icon: si:jellyfin
+ - title: Gitea
+ url: https://yourdomain.com/
+ icon: si:gitea
+ - title: qBittorrent # only for Linux ISOs, of course
+ url: https://yourdomain.com/
+ icon: si:qbittorrent
+ - title: Immich
+ url: https://yourdomain.com/
+ icon: si:immich
+ - title: AdGuard Home
+ url: https://yourdomain.com/
+ icon: si:adguard
+ - title: Vaultwarden
+ url: https://yourdomain.com/
+ icon: si:vaultwarden
+
+ - type: bookmarks
+ groups:
+ - title: General
+ links:
+ - title: Gmail
+ url: https://mail.google.com/mail/u/0/
+ - title: Amazon
+ url: https://www.amazon.com/
+ - title: Github
+ url: https://github.com/
+ - title: Entertainment
+ links:
+ - title: YouTube
+ url: https://www.youtube.com/
+ - title: Prime Video
+ url: https://www.primevideo.com/
+ - title: Disney+
+ url: https://www.disneyplus.com/
+ - title: Social
+ links:
+ - title: Reddit
+ url: https://www.reddit.com/
+ - title: Twitter
+ url: https://twitter.com/
+ - title: Instagram
+ url: https://www.instagram.com/
+```
+
+View config (requires Glance
+
+```yaml
+ - name: Markets
+ columns:
+ - size: small
+ widgets:
+ - type: markets
+ title: Indices
+ markets:
+ - symbol: SPY
+ name: S&P 500
+ - symbol: DX-Y.NYB
+ name: Dollar Index
+
+ - type: markets
+ title: Crypto
+ markets:
+ - symbol: BTC-USD
+ name: Bitcoin
+ - symbol: ETH-USD
+ name: Ethereum
+
+ - type: markets
+ title: Stocks
+ sort-by: absolute-change
+ markets:
+ - symbol: NVDA
+ name: NVIDIA
+ - symbol: AAPL
+ name: Apple
+ - symbol: MSFT
+ name: Microsoft
+ - symbol: GOOGL
+ name: Google
+ - symbol: AMD
+ name: AMD
+ - symbol: RDDT
+ name: Reddit
+ - symbol: AMZN
+ name: Amazon
+ - symbol: TSLA
+ name: Tesla
+ - symbol: INTC
+ name: Intel
+ - symbol: META
+ name: Meta
+
+ - size: full
+ widgets:
+ - type: rss
+ title: News
+ style: horizontal-cards
+ feeds:
+ - url: https://feeds.bloomberg.com/markets/news.rss
+ title: Bloomberg
+ - url: https://moxie.foxbusiness.com/google-publisher/markets.xml
+ title: Fox Business
+ - url: https://moxie.foxbusiness.com/google-publisher/technology.xml
+ title: Fox Business
+
+ - type: group
+ widgets:
+ - type: reddit
+ show-thumbnails: true
+ subreddit: technology
+ - type: reddit
+ show-thumbnails: true
+ subreddit: wallstreetbets
+
+ - type: videos
+ style: grid-cards
+ collapse-after-rows: 3
+ channels:
+ - UCvSXMi2LebwJEM1s4bz5IBA # New Money
+ - UCV6KDgJskWaEckne5aPA0aQ # Graham Stephan
+ - UCAzhpt9DmG6PnHXjmJTvRGQ # Federal Reserve
+
+ - size: small
+ widgets:
+ - type: rss
+ title: News
+ limit: 30
+ collapse-after: 13
+ feeds:
+ - url: https://www.ft.com/technology?format=rss
+ title: Financial Times
+ - url: https://feeds.a.dj.com/rss/RSSMarketsMain.xml
+ title: Wall Street Journal
+```
+
+
+## Gaming
+
+
+
+View config (requires Glance v0.6.0 or higher)
+
+```yaml
+ - name: Markets
+ columns:
+ - size: small
+ widgets:
+ - type: markets
+ title: Indices
+ markets:
+ - symbol: SPY
+ name: S&P 500
+ - symbol: DX-Y.NYB
+ name: Dollar Index
+
+ - type: markets
+ title: Crypto
+ markets:
+ - symbol: BTC-USD
+ name: Bitcoin
+ - symbol: ETH-USD
+ name: Ethereum
+
+ - type: markets
+ title: Stocks
+ sort-by: absolute-change
+ markets:
+ - symbol: NVDA
+ name: NVIDIA
+ - symbol: AAPL
+ name: Apple
+ - symbol: MSFT
+ name: Microsoft
+ - symbol: GOOGL
+ name: Google
+ - symbol: AMD
+ name: AMD
+ - symbol: RDDT
+ name: Reddit
+ - symbol: AMZN
+ name: Amazon
+ - symbol: TSLA
+ name: Tesla
+ - symbol: INTC
+ name: Intel
+ - symbol: META
+ name: Meta
+
+ - size: full
+ widgets:
+ - type: rss
+ title: News
+ style: horizontal-cards
+ feeds:
+ - url: https://feeds.bloomberg.com/markets/news.rss
+ title: Bloomberg
+ - url: https://moxie.foxbusiness.com/google-publisher/markets.xml
+ title: Fox Business
+ - url: https://moxie.foxbusiness.com/google-publisher/technology.xml
+ title: Fox Business
+
+ - type: group
+ widgets:
+ - type: reddit
+ show-thumbnails: true
+ subreddit: technology
+ - type: reddit
+ show-thumbnails: true
+ subreddit: wallstreetbets
+
+ - type: videos
+ style: grid-cards
+ collapse-after-rows: 3
+ channels:
+ - UCvSXMi2LebwJEM1s4bz5IBA # New Money
+ - UCV6KDgJskWaEckne5aPA0aQ # Graham Stephan
+ - UCAzhpt9DmG6PnHXjmJTvRGQ # Federal Reserve
+
+ - size: small
+ widgets:
+ - type: rss
+ title: News
+ limit: 30
+ collapse-after: 13
+ feeds:
+ - url: https://www.ft.com/technology?format=rss
+ title: Financial Times
+ - url: https://feeds.a.dj.com/rss/RSSMarketsMain.xml
+ title: Wall Street Journal
+```
+
+View config (requires Glance
+
+```yaml
+- name: Gaming
+ columns:
+ - size: small
+ widgets:
+ - type: twitch-top-games
+ limit: 20
+ collapse-after: 13
+ exclude:
+ - just-chatting
+ - pools-hot-tubs-and-beaches
+ - music
+ - art
+ - asmr
+
+ - size: full
+ widgets:
+ - type: group
+ widgets:
+ - type: reddit
+ show-thumbnails: true
+ subreddit: pcgaming
+ - type: reddit
+ subreddit: games
+
+ - type: videos
+ style: grid-cards
+ collapse-after-rows: 3
+ channels:
+ - UCNvzD7Z-g64bPXxGzaQaa4g # gameranx
+ - UCZ7AeeVbyslLM_8-nVy2B8Q # Skill Up
+ - UCHDxYLv8iovIbhrfl16CNyg # GameLinked
+ - UC9PBzalIcEQCsiIkq36PyUA # Digital Foundry
+
+ - size: small
+ widgets:
+ - type: reddit
+ subreddit: gamingnews
+ limit: 7
+ style: vertical-cards
+```
+
diff --git a/docs/themes.md b/docs/themes.md
index b4185db..fdc10b2 100644
--- a/docs/themes.md
+++ b/docs/themes.md
@@ -53,6 +53,16 @@ theme:
primary-color: 97 13 80
```
+### Gruvbox Dark
+
+```yaml
+theme:
+ background-color: 0 0 16
+ primary-color: 43 59 81
+ positive-color: 61 66 44
+ negative-color: 6 96 59
+```
+
### Kanagawa Dark
```yaml
@@ -72,6 +82,17 @@ theme:
negative-color: 209 88 54
```
+### Dracula
+
+```yaml
+theme:
+ background-color: 231 15 21
+ primary-color: 265 89 79
+ contrast-multiplier: 1.2
+ positive-color: 135 94 66
+ negative-color: 0 100 67
+```
+
## Light
### Catppuccin Latte
diff --git a/docs/v0.7.0-upgrade.md b/docs/v0.7.0-upgrade.md
new file mode 100644
index 0000000..93fa6b8
--- /dev/null
+++ b/docs/v0.7.0-upgrade.md
@@ -0,0 +1,57 @@
+## Upgrading to v0.7.0 from previous versions
+
+In essence, the `glance.yml` file has been moved from the root of the project to a `config/` directory and you now need to mount that directory to `/app/config` in the container.
+
+### Before
+
+Versions before v0.7.0 used a `docker-compose.yml` that looked like the following:
+
+```yaml
+services:
+ glance:
+ image: glanceapp/glance
+ volumes:
+ - ./glance.yml:/app/glance.yml
+ ports:
+ - 8080:8080
+```
+
+And expected you to have the following directory structure:
+
+```plaintext
+glance/
+ docker-compose.yml
+ glance.yml
+```
+
+### After
+
+With the release of v0.7.0, the recommended `docker-compose.yml` looks like the following:
+
+```yaml
+services:
+ glance:
+ container_name: glance
+ image: glanceapp/glance
+ volumes:
+ - ./config:/app/config
+ ports:
+ - 8080:8080
+```
+
+And expects you to have the following directory structure:
+
+```plaintext
+glance/
+ docker-compose.yml
+ config/
+ glance.yml
+```
+
+## Why this change was necessary
+
+1. Mounting a file rather than a directory is not common practice and leads to some issues, such as creating a directory if the file is not present, which has tripped up multiple people and caused unnecessary confusion
+2. v0.7.0 added automatic reloads when the configuration file changes, which based on testing didn't work when mounting a single file
+3. v0.7.0 added the ability to include config files, so you'd have to make this change anyways if you wanted to take advantage of that feature
+
+Taking all of these into account, it felt like the right time to implement the change.
diff --git a/go.mod b/go.mod
index 502fc70..4c19477 100644
--- a/go.mod
+++ b/go.mod
@@ -1,19 +1,32 @@
module github.com/glanceapp/glance
-go 1.22.3
+go 1.24.2
require (
+ github.com/fsnotify/fsnotify v1.9.0
github.com/mmcdole/gofeed v1.3.0
- golang.org/x/text v0.14.0
+ github.com/shirou/gopsutil/v4 v4.25.3
+ github.com/tidwall/gjson v1.18.0
+ golang.org/x/text v0.24.0
gopkg.in/yaml.v3 v3.0.1
)
require (
- github.com/PuerkitoBio/goquery v1.9.1 // indirect
- github.com/andybalholm/cascadia v1.3.2 // indirect
+ github.com/PuerkitoBio/goquery v1.10.2 // indirect
+ github.com/andybalholm/cascadia v1.3.3 // indirect
+ github.com/ebitengine/purego v0.8.2 // indirect
+ github.com/go-ole/go-ole v1.3.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
+ github.com/lufia/plan9stats v0.0.0-20250317134145-8bc96cf8fc35 // indirect
github.com/mmcdole/goxpp v1.1.1 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
- golang.org/x/net v0.24.0 // indirect
+ github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
+ github.com/tidwall/match v1.1.1 // indirect
+ github.com/tidwall/pretty v1.2.1 // indirect
+ github.com/tklauser/go-sysconf v0.3.15 // indirect
+ github.com/tklauser/numcpus v0.10.0 // indirect
+ github.com/yusufpapurcu/wmi v1.2.4 // indirect
+ golang.org/x/net v0.39.0 // indirect
+ golang.org/x/sys v0.32.0 // indirect
)
diff --git a/go.sum b/go.sum
index 54489e6..9a79559 100644
--- a/go.sum
+++ b/go.sum
@@ -1,13 +1,31 @@
-github.com/PuerkitoBio/goquery v1.9.1 h1:mTL6XjbJTZdpfL+Gwl5U2h1l9yEkJjhmlTeV9VPW7UI=
-github.com/PuerkitoBio/goquery v1.9.1/go.mod h1:cW1n6TmIMDoORQU5IU/P1T3tGFunOeXEpGP2WHRwkbY=
-github.com/andybalholm/cascadia v1.3.2 h1:3Xi6Dw5lHF15JtdcmAHD3i1+T8plmv7BQ/nsViSLyss=
-github.com/andybalholm/cascadia v1.3.2/go.mod h1:7gtRlve5FxPPgIgX36uWBX58OdBsSS6lUvCFb+h7KvU=
+github.com/PuerkitoBio/goquery v1.10.1 h1:Y8JGYUkXWTGRB6Ars3+j3kN0xg1YqqlwvdTV8WTFQcU=
+github.com/PuerkitoBio/goquery v1.10.1/go.mod h1:IYiHrOMps66ag56LEH7QYDDupKXyo5A8qrjIx3ZtujY=
+github.com/PuerkitoBio/goquery v1.10.2 h1:7fh2BdHcG6VFZsK7toXBT/Bh1z5Wmy8Q9MV9HqT2AM8=
+github.com/PuerkitoBio/goquery v1.10.2/go.mod h1:0guWGjcLu9AYC7C1GHnpysHy056u9aEkUHwhdnePMCU=
+github.com/andybalholm/cascadia v1.3.3 h1:AG2YHrzJIm4BZ19iwJ/DAua6Btl3IwJX+VI4kktS1LM=
+github.com/andybalholm/cascadia v1.3.3/go.mod h1:xNd9bqTn98Ln4DwST8/nG+H0yuB8Hmgu1YHNnWw0GeA=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/ebitengine/purego v0.8.2 h1:jPPGWs2sZ1UgOSgD2bClL0MJIqu58nOmIcBuXr62z1I=
+github.com/ebitengine/purego v0.8.2/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
+github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M=
+github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
+github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
+github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
+github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
+github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
+github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
+github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 h1:7UMa6KCCMjZEMDtTVdcGu0B1GmmC7QJKiCCjyTAWQy0=
+github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683/go.mod h1:ilwx/Dta8jXAgpFYFvSWEMwxmbWXyiUHkd5FwyKhb5k=
+github.com/lufia/plan9stats v0.0.0-20250317134145-8bc96cf8fc35 h1:PpXWgLPs+Fqr325bN2FD2ISlRRztXibcX6e8f5FR5Dc=
+github.com/lufia/plan9stats v0.0.0-20250317134145-8bc96cf8fc35/go.mod h1:autxFIvghDt3jPTLoqZ9OZ7s9qTGNAWmYCjVFWPX/zg=
github.com/mmcdole/gofeed v1.3.0 h1:5yn+HeqlcvjMeAI4gu6T+crm7d0anY85+M+v6fIFNG4=
github.com/mmcdole/gofeed v1.3.0/go.mod h1:9TGv2LcJhdXePDzxiuMnukhV2/zb6VtnZt1mS+SjkLE=
github.com/mmcdole/goxpp v1.1.1 h1:RGIX+D6iQRIunGHrKqnA2+700XMCnNv0bAOOv5MUhx8=
@@ -19,47 +37,111 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 h1:o4JXh1EVt9k/+g42oCprj/FisM4qX9L3sZB3upGN2ZU=
+github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
+github.com/shirou/gopsutil/v4 v4.25.1 h1:QSWkTc+fu9LTAWfkZwZ6j8MSUk4A2LV7rbH0ZqmLjXs=
+github.com/shirou/gopsutil/v4 v4.25.1/go.mod h1:RoUCUpndaJFtT+2zsZzzmhvbfGoDCJ7nFXKJf8GqJbI=
+github.com/shirou/gopsutil/v4 v4.25.3 h1:SeA68lsu8gLggyMbmCn8cmp97V1TI9ld9sVzAUcKcKE=
+github.com/shirou/gopsutil/v4 v4.25.3/go.mod h1:xbuxyoZj+UsgnZrENu3lQivsngRR5BdjbJwf2fv4szA=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=
+github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
+github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
+github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
+github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
+github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=
+github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
+github.com/tklauser/go-sysconf v0.3.14 h1:g5vzr9iPFFz24v2KZXs/pvpvh8/V9Fw6vQK5ZZb78yU=
+github.com/tklauser/go-sysconf v0.3.14/go.mod h1:1ym4lWMLUOhuBOPGtRcJm7tEGX4SCYNEEEtghGG/8uY=
+github.com/tklauser/go-sysconf v0.3.15 h1:VE89k0criAymJ/Os65CSn1IXaol+1wrsFHEB8Ol49K4=
+github.com/tklauser/go-sysconf v0.3.15/go.mod h1:Dmjwr6tYFIseJw7a3dRLJfsHAMXZ3nEnL/aZY+0IuI4=
+github.com/tklauser/numcpus v0.9.0 h1:lmyCHtANi8aRUgkckBgoDk1nHCux3n2cgkJLXdQGPDo=
+github.com/tklauser/numcpus v0.9.0/go.mod h1:SN6Nq1O3VychhC1npsWostA+oW+VOQTxZrS604NSRyI=
+github.com/tklauser/numcpus v0.10.0 h1:18njr6LDBk1zuna922MgdjQuJFjrdppsZG60sHGfjso=
+github.com/tklauser/numcpus v0.10.0/go.mod h1:BiTKazU708GQTYF4mB+cmlpT2Is1gLk7XVuEeem8LsQ=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
+github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
+golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
+golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
+golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
-golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
-golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
+golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
+golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
+golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
+golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
+golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
+golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
+golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
+golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY=
+golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
+golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
+golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
+golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
+golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
+golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
+golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
+golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
+golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
+golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
+golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
diff --git a/internal/assets/files.go b/internal/assets/files.go
deleted file mode 100644
index bfb2b4c..0000000
--- a/internal/assets/files.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package assets
-
-import (
- "embed"
- "io/fs"
-)
-
-//go:embed static
-var _publicFS embed.FS
-
-//go:embed templates
-var _templateFS embed.FS
-
-var PublicFS, _ = fs.Sub(_publicFS, "static")
-var TemplateFS, _ = fs.Sub(_templateFS, "templates")
diff --git a/internal/assets/templates.go b/internal/assets/templates.go
deleted file mode 100644
index 53ae871..0000000
--- a/internal/assets/templates.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package assets
-
-import (
- "fmt"
- "html/template"
- "math"
- "strconv"
- "time"
-
- "golang.org/x/text/language"
- "golang.org/x/text/message"
-)
-
-var (
- PageTemplate = compileTemplate("page.html", "document.html", "page-style-overrides.gotmpl")
- PageContentTemplate = compileTemplate("content.html")
- CalendarTemplate = compileTemplate("calendar.html", "widget-base.html")
- ClockTemplate = compileTemplate("clock.html", "widget-base.html")
- BookmarksTemplate = compileTemplate("bookmarks.html", "widget-base.html")
- IFrameTemplate = compileTemplate("iframe.html", "widget-base.html")
- WeatherTemplate = compileTemplate("weather.html", "widget-base.html")
- ForumPostsTemplate = compileTemplate("forum-posts.html", "widget-base.html")
- RedditCardsHorizontalTemplate = compileTemplate("reddit-horizontal-cards.html", "widget-base.html")
- RedditCardsVerticalTemplate = compileTemplate("reddit-vertical-cards.html", "widget-base.html")
- ReleasesTemplate = compileTemplate("releases.html", "widget-base.html")
- ChangeDetectionTemplate = compileTemplate("change-detection.html", "widget-base.html")
- VideosTemplate = compileTemplate("videos.html", "widget-base.html", "video-card-contents.html")
- VideosGridTemplate = compileTemplate("videos-grid.html", "widget-base.html", "video-card-contents.html")
- MarketsTemplate = compileTemplate("markets.html", "widget-base.html")
- RSSListTemplate = compileTemplate("rss-list.html", "widget-base.html")
- RSSDetailedListTemplate = compileTemplate("rss-detailed-list.html", "widget-base.html")
- RSSHorizontalCardsTemplate = compileTemplate("rss-horizontal-cards.html", "widget-base.html")
- RSSHorizontalCards2Template = compileTemplate("rss-horizontal-cards-2.html", "widget-base.html")
- MonitorTemplate = compileTemplate("monitor.html", "widget-base.html")
- TwitchGamesListTemplate = compileTemplate("twitch-games-list.html", "widget-base.html")
- TwitchChannelsTemplate = compileTemplate("twitch-channels.html", "widget-base.html")
- RepositoryTemplate = compileTemplate("repository.html", "widget-base.html")
- SearchTemplate = compileTemplate("search.html", "widget-base.html")
- ExtensionTemplate = compileTemplate("extension.html", "widget-base.html")
-)
-
-var globalTemplateFunctions = template.FuncMap{
- "relativeTime": relativeTimeSince,
- "formatViewerCount": formatViewerCount,
- "formatNumber": intl.Sprint,
- "absInt": func(i int) int {
- return int(math.Abs(float64(i)))
- },
- "formatPrice": func(price float64) string {
- return intl.Sprintf("%.2f", price)
- },
- "formatTime": func(t time.Time) string {
- return t.Format("2006-01-02 15:04:05")
- },
- "shouldCollapse": func(i int, collapseAfter int) bool {
- if collapseAfter < -1 {
- return false
- }
-
- return i >= collapseAfter
- },
- "itemAnimationDelay": func(i int, collapseAfter int) string {
- return fmt.Sprintf("%dms", (i-collapseAfter)*30)
- },
- "dynamicRelativeTimeAttrs": func(t time.Time) template.HTMLAttr {
- return template.HTMLAttr(fmt.Sprintf(`data-dynamic-relative-time="%d"`, t.Unix()))
- },
-}
-
-func compileTemplate(primary string, dependencies ...string) *template.Template {
- t, err := template.New(primary).
- Funcs(globalTemplateFunctions).
- ParseFS(TemplateFS, append([]string{primary}, dependencies...)...)
-
- if err != nil {
- panic(err)
- }
-
- return t
-}
-
-var intl = message.NewPrinter(language.English)
-
-func formatViewerCount(count int) string {
- if count < 1_000 {
- return strconv.Itoa(count)
- }
-
- if count < 10_000 {
- return fmt.Sprintf("%.1fk", float64(count)/1_000)
- }
-
- if count < 1_000_000 {
- return fmt.Sprintf("%dk", count/1_000)
- }
-
- return fmt.Sprintf("%.1fm", float64(count)/1_000_000)
-}
-
-func relativeTimeSince(t time.Time) string {
- delta := time.Since(t)
-
- if delta < time.Minute {
- return "1m"
- }
- if delta < time.Hour {
- return fmt.Sprintf("%dm", delta/time.Minute)
- }
- if delta < 24*time.Hour {
- return fmt.Sprintf("%dh", delta/time.Hour)
- }
- if delta < 30*24*time.Hour {
- return fmt.Sprintf("%dd", delta/(24*time.Hour))
- }
- if delta < 12*30*24*time.Hour {
- return fmt.Sprintf("%dmo", delta/(30*24*time.Hour))
- }
-
- return fmt.Sprintf("%dy", delta/(365*24*time.Hour))
-}
diff --git a/internal/assets/templates/bookmarks.html b/internal/assets/templates/bookmarks.html
deleted file mode 100644
index a422009..0000000
--- a/internal/assets/templates/bookmarks.html
+++ /dev/null
@@ -1,37 +0,0 @@
-{{ template "widget-base.html" . }}
-
-{{ define "widget-content" }}
-{{ if ne .Style "dynamic-columns-experimental" }}
-View config (requires Glance v0.6.0 or higher)
+
+```yaml
+- name: Gaming
+ columns:
+ - size: small
+ widgets:
+ - type: twitch-top-games
+ limit: 20
+ collapse-after: 13
+ exclude:
+ - just-chatting
+ - pools-hot-tubs-and-beaches
+ - music
+ - art
+ - asmr
+
+ - size: full
+ widgets:
+ - type: group
+ widgets:
+ - type: reddit
+ show-thumbnails: true
+ subreddit: pcgaming
+ - type: reddit
+ subreddit: games
+
+ - type: videos
+ style: grid-cards
+ collapse-after-rows: 3
+ channels:
+ - UCNvzD7Z-g64bPXxGzaQaa4g # gameranx
+ - UCZ7AeeVbyslLM_8-nVy2B8Q # Skill Up
+ - UCHDxYLv8iovIbhrfl16CNyg # GameLinked
+ - UC9PBzalIcEQCsiIkq36PyUA # Digital Foundry
+
+ - size: small
+ widgets:
+ - type: reddit
+ subreddit: gamingnews
+ limit: 7
+ style: vertical-cards
+```
+-
- {{ range .Groups }}
-
- - {{ template "group" . }} - - {{ end }} -
- {{ range .Groups }}
-
-{{ end }}
-{{ end }}
-
-{{ define "group" }}
-{{ if ne .Title "" }}
- {{ template "group" . }}
-
- {{ end }}
-{{ .Title }}
{{ end }}
--
-{{ range .Links }}
-
-
- {{ if ne "" .Icon }}
- -- {{ end }} - {{ .Title }} -
-
-{{ end }}
-
-
-
-{{ .Calendar.CurrentMonthName }}
- -
-
- Week {{ .Calendar.CurrentWeekNumber }} -
- {{ .Calendar.CurrentYear }} -
-
-
-Mo
- Tu
- We
- Th
- Fr
- Sa
- Su
-
- {{ range .Calendar.Days }}
-
-{{ end }}
diff --git a/internal/assets/templates/extension.html b/internal/assets/templates/extension.html
deleted file mode 100644
index e5794c8..0000000
--- a/internal/assets/templates/extension.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{{ template "widget-base.html" . }}
-
-{{ define "widget-content" }}
-{{ .Extension.Content }}
-{{ end }}
diff --git a/internal/assets/templates/forum-posts.html b/internal/assets/templates/forum-posts.html
deleted file mode 100644
index a6fe24d..0000000
--- a/internal/assets/templates/forum-posts.html
+++ /dev/null
@@ -1,45 +0,0 @@
-{{ template "widget-base.html" . }}
-
-{{ define "widget-content" }}
-{{ . }}
- {{ end }}
--
- {{ range .Posts }}
-
-
- - {{ if $.ShowThumbnails }} - {{ if ne .ThumbnailUrl "" }} --
- {{ else if .HasTargetUrl }} - - {{ else }} - - {{ end }} - {{ end }} -
- {{ .Title }} - {{ if gt (len .Tags) 0 }} - - {{ end }} ---
-
-
- {{ .Score | formatNumber }} points -
- {{ .CommentCount | formatNumber }} comments - {{ if .HasTargetUrl }} -
- {{ .TargetUrlDomain }} - {{ end }} -
- {{ end }}
-
-
- {{ range .Markets }}
-
- - {{ template "market" . }} - - {{ end }} -
- {{ range .Markets }}
-
-{{ end }}
-{{ end }}
-
-{{ define "market" }}
-
- {{ template "market" . }}
-
- {{ end }}
-
- {{ .Symbol }}
-
-
-
-
-
-
-{{ .Name }}
-
-
-{{ end }}
diff --git a/internal/assets/templates/monitor.html b/internal/assets/templates/monitor.html
deleted file mode 100644
index 0333741..0000000
--- a/internal/assets/templates/monitor.html
+++ /dev/null
@@ -1,53 +0,0 @@
-{{ template "widget-base.html" . }}
-
-{{ define "widget-content" }}
-{{ if ne .Style "dynamic-columns-experimental" }}
-{{ printf "%+.2f" .PercentChange }}%
- {{ .Currency }}{{ .Price | formatPrice }}
--
- {{ range .Sites }}
-
- - {{ template "site" . }} - - {{ end }} -
-
- {{ range .Sites }}
-
- {{ template "site" . }}
-
- {{ end }}
-
- {{ .Title }}
-
-{{ if eq .StatusStyle "ok" }}
-
-{{ else }}
-
-{{ end }}
-{{ end }}
diff --git a/internal/assets/templates/page-style-overrides.gotmpl b/internal/assets/templates/page-style-overrides.gotmpl
deleted file mode 100644
index 0bf2a99..0000000
--- a/internal/assets/templates/page-style-overrides.gotmpl
+++ /dev/null
@@ -1,14 +0,0 @@
-
diff --git a/internal/assets/templates/page.html b/internal/assets/templates/page.html
deleted file mode 100644
index 98bb111..0000000
--- a/internal/assets/templates/page.html
+++ /dev/null
@@ -1,67 +0,0 @@
-{{ template "document.html" . }}
-
-{{ define "document-title" }}{{ .Page.Title }} - Glance{{ end }}
-
-{{ define "document-head-before" }}
-
-{{ end }}
-
-{{ define "document-root-attrs" }}{{ if .App.Config.Theme.Light }}class="light-scheme"{{ end }}{{ end }}
-{{ define "document-head-after" }}
-{{ template "page-style-overrides.gotmpl" . }}
-{{ if ne "" .App.Config.Theme.CustomCSSFile }}
-
-{{ end }}
-{{ end }}
-
-{{ define "navigation-links" }}
-{{ range .App.Config.Pages }}
-{{ .Title }}
-{{ end }}
-{{ end }}
-
-{{ define "document-body" }}
--
- {{ if not .Status.Error }}
-
- {{ .StatusText }} -
- {{ .Status.ResponseTime.Milliseconds | formatNumber }}ms - {{ else if .Status.TimedOut }} -
- Timed Out - {{ else }} -
- ERROR - {{ end }} -
-
-
-
-
-
-
-
-
-
-{{ end }}
diff --git a/internal/assets/templates/releases.html b/internal/assets/templates/releases.html
deleted file mode 100644
index d6a8974..0000000
--- a/internal/assets/templates/releases.html
+++ /dev/null
@@ -1,18 +0,0 @@
-{{ template "widget-base.html" . }}
-
-{{ define "widget-content" }}
-
-
-
-
-
-
-
- -
- {{ range $i, $release := .Releases }}
-
-
- {{ .Name }}
-
-
-
-
- {{ $release.Version }} - {{ if gt $release.Downvotes 3 }} -
- {{ $release.Downvotes | formatNumber }} ⚠ - {{ end }} -
- {{ end }}
-
-
-
- {{ .RepositoryDetails.Stars | formatNumber }} stars -
- {{ .RepositoryDetails.Forks | formatNumber }} forks -
-Open pull requests ({{ .RepositoryDetails.OpenPullRequests | formatNumber }} total) -
-
-{{ end }}
-
-{{ if gt (len .RepositoryDetails.Issues) 0 }}
--
- {{ range .RepositoryDetails.PullRequests }}
-
- {{ end }}
-
-
- {{ range .RepositoryDetails.PullRequests }}
-
- {{ .Title }} - {{ end }} -
-Open issues ({{ .RepositoryDetails.OpenIssues | formatNumber }} total) -
-
-{{ end }}
-
-{{ end }}
diff --git a/internal/assets/templates/weather.html b/internal/assets/templates/weather.html
deleted file mode 100644
index 40fdcb6..0000000
--- a/internal/assets/templates/weather.html
+++ /dev/null
@@ -1,29 +0,0 @@
-{{ template "widget-base.html" . }}
-
-{{ define "widget-content" }}
--
- {{ range .RepositoryDetails.Issues }}
-
- {{ end }}
-
-
- {{ range .RepositoryDetails.Issues }}
-
- {{ .Title }} - {{ end }} -
{{ .Weather.WeatherCodeAsString }}
-Feels like {{ .Weather.ApparentTemperature }}°{{ if eq .Units "metric" }}C{{ else }}F{{ end }}
-
-
- {{ range $i, $column := .Weather.Columns }}
-
-
-{{ if not .HideLocation }}
-
- {{ if $column.HasPrecipitation }}
-
- {{ end }}
- {{ if and (ge $i $.Weather.SunriseColumn) (le $i $.Weather.SunsetColumn ) }}
-
- {{ end }}
-
- {{ end }}
-{{ $column.Temperature | absInt }}
-
- {{ index $.TimeLabels $i }}
-
-
-
-{{ end }}
-{{ end }}
diff --git a/internal/assets/templates/widget-base.html b/internal/assets/templates/widget-base.html
deleted file mode 100644
index e37d53f..0000000
--- a/internal/assets/templates/widget-base.html
+++ /dev/null
@@ -1,21 +0,0 @@
-
diff --git a/internal/feed/calendar.go b/internal/feed/calendar.go
deleted file mode 100644
index f7ec5d4..0000000
--- a/internal/feed/calendar.go
+++ /dev/null
@@ -1,53 +0,0 @@
-package feed
-
-import "time"
-
-// TODO: very inflexible, refactor to allow more customizability
-// TODO: allow changing first day of week
-// TODO: allow changing between showing the previous and next week and the entire month
-func NewCalendar(now time.Time) *Calendar {
- year, week := now.ISOWeek()
- weekday := now.Weekday()
-
- if weekday == 0 {
- weekday = 7
- }
-
- currentMonthDays := daysInMonth(now.Month(), year)
-
- var previousMonthDays int
-
- if previousMonthNumber := now.Month() - 1; previousMonthNumber < 1 {
- previousMonthDays = daysInMonth(12, year-1)
- } else {
- previousMonthDays = daysInMonth(previousMonthNumber, year)
- }
-
- startDaysFrom := now.Day() - int(weekday+6)
-
- days := make([]int, 21)
-
- for i := 0; i < 21; i++ {
- day := startDaysFrom + i
-
- if day < 1 {
- day = previousMonthDays + day
- } else if day > currentMonthDays {
- day = day - currentMonthDays
- }
-
- days[i] = day
- }
-
- return &Calendar{
- CurrentDay: now.Day(),
- CurrentWeekNumber: week,
- CurrentMonthName: now.Month().String(),
- CurrentYear: year,
- Days: days,
- }
-}
-
-func daysInMonth(m time.Month, year int) int {
- return time.Date(year, m+1, 0, 0, 0, 0, 0, time.UTC).Day()
-}
diff --git a/internal/feed/extension.go b/internal/feed/extension.go
deleted file mode 100644
index 3aa499a..0000000
--- a/internal/feed/extension.go
+++ /dev/null
@@ -1,97 +0,0 @@
-package feed
-
-import (
- "fmt"
- "html"
- "html/template"
- "io"
- "log/slog"
- "net/http"
- "net/url"
-)
-
-type ExtensionType int
-
-const (
- ExtensionContentHTML ExtensionType = iota
- ExtensionContentUnknown = iota
-)
-
-var ExtensionStringToType = map[string]ExtensionType{
- "html": ExtensionContentHTML,
-}
-
-const (
- ExtensionHeaderTitle = "Widget-Title"
- ExtensionHeaderContentType = "Widget-Content-Type"
-)
-
-type ExtensionRequestOptions struct {
- URL string `yaml:"url"`
- Parameters map[string]string `yaml:"parameters"`
- AllowHtml bool `yaml:"allow-potentially-dangerous-html"`
-}
-
-type Extension struct {
- Title string
- Content template.HTML
-}
-
-func convertExtensionContent(options ExtensionRequestOptions, content []byte, contentType ExtensionType) template.HTML {
- switch contentType {
- case ExtensionContentHTML:
- if options.AllowHtml {
- return template.HTML(content)
- }
-
- fallthrough
- default:
- return template.HTML(html.EscapeString(string(content)))
- }
-}
-
-func FetchExtension(options ExtensionRequestOptions) (Extension, error) {
- request, _ := http.NewRequest("GET", options.URL, nil)
-
- query := url.Values{}
-
- for key, value := range options.Parameters {
- query.Set(key, value)
- }
-
- request.URL.RawQuery = query.Encode()
-
- response, err := http.DefaultClient.Do(request)
-
- if err != nil {
- slog.Error("failed fetching extension", "error", err, "url", options.URL)
- return Extension{}, fmt.Errorf("%w: request failed: %w", ErrNoContent, err)
- }
-
- defer response.Body.Close()
-
- body, err := io.ReadAll(response.Body)
-
- if err != nil {
- slog.Error("failed reading response body of extension", "error", err, "url", options.URL)
- return Extension{}, fmt.Errorf("%w: could not read body: %w", ErrNoContent, err)
- }
-
- extension := Extension{}
-
- if response.Header.Get(ExtensionHeaderTitle) == "" {
- extension.Title = "Extension"
- } else {
- extension.Title = response.Header.Get(ExtensionHeaderTitle)
- }
-
- contentType, ok := ExtensionStringToType[response.Header.Get(ExtensionHeaderContentType)]
-
- if !ok {
- contentType = ExtensionContentUnknown
- }
-
- extension.Content = convertExtensionContent(options, body, contentType)
-
- return extension, nil
-}
diff --git a/internal/feed/github.go b/internal/feed/github.go
deleted file mode 100644
index 4d7dc73..0000000
--- a/internal/feed/github.go
+++ /dev/null
@@ -1,229 +0,0 @@
-package feed
-
-import (
- "fmt"
- "log/slog"
- "net/http"
- "sync"
- "time"
-)
-
-type githubReleaseLatestResponseJson struct {
- TagName string `json:"tag_name"`
- PublishedAt string `json:"published_at"`
- HtmlUrl string `json:"html_url"`
- Reactions struct {
- Downvotes int `json:"-1"`
- } `json:"reactions"`
-}
-
-func parseGithubTime(t string) time.Time {
- parsedTime, err := time.Parse("2006-01-02T15:04:05Z", t)
-
- if err != nil {
- return time.Now()
- }
-
- return parsedTime
-}
-
-func FetchLatestReleasesFromGithub(repositories []string, token string) (AppReleases, error) {
- appReleases := make(AppReleases, 0, len(repositories))
-
- if len(repositories) == 0 {
- return appReleases, nil
- }
-
- requests := make([]*http.Request, len(repositories))
-
- for i, repository := range repositories {
- request, _ := http.NewRequest("GET", fmt.Sprintf("https://api.github.com/repos/%s/releases/latest", repository), nil)
-
- if token != "" {
- request.Header.Add("Authorization", fmt.Sprintf("Bearer %s", token))
- }
-
- requests[i] = request
- }
-
- task := decodeJsonFromRequestTask[githubReleaseLatestResponseJson](defaultClient)
- job := newJob(task, requests).withWorkers(15)
- responses, errs, err := workerPoolDo(job)
-
- if err != nil {
- return nil, err
- }
-
- var failed int
-
- for i := range responses {
- if errs[i] != nil {
- failed++
- slog.Error("Failed to fetch or parse github release", "error", errs[i], "url", requests[i].URL)
- continue
- }
-
- liveRelease := &responses[i]
-
- if liveRelease == nil {
- slog.Error("No live release found", "repository", repositories[i], "url", requests[i].URL)
- continue
- }
-
- version := liveRelease.TagName
-
- if version[0] != 'v' {
- version = "v" + version
- }
-
- appReleases = append(appReleases, AppRelease{
- Name: repositories[i],
- Version: version,
- NotesUrl: liveRelease.HtmlUrl,
- TimeReleased: parseGithubTime(liveRelease.PublishedAt),
- Downvotes: liveRelease.Reactions.Downvotes,
- })
- }
-
- if len(appReleases) == 0 {
- return nil, ErrNoContent
- }
-
- appReleases.SortByNewest()
-
- if failed > 0 {
- return appReleases, fmt.Errorf("%w: could not get %d releases", ErrPartialContent, failed)
- }
-
- return appReleases, nil
-}
-
-type GithubTicket struct {
- Number int
- CreatedAt time.Time
- Title string
-}
-
-type RepositoryDetails struct {
- Name string
- Stars int
- Forks int
- OpenPullRequests int
- PullRequests []GithubTicket
- OpenIssues int
- Issues []GithubTicket
-}
-
-type githubRepositoryDetailsResponseJson struct {
- Name string `json:"full_name"`
- Stars int `json:"stargazers_count"`
- Forks int `json:"forks_count"`
-}
-
-type githubTicketResponseJson struct {
- Count int `json:"total_count"`
- Tickets []struct {
- Number int `json:"number"`
- CreatedAt string `json:"created_at"`
- Title string `json:"title"`
- } `json:"items"`
-}
-
-func FetchRepositoryDetailsFromGithub(repository string, token string, maxPRs int, maxIssues int) (RepositoryDetails, error) {
- repositoryRequest, err := http.NewRequest("GET", fmt.Sprintf("https://api.github.com/repos/%s", repository), nil)
-
- if err != nil {
- return RepositoryDetails{}, fmt.Errorf("%w: could not create request with repository: %v", ErrNoContent, err)
- }
-
- PRsRequest, _ := http.NewRequest("GET", fmt.Sprintf("https://api.github.com/search/issues?q=is:pr+is:open+repo:%s&per_page=%d", repository, maxPRs), nil)
- issuesRequest, _ := http.NewRequest("GET", fmt.Sprintf("https://api.github.com/search/issues?q=is:issue+is:open+repo:%s&per_page=%d", repository, maxIssues), nil)
-
- if token != "" {
- token = fmt.Sprintf("Bearer %s", token)
- repositoryRequest.Header.Add("Authorization", token)
- PRsRequest.Header.Add("Authorization", token)
- issuesRequest.Header.Add("Authorization", token)
- }
-
- var detailsResponse githubRepositoryDetailsResponseJson
- var detailsErr error
- var PRsResponse githubTicketResponseJson
- var PRsErr error
- var issuesResponse githubTicketResponseJson
- var issuesErr error
- var wg sync.WaitGroup
-
- wg.Add(1)
- go (func() {
- defer wg.Done()
- detailsResponse, detailsErr = decodeJsonFromRequest[githubRepositoryDetailsResponseJson](defaultClient, repositoryRequest)
- })()
-
- if maxPRs > 0 {
- wg.Add(1)
- go (func() {
- defer wg.Done()
- PRsResponse, PRsErr = decodeJsonFromRequest[githubTicketResponseJson](defaultClient, PRsRequest)
- })()
- }
-
- if maxIssues > 0 {
- wg.Add(1)
- go (func() {
- defer wg.Done()
- issuesResponse, issuesErr = decodeJsonFromRequest[githubTicketResponseJson](defaultClient, issuesRequest)
- })()
- }
-
- wg.Wait()
-
- if detailsErr != nil {
- return RepositoryDetails{}, fmt.Errorf("%w: could not get repository details: %s", ErrNoContent, detailsErr)
- }
-
- details := RepositoryDetails{
- Name: detailsResponse.Name,
- Stars: detailsResponse.Stars,
- Forks: detailsResponse.Forks,
- PullRequests: make([]GithubTicket, 0, len(PRsResponse.Tickets)),
- Issues: make([]GithubTicket, 0, len(issuesResponse.Tickets)),
- }
-
- err = nil
-
- if maxPRs > 0 {
- if PRsErr != nil {
- err = fmt.Errorf("%w: could not get PRs: %s", ErrPartialContent, PRsErr)
- } else {
- details.OpenPullRequests = PRsResponse.Count
-
- for i := range PRsResponse.Tickets {
- details.PullRequests = append(details.PullRequests, GithubTicket{
- Number: PRsResponse.Tickets[i].Number,
- CreatedAt: parseGithubTime(PRsResponse.Tickets[i].CreatedAt),
- Title: PRsResponse.Tickets[i].Title,
- })
- }
- }
- }
-
- if maxIssues > 0 {
- if issuesErr != nil {
- // TODO: fix, overwriting the previous error
- err = fmt.Errorf("%w: could not get issues: %s", ErrPartialContent, issuesErr)
- } else {
- details.OpenIssues = issuesResponse.Count
-
- for i := range issuesResponse.Tickets {
- details.Issues = append(details.Issues, GithubTicket{
- Number: issuesResponse.Tickets[i].Number,
- CreatedAt: parseGithubTime(issuesResponse.Tickets[i].CreatedAt),
- Title: issuesResponse.Tickets[i].Title,
- })
- }
- }
- }
-
- return details, err
-}
diff --git a/internal/feed/hacker-news.go b/internal/feed/hacker-news.go
deleted file mode 100644
index f1db111..0000000
--- a/internal/feed/hacker-news.go
+++ /dev/null
@@ -1,98 +0,0 @@
-package feed
-
-import (
- "fmt"
- "log/slog"
- "net/http"
- "strconv"
- "strings"
- "time"
-)
-
-type hackerNewsPostResponseJson struct {
- Id int `json:"id"`
- Score int `json:"score"`
- Title string `json:"title"`
- TargetUrl string `json:"url,omitempty"`
- CommentCount int `json:"descendants"`
- TimePosted int64 `json:"time"`
-}
-
-func getHackerNewsPostIds(sort string) ([]int, error) {
- request, _ := http.NewRequest("GET", fmt.Sprintf("https://hacker-news.firebaseio.com/v0/%sstories.json", sort), nil)
- response, err := decodeJsonFromRequest[[]int](defaultClient, request)
-
- if err != nil {
- return nil, fmt.Errorf("%w: could not fetch list of post IDs", ErrNoContent)
- }
-
- return response, nil
-}
-
-func getHackerNewsPostsFromIds(postIds []int, commentsUrlTemplate string) (ForumPosts, error) {
- requests := make([]*http.Request, len(postIds))
-
- for i, id := range postIds {
- request, _ := http.NewRequest("GET", fmt.Sprintf("https://hacker-news.firebaseio.com/v0/item/%d.json", id), nil)
- requests[i] = request
- }
-
- task := decodeJsonFromRequestTask[hackerNewsPostResponseJson](defaultClient)
- job := newJob(task, requests).withWorkers(30)
- results, errs, err := workerPoolDo(job)
-
- if err != nil {
- return nil, err
- }
-
- posts := make(ForumPosts, 0, len(postIds))
-
- for i := range results {
- if errs[i] != nil {
- slog.Error("Failed to fetch or parse hacker news post", "error", errs[i], "url", requests[i].URL)
- continue
- }
-
- var commentsUrl string
-
- if commentsUrlTemplate == "" {
- commentsUrl = "https://news.ycombinator.com/item?id=" + strconv.Itoa(results[i].Id)
- } else {
- commentsUrl = strings.ReplaceAll(commentsUrlTemplate, "{POST-ID}", strconv.Itoa(results[i].Id))
- }
-
- posts = append(posts, ForumPost{
- Title: results[i].Title,
- DiscussionUrl: commentsUrl,
- TargetUrl: results[i].TargetUrl,
- TargetUrlDomain: extractDomainFromUrl(results[i].TargetUrl),
- CommentCount: results[i].CommentCount,
- Score: results[i].Score,
- TimePosted: time.Unix(results[i].TimePosted, 0),
- })
- }
-
- if len(posts) == 0 {
- return nil, ErrNoContent
- }
-
- if len(posts) != len(postIds) {
- return posts, fmt.Errorf("%w could not fetch some hacker news posts", ErrPartialContent)
- }
-
- return posts, nil
-}
-
-func FetchHackerNewsPosts(sort string, limit int, commentsUrlTemplate string) (ForumPosts, error) {
- postIds, err := getHackerNewsPostIds(sort)
-
- if err != nil {
- return nil, err
- }
-
- if len(postIds) > limit {
- postIds = postIds[:limit]
- }
-
- return getHackerNewsPostsFromIds(postIds, commentsUrlTemplate)
-}
diff --git a/internal/feed/lobsters.go b/internal/feed/lobsters.go
deleted file mode 100644
index e103f56..0000000
--- a/internal/feed/lobsters.go
+++ /dev/null
@@ -1,81 +0,0 @@
-package feed
-
-import (
- "net/http"
- "strings"
- "time"
-)
-
-type lobstersPostResponseJson struct {
- CreatedAt string `json:"created_at"`
- Title string `json:"title"`
- URL string `json:"url"`
- Score int `json:"score"`
- CommentCount int `json:"comment_count"`
- CommentsURL string `json:"comments_url"`
- Tags []string `json:"tags"`
-}
-
-type lobstersFeedResponseJson []lobstersPostResponseJson
-
-func getLobstersPostsFromFeed(feedUrl string) (ForumPosts, error) {
- request, err := http.NewRequest("GET", feedUrl, nil)
-
- if err != nil {
- return nil, err
- }
-
- feed, err := decodeJsonFromRequest[lobstersFeedResponseJson](defaultClient, request)
-
- if err != nil {
- return nil, err
- }
-
- posts := make(ForumPosts, 0, len(feed))
-
- for i := range feed {
- createdAt, _ := time.Parse(time.RFC3339, feed[i].CreatedAt)
-
- posts = append(posts, ForumPost{
- Title: feed[i].Title,
- DiscussionUrl: feed[i].CommentsURL,
- TargetUrl: feed[i].URL,
- TargetUrlDomain: extractDomainFromUrl(feed[i].URL),
- CommentCount: feed[i].CommentCount,
- Score: feed[i].Score,
- TimePosted: createdAt,
- Tags: feed[i].Tags,
- })
- }
-
- if len(posts) == 0 {
- return nil, ErrNoContent
- }
-
- return posts, nil
-}
-
-func FetchLobstersPosts(sortBy string, tags []string) (ForumPosts, error) {
- var feedUrl string
-
- if sortBy == "hot" {
- sortBy = "hottest"
- } else if sortBy == "new" {
- sortBy = "newest"
- }
-
- if len(tags) == 0 {
- feedUrl = "https://lobste.rs/" + sortBy + ".json"
- } else {
- tags := strings.Join(tags, ",")
- feedUrl = "https://lobste.rs/t/" + tags + ".json"
- }
-
- posts, err := getLobstersPostsFromFeed(feedUrl)
-
- if err != nil {
- return nil, err
- }
-
- return posts, nil
-}
diff --git a/internal/feed/monitor.go b/internal/feed/monitor.go
deleted file mode 100644
index 03cdcf4..0000000
--- a/internal/feed/monitor.go
+++ /dev/null
@@ -1,70 +0,0 @@
-package feed
-
-import (
- "context"
- "errors"
- "net/http"
- "time"
-)
-
-type SiteStatusRequest struct {
- URL string `yaml:"url"`
- AllowInsecure bool `yaml:"allow-insecure"`
-}
-
-type SiteStatus struct {
- Code int
- TimedOut bool
- ResponseTime time.Duration
- Error error
-}
-
-func getSiteStatusTask(statusRequest *SiteStatusRequest) (SiteStatus, error) {
- request, err := http.NewRequest(http.MethodGet, statusRequest.URL, nil)
-
- if err != nil {
- return SiteStatus{
- Error: err,
- }, nil
- }
-
- ctx, cancel := context.WithTimeout(context.Background(), time.Second*3)
- defer cancel()
- request = request.WithContext(ctx)
- requestSentAt := time.Now()
- var response *http.Response
-
- if !statusRequest.AllowInsecure {
- response, err = defaultClient.Do(request)
- } else {
- response, err = defaultInsecureClient.Do(request)
- }
-
- status := SiteStatus{ResponseTime: time.Since(requestSentAt)}
-
- if err != nil {
- if errors.Is(err, context.DeadlineExceeded) {
- status.TimedOut = true
- }
-
- status.Error = err
- return status, nil
- }
-
- defer response.Body.Close()
-
- status.Code = response.StatusCode
-
- return status, nil
-}
-
-func FetchStatusForSites(requests []*SiteStatusRequest) ([]SiteStatus, error) {
- job := newJob(getSiteStatusTask, requests).withWorkers(20)
- results, _, err := workerPoolDo(job)
-
- if err != nil {
- return nil, err
- }
-
- return results, nil
-}
diff --git a/internal/feed/primitives.go b/internal/feed/primitives.go
deleted file mode 100644
index 6e0c98f..0000000
--- a/internal/feed/primitives.go
+++ /dev/null
@@ -1,216 +0,0 @@
-package feed
-
-import (
- "math"
- "sort"
- "time"
-)
-
-type ForumPost struct {
- Title string
- DiscussionUrl string
- TargetUrl string
- TargetUrlDomain string
- ThumbnailUrl string
- CommentCount int
- Score int
- Engagement float64
- TimePosted time.Time
- Tags []string
-}
-
-type ForumPosts []ForumPost
-
-type Calendar struct {
- CurrentDay int
- CurrentWeekNumber int
- CurrentMonthName string
- CurrentYear int
- Days []int
-}
-
-type Weather struct {
- Temperature int
- ApparentTemperature int
- WeatherCode int
- CurrentColumn int
- SunriseColumn int
- SunsetColumn int
- Columns []weatherColumn
-}
-
-type AppRelease struct {
- Name string
- Version string
- NotesUrl string
- TimeReleased time.Time
- Downvotes int
-}
-
-type AppReleases []AppRelease
-
-type Video struct {
- ThumbnailUrl string
- Title string
- Url string
- Author string
- AuthorUrl string
- TimePosted time.Time
-}
-
-type Videos []Video
-
-var currencyToSymbol = map[string]string{
- "USD": "$",
- "EUR": "€",
- "JPY": "¥",
- "CAD": "C$",
- "AUD": "A$",
- "GBP": "£",
- "CHF": "Fr",
- "NZD": "N$",
- "INR": "₹",
- "BRL": "R$",
- "RUB": "₽",
- "TRY": "₺",
- "ZAR": "R",
- "CNY": "¥",
- "KRW": "₩",
- "HKD": "HK$",
- "SGD": "S$",
- "SEK": "kr",
- "NOK": "kr",
- "DKK": "kr",
- "PLN": "zł",
- "PHP": "₱",
-}
-
-type MarketRequest struct {
- Name string `yaml:"name"`
- Symbol string `yaml:"symbol"`
- ChartLink string `yaml:"chart-link"`
- SymbolLink string `yaml:"symbol-link"`
-}
-
-type Market struct {
- MarketRequest
- Currency string `yaml:"-"`
- Price float64 `yaml:"-"`
- PercentChange float64 `yaml:"-"`
- SvgChartPoints string `yaml:"-"`
-}
-
-type Markets []Market
-
-func (t Markets) SortByAbsChange() {
- sort.Slice(t, func(i, j int) bool {
- return math.Abs(t[i].PercentChange) > math.Abs(t[j].PercentChange)
- })
-}
-
-var weatherCodeTable = map[int]string{
- 0: "Clear Sky",
- 1: "Mainly Clear",
- 2: "Partly Cloudy",
- 3: "Overcast",
- 45: "Fog",
- 48: "Rime Fog",
- 51: "Drizzle",
- 53: "Drizzle",
- 55: "Drizzle",
- 56: "Drizzle",
- 57: "Drizzle",
- 61: "Rain",
- 63: "Moderate Rain",
- 65: "Heavy Rain",
- 66: "Freezing Rain",
- 67: "Freezing Rain",
- 71: "Snow",
- 73: "Moderate Snow",
- 75: "Heavy Snow",
- 77: "Snow Grains",
- 80: "Rain",
- 81: "Moderate Rain",
- 82: "Heavy Rain",
- 85: "Snow",
- 86: "Snow",
- 95: "Thunderstorm",
- 96: "Thunderstorm",
- 99: "Thunderstorm",
-}
-
-func (w *Weather) WeatherCodeAsString() string {
- if weatherCode, ok := weatherCodeTable[w.WeatherCode]; ok {
- return weatherCode
- }
-
- return ""
-}
-
-const depreciatePostsOlderThanHours = 7
-const maxDepreciation = 0.9
-const maxDepreciationAfterHours = 24
-
-func (p ForumPosts) CalculateEngagement() {
- var totalComments int
- var totalScore int
-
- for i := range p {
- totalComments += p[i].CommentCount
- totalScore += p[i].Score
- }
-
- numberOfPosts := float64(len(p))
- averageComments := float64(totalComments) / numberOfPosts
- averageScore := float64(totalScore) / numberOfPosts
-
- for i := range p {
- p[i].Engagement = (float64(p[i].CommentCount)/averageComments + float64(p[i].Score)/averageScore) / 2
-
- elapsed := time.Since(p[i].TimePosted)
-
- if elapsed < time.Hour*depreciatePostsOlderThanHours {
- continue
- }
-
- p[i].Engagement *= 1.0 - (math.Max(elapsed.Hours()-depreciatePostsOlderThanHours, maxDepreciationAfterHours)/maxDepreciationAfterHours)*maxDepreciation
- }
-}
-
-func (p ForumPosts) SortByEngagement() {
- sort.Slice(p, func(i, j int) bool {
- return p[i].Engagement > p[j].Engagement
- })
-}
-
-func (s *ForumPost) HasTargetUrl() bool {
- return s.TargetUrl != ""
-}
-
-func (p ForumPosts) FilterPostedBefore(postedBefore time.Duration) []ForumPost {
- recent := make([]ForumPost, 0, len(p))
-
- for i := range p {
- if time.Since(p[i].TimePosted) < postedBefore {
- recent = append(recent, p[i])
- }
- }
-
- return recent
-}
-
-func (r AppReleases) SortByNewest() AppReleases {
- sort.Slice(r, func(i, j int) bool {
- return r[i].TimeReleased.After(r[j].TimeReleased)
- })
-
- return r
-}
-
-func (v Videos) SortByNewest() Videos {
- sort.Slice(v, func(i, j int) bool {
- return v[i].TimePosted.After(v[j].TimePosted)
- })
-
- return v
-}
diff --git a/internal/feed/reddit.go b/internal/feed/reddit.go
deleted file mode 100644
index 676d948..0000000
--- a/internal/feed/reddit.go
+++ /dev/null
@@ -1,114 +0,0 @@
-package feed
-
-import (
- "fmt"
- "html"
- "net/http"
- "net/url"
- "strings"
- "time"
-)
-
-type subredditResponseJson struct {
- Data struct {
- Children []struct {
- Data struct {
- Id string `json:"id"`
- Title string `json:"title"`
- Upvotes int `json:"ups"`
- Url string `json:"url"`
- Time float64 `json:"created"`
- CommentsCount int `json:"num_comments"`
- Domain string `json:"domain"`
- Permalink string `json:"permalink"`
- Stickied bool `json:"stickied"`
- Pinned bool `json:"pinned"`
- IsSelf bool `json:"is_self"`
- Thumbnail string `json:"thumbnail"`
- } `json:"data"`
- } `json:"children"`
- } `json:"data"`
-}
-
-func FetchSubredditPosts(subreddit, sort, topPeriod, search, commentsUrlTemplate, requestUrlTemplate string) (ForumPosts, error) {
- query := url.Values{}
- var requestUrl string
-
- if search != "" {
- query.Set("q", search+" subreddit:"+subreddit)
- query.Set("sort", sort)
- }
-
- if sort == "top" {
- query.Set("t", topPeriod)
- }
-
- if search != "" {
- requestUrl = fmt.Sprintf("https://www.reddit.com/search.json?%s", query.Encode())
- } else {
- requestUrl = fmt.Sprintf("https://www.reddit.com/r/%s/%s.json?%s", subreddit, sort, query.Encode())
- }
-
- if requestUrlTemplate != "" {
- requestUrl = strings.ReplaceAll(requestUrlTemplate, "{REQUEST-URL}", requestUrl)
- }
-
- request, err := http.NewRequest("GET", requestUrl, nil)
-
- if err != nil {
- return nil, err
- }
-
- // Required to increase rate limit, otherwise Reddit randomly returns 429 even after just 2 requests
- addBrowserUserAgentHeader(request)
- responseJson, err := decodeJsonFromRequest[subredditResponseJson](defaultClient, request)
-
- if err != nil {
- return nil, err
- }
-
- if len(responseJson.Data.Children) == 0 {
- return nil, fmt.Errorf("no posts found")
- }
-
- posts := make(ForumPosts, 0, len(responseJson.Data.Children))
-
- for i := range responseJson.Data.Children {
- post := &responseJson.Data.Children[i].Data
-
- if post.Stickied || post.Pinned {
- continue
- }
-
- var commentsUrl string
-
- if commentsUrlTemplate == "" {
- commentsUrl = "https://www.reddit.com" + post.Permalink
- } else {
- commentsUrl = strings.ReplaceAll(commentsUrlTemplate, "{SUBREDDIT}", subreddit)
- commentsUrl = strings.ReplaceAll(commentsUrl, "{POST-ID}", post.Id)
- commentsUrl = strings.ReplaceAll(commentsUrl, "{POST-PATH}", strings.TrimLeft(post.Permalink, "/"))
- }
-
- forumPost := ForumPost{
- Title: html.UnescapeString(post.Title),
- DiscussionUrl: commentsUrl,
- TargetUrlDomain: post.Domain,
- CommentCount: post.CommentsCount,
- Score: post.Upvotes,
- TimePosted: time.Unix(int64(post.Time), 0),
- }
-
- if post.Thumbnail != "" && post.Thumbnail != "self" && post.Thumbnail != "default" {
- forumPost.ThumbnailUrl = post.Thumbnail
- }
-
- if !post.IsSelf {
- forumPost.TargetUrl = post.Url
- }
-
- posts = append(posts, forumPost)
- }
-
- return posts, nil
-}
diff --git a/internal/feed/rss.go b/internal/feed/rss.go
deleted file mode 100644
index 74f064b..0000000
--- a/internal/feed/rss.go
+++ /dev/null
@@ -1,230 +0,0 @@
-package feed
-
-import (
- "context"
- "fmt"
- "html"
- "log/slog"
- "net/url"
- "regexp"
- "sort"
- "strings"
- "time"
-
- "github.com/mmcdole/gofeed"
- gofeedext "github.com/mmcdole/gofeed/extensions"
-)
-
-type RSSFeedItem struct {
- ChannelName string
- ChannelURL string
- Title string
- Link string
- ImageURL string
- Categories []string
- Description string
- PublishedAt time.Time
-}
-
-// doesn't cover all cases but works the vast majority of the time
-var htmlTagsWithAttributesPattern = regexp.MustCompile(`<\/?[a-zA-Z0-9-]+ *(?:[a-zA-Z-]+=(?:"|').*?(?:"|') ?)* *\/?>`)
-var sequentialWhitespacePattern = regexp.MustCompile(`\s+`)
-
-func sanitizeFeedDescription(description string) string {
- if description == "" {
- return ""
- }
-
- description = strings.ReplaceAll(description, "\n", " ")
- description = htmlTagsWithAttributesPattern.ReplaceAllString(description, "")
- description = sequentialWhitespacePattern.ReplaceAllString(description, " ")
- description = strings.TrimSpace(description)
- description = html.UnescapeString(description)
-
- return description
-}
-
-type RSSFeedRequest struct {
- Url string `yaml:"url"`
- Title string `yaml:"title"`
- HideCategories bool `yaml:"hide-categories"`
- HideDescription bool `yaml:"hide-description"`
- ItemLinkPrefix string `yaml:"item-link-prefix"`
-}
-
-type RSSFeedItems []RSSFeedItem
-
-func (f RSSFeedItems) SortByNewest() RSSFeedItems {
- sort.Slice(f, func(i, j int) bool {
- return f[i].PublishedAt.After(f[j].PublishedAt)
- })
-
- return f
-}
-
-var feedParser = gofeed.NewParser()
-
-func getItemsFromRSSFeedTask(request RSSFeedRequest) ([]RSSFeedItem, error) {
- ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
- defer cancel()
-
- feed, err := feedParser.ParseURLWithContext(request.Url, ctx)
-
- if err != nil {
- return nil, err
- }
-
- items := make(RSSFeedItems, 0, len(feed.Items))
-
- for i := range feed.Items {
- item := feed.Items[i]
-
- rssItem := RSSFeedItem{
- ChannelURL: feed.Link,
- Title: item.Title,
- }
-
- if request.ItemLinkPrefix != "" {
- rssItem.Link = request.ItemLinkPrefix + item.Link
- } else if strings.HasPrefix(item.Link, "http://") || strings.HasPrefix(item.Link, "https://") {
- rssItem.Link = item.Link
- } else {
- parsedUrl, err := url.Parse(feed.Link)
-
- if err != nil {
- parsedUrl, err = url.Parse(request.Url)
- }
-
- if err == nil {
- var link string
-
- if item.Link[0] == '/' {
- link = item.Link
- } else {
- link = "/" + item.Link
- }
-
- rssItem.Link = parsedUrl.Scheme + "://" + parsedUrl.Host + link
- }
- }
-
- if !request.HideDescription && item.Description != "" {
- description, _ := limitStringLength(item.Description, 1000)
- description = sanitizeFeedDescription(description)
- description, limited := limitStringLength(description, 200)
-
- if limited {
- description += "…"
- }
-
- rssItem.Description = description
- }
-
- if !request.HideCategories {
- var categories = make([]string, 0, 6)
-
- for _, category := range item.Categories {
- if len(categories) == 6 {
- break
- }
-
- if len(category) == 0 || len(category) > 30 {
- continue
- }
-
- categories = append(categories, category)
- }
-
- rssItem.Categories = categories
- }
-
- if request.Title != "" {
- rssItem.ChannelName = request.Title
- } else {
- rssItem.ChannelName = feed.Title
- }
-
- if item.Image != nil {
- rssItem.ImageURL = item.Image.URL
- } else if url := findThumbnailInItemExtensions(item); url != "" {
- rssItem.ImageURL = url
- } else if feed.Image != nil {
- rssItem.ImageURL = feed.Image.URL
- }
-
- if item.PublishedParsed != nil {
- rssItem.PublishedAt = *item.PublishedParsed
- } else {
- rssItem.PublishedAt = time.Now()
- }
-
- items = append(items, rssItem)
- }
-
- return items, nil
-}
-
-func recursiveFindThumbnailInExtensions(extensions map[string][]gofeedext.Extension) string {
- for _, exts := range extensions {
- for _, ext := range exts {
- if ext.Name == "thumbnail" || ext.Name == "image" {
- if url, ok := ext.Attrs["url"]; ok {
- return url
- }
- }
-
- if ext.Children != nil {
- if url := recursiveFindThumbnailInExtensions(ext.Children); url != "" {
- return url
- }
- }
- }
- }
-
- return ""
-}
-
-func findThumbnailInItemExtensions(item *gofeed.Item) string {
- media, ok := item.Extensions["media"]
-
- if !ok {
- return ""
- }
-
- return recursiveFindThumbnailInExtensions(media)
-}
-
-func GetItemsFromRSSFeeds(requests []RSSFeedRequest) (RSSFeedItems, error) {
- job := newJob(getItemsFromRSSFeedTask, requests).withWorkers(10)
- feeds, errs, err := workerPoolDo(job)
-
- if err != nil {
- return nil, fmt.Errorf("%w: %v", ErrNoContent, err)
- }
-
- failed := 0
-
- entries := make(RSSFeedItems, 0, len(feeds)*10)
-
- for i := range feeds {
- if errs[i] != nil {
- failed++
- slog.Error("failed to get rss feed", "error", errs[i], "url", requests[i].Url)
- continue
- }
-
- entries = append(entries, feeds[i]...)
- }
-
- if len(entries) == 0 {
- return nil, ErrNoContent
- }
-
- entries.SortByNewest()
-
- if failed > 0 {
- return entries, fmt.Errorf("%w: missing %d RSS feeds", ErrPartialContent, failed)
- }
-
- return entries, nil
-}
diff --git a/internal/feed/twitch.go b/internal/feed/twitch.go
deleted file mode 100644
index 1ce9354..0000000
--- a/internal/feed/twitch.go
+++ /dev/null
@@ -1,254 +0,0 @@
-package feed
-
-import (
- "encoding/json"
- "errors"
- "fmt"
- "log/slog"
- "net/http"
- "slices"
- "sort"
- "strings"
- "time"
-)
-
-type TwitchCategory struct {
- Slug string `json:"slug"`
- Name string `json:"name"`
- AvatarUrl string `json:"avatarURL"`
- ViewersCount int `json:"viewersCount"`
- Tags []struct {
- Name string `json:"tagName"`
- } `json:"tags"`
- GameReleaseDate string `json:"originalReleaseDate"`
- IsNew bool `json:"-"`
-}
-
-type TwitchChannel struct {
- Login string
- Exists bool
- Name string
- AvatarUrl string
- IsLive bool
- LiveSince time.Time
- Category string
- CategorySlug string
- ViewersCount int
-}
-
-type TwitchChannels []TwitchChannel
-
-func (channels TwitchChannels) SortByViewers() {
- sort.Slice(channels, func(i, j int) bool {
- return channels[i].ViewersCount > channels[j].ViewersCount
- })
-}
-
-func (channels TwitchChannels) SortByLive() {
- sort.SliceStable(channels, func(i, j int) bool {
- return channels[i].IsLive && !channels[j].IsLive
- })
-}
-
-type twitchOperationResponse struct {
- Data json.RawMessage
- Extensions struct {
- OperationName string `json:"operationName"`
- }
-}
-
-type twitchChannelShellOperationResponse struct {
- UserOrError struct {
- Type string `json:"__typename"`
- DisplayName string `json:"displayName"`
- ProfileImageUrl string `json:"profileImageURL"`
- Stream *struct {
- ViewersCount int `json:"viewersCount"`
- }
- } `json:"userOrError"`
-}
-
-type twitchStreamMetadataOperationResponse struct {
- UserOrNull *struct {
- Stream *struct {
- StartedAt string `json:"createdAt"`
- Game *struct {
- Slug string `json:"slug"`
- Name string `json:"name"`
- } `json:"game"`
- } `json:"stream"`
- } `json:"user"`
-}
-
-type twitchDirectoriesOperationResponse struct {
- Data struct {
- DirectoriesWithTags struct {
- Edges []struct {
- Node TwitchCategory `json:"node"`
- } `json:"edges"`
- } `json:"directoriesWithTags"`
- } `json:"data"`
-}
-
-const twitchGqlEndpoint = "https://gql.twitch.tv/gql"
-const twitchGqlClientId = "kimne78kx3ncx6brgo4mv6wki5h1ko"
-
-const twitchDirectoriesOperationRequestBody = `[{"operationName": "BrowsePage_AllDirectories","variables": {"limit": %d,"options": {"sort": "VIEWER_COUNT","tags": []}},"extensions": {"persistedQuery": {"version": 1,"sha256Hash": "2f67f71ba89f3c0ed26a141ec00da1defecb2303595f5cda4298169549783d9e"}}}]`
-
-func FetchTopGamesFromTwitch(exclude []string, limit int) ([]TwitchCategory, error) {
- reader := strings.NewReader(fmt.Sprintf(twitchDirectoriesOperationRequestBody, len(exclude)+limit))
- request, _ := http.NewRequest("POST", twitchGqlEndpoint, reader)
- request.Header.Add("Client-ID", twitchGqlClientId)
- response, err := decodeJsonFromRequest[[]twitchDirectoriesOperationResponse](defaultClient, request)
-
- if err != nil {
- return nil, err
- }
-
- if len(response) == 0 {
- return nil, errors.New("no categories could be retrieved")
- }
-
- edges := (response)[0].Data.DirectoriesWithTags.Edges
- categories := make([]TwitchCategory, 0, len(edges))
-
- for i := range edges {
- if slices.Contains(exclude, edges[i].Node.Slug) {
- continue
- }
-
- category := &edges[i].Node
- category.AvatarUrl = strings.Replace(category.AvatarUrl, "285x380", "144x192", 1)
-
- if len(category.Tags) > 2 {
- category.Tags = category.Tags[:2]
- }
-
- gameReleasedDate, err := time.Parse("2006-01-02T15:04:05Z", category.GameReleaseDate)
-
- if err == nil {
- if time.Since(gameReleasedDate) < 14*24*time.Hour {
- category.IsNew = true
- }
- }
-
- categories = append(categories, *category)
- }
-
- if len(categories) > limit {
- categories = categories[:limit]
- }
-
- return categories, nil
-}
-
-const twitchChannelStatusOperationRequestBody = `[{"operationName":"ChannelShell","variables":{"login":"%s"},"extensions":{"persistedQuery":{"version":1,"sha256Hash":"580ab410bcd0c1ad194224957ae2241e5d252b2c5173d8e0cce9d32d5bb14efe"}}},{"operationName":"StreamMetadata","variables":{"channelLogin":"%s"},"extensions":{"persistedQuery":{"version":1,"sha256Hash":"676ee2f834ede42eb4514cdb432b3134fefc12590080c9a2c9bb44a2a4a63266"}}}]`
-
-// TODO: rework
-// The operations for multiple channels can all be sent in a single request
-// rather than sending a separate request for each channel. Need to figure out
-// what the limit is for max operations per request and batch operations in
-// multiple requests if number of channels exceeds allowed limit.
-
-func fetchChannelFromTwitchTask(channel string) (TwitchChannel, error) {
- result := TwitchChannel{
- Login: strings.ToLower(channel),
- }
-
- reader := strings.NewReader(fmt.Sprintf(twitchChannelStatusOperationRequestBody, channel, channel))
- request, _ := http.NewRequest("POST", twitchGqlEndpoint, reader)
- request.Header.Add("Client-ID", twitchGqlClientId)
-
- response, err := decodeJsonFromRequest[[]twitchOperationResponse](defaultClient, request)
-
- if err != nil {
- return result, err
- }
-
- if len(response) != 2 {
- return result, fmt.Errorf("expected 2 operation responses, got %d", len(response))
- }
-
- var channelShell twitchChannelShellOperationResponse
- var streamMetadata twitchStreamMetadataOperationResponse
-
- for i := range response {
- switch response[i].Extensions.OperationName {
- case "ChannelShell":
- err = json.Unmarshal(response[i].Data, &channelShell)
-
- if err != nil {
- return result, fmt.Errorf("failed to unmarshal channel shell: %w", err)
- }
- case "StreamMetadata":
- err = json.Unmarshal(response[i].Data, &streamMetadata)
-
- if err != nil {
- return result, fmt.Errorf("failed to unmarshal stream metadata: %w", err)
- }
- default:
- return result, fmt.Errorf("unknown operation name: %s", response[i].Extensions.OperationName)
- }
- }
-
- if channelShell.UserOrError.Type != "User" {
- result.Name = result.Login
- return result, nil
- }
-
- result.Exists = true
- result.Name = channelShell.UserOrError.DisplayName
- result.AvatarUrl = channelShell.UserOrError.ProfileImageUrl
-
- if channelShell.UserOrError.Stream != nil {
- result.IsLive = true
- result.ViewersCount = channelShell.UserOrError.Stream.ViewersCount
-
- if streamMetadata.UserOrNull != nil && streamMetadata.UserOrNull.Stream != nil && streamMetadata.UserOrNull.Stream.Game != nil {
- result.Category = streamMetadata.UserOrNull.Stream.Game.Name
- result.CategorySlug = streamMetadata.UserOrNull.Stream.Game.Slug
- startedAt, err := time.Parse("2006-01-02T15:04:05Z", streamMetadata.UserOrNull.Stream.StartedAt)
-
- if err == nil {
- result.LiveSince = startedAt
- } else {
- slog.Warn("failed to parse twitch stream started at", "error", err, "started_at", streamMetadata.UserOrNull.Stream.StartedAt)
- }
- }
- }
-
- return result, nil
-}
-
-func FetchChannelsFromTwitch(channelLogins []string) (TwitchChannels, error) {
- result := make(TwitchChannels, 0, len(channelLogins))
-
- job := newJob(fetchChannelFromTwitchTask, channelLogins).withWorkers(10)
- channels, errs, err := workerPoolDo(job)
-
- if err != nil {
- return result, err
- }
-
- var failed int
-
- for i := range channels {
- if errs[i] != nil {
- failed++
- slog.Warn("failed to fetch twitch channel", "channel", channelLogins[i], "error", errs[i])
- continue
- }
-
- result = append(result, channels[i])
- }
-
- if failed == len(channelLogins) {
- return result, ErrNoContent
- }
-
- if failed > 0 {
- return result, fmt.Errorf("%w: failed to fetch %d channels", ErrPartialContent, failed)
- }
-
- return result, nil
-}
diff --git a/internal/feed/utils.go b/internal/feed/utils.go
deleted file mode 100644
index 16c376b..0000000
--- a/internal/feed/utils.go
+++ /dev/null
@@ -1,97 +0,0 @@
-package feed
-
-import (
- "errors"
- "fmt"
- "net/url"
- "regexp"
- "slices"
- "strings"
-)
-
-var (
- ErrNoContent = errors.New("failed to retrieve any content")
- ErrPartialContent = errors.New("failed to retrieve some of the content")
-)
-
-func percentChange(current, previous float64) float64 {
- return (current/previous - 1) * 100
-}
-
-func extractDomainFromUrl(u string) string {
- if u == "" {
- return ""
- }
-
- parsed, err := url.Parse(u)
-
- if err != nil {
- return ""
- }
-
- return strings.TrimPrefix(strings.ToLower(parsed.Host), "www.")
-}
-
-func SvgPolylineCoordsFromYValues(width float64, height float64, values []float64) string {
- if len(values) < 2 {
- return ""
- }
-
- verticalPadding := height * 0.02
- height -= verticalPadding * 2
- coordinates := make([]string, len(values))
- distanceBetweenPoints := width / float64(len(values)-1)
- min := slices.Min(values)
- max := slices.Max(values)
-
- for i := range values {
- coordinates[i] = fmt.Sprintf(
- "%.2f,%.2f",
- float64(i)*distanceBetweenPoints,
- ((max-values[i])/(max-min))*height+verticalPadding,
- )
- }
-
- return strings.Join(coordinates, " ")
-}
-
-func maybeCopySliceWithoutZeroValues[T int | float64](values []T) []T {
- if len(values) == 0 {
- return values
- }
-
- for i := range values {
- if values[i] != 0 {
- continue
- }
-
- c := make([]T, 0, len(values)-1)
-
- for i := range values {
- if values[i] != 0 {
- c = append(c, values[i])
- }
- }
-
- return c
- }
-
- return values
-}
-
-
-var urlSchemePattern = regexp.MustCompile(`^[a-z]+:\/\/`)
-
-func stripURLScheme(url string) string {
- return urlSchemePattern.ReplaceAllString(url, "")
-}
-
-func limitStringLength(s string, max int) (string, bool) {
- asRunes := []rune(s)
-
- if len(asRunes) > max {
- return string(asRunes[:max]), true
- }
-
- return s, false
-}
diff --git a/internal/feed/yahoo.go b/internal/feed/yahoo.go
deleted file mode 100644
index f962695..0000000
--- a/internal/feed/yahoo.go
+++ /dev/null
@@ -1,104 +0,0 @@
-package feed
-
-import (
- "fmt"
- "log/slog"
- "net/http"
-)
-
-type marketResponseJson struct {
- Chart struct {
- Result []struct {
- Meta struct {
- Currency string `json:"currency"`
- Symbol string `json:"symbol"`
- RegularMarketPrice float64 `json:"regularMarketPrice"`
- ChartPreviousClose float64 `json:"chartPreviousClose"`
- } `json:"meta"`
- Indicators struct {
- Quote []struct {
- Close []float64 `json:"close,omitempty"`
- } `json:"quote"`
- } `json:"indicators"`
- } `json:"result"`
- } `json:"chart"`
-}
-
-// TODO: allow changing chart time frame
-const marketChartDays = 21
-
-func FetchMarketsDataFromYahoo(marketRequests []MarketRequest) (Markets, error) {
- requests := make([]*http.Request, 0, len(marketRequests))
-
- for i := range marketRequests {
- request, _ := http.NewRequest("GET", fmt.Sprintf("https://query1.finance.yahoo.com/v8/finance/chart/%s?range=1mo&interval=1d", marketRequests[i].Symbol), nil)
- requests = append(requests, request)
- }
-
- job := newJob(decodeJsonFromRequestTask[marketResponseJson](defaultClient), requests)
- responses, errs, err := workerPoolDo(job)
-
- if err != nil {
- return nil, fmt.Errorf("%w: %v", ErrNoContent, err)
- }
-
- markets := make(Markets, 0, len(responses))
- var failed int
-
- for i := range responses {
- if errs[i] != nil {
- failed++
- slog.Error("Failed to fetch market data", "symbol", marketRequests[i].Symbol, "error", errs[i])
- continue
- }
-
- response := responses[i]
-
- if len(response.Chart.Result) == 0 {
- failed++
- slog.Error("Market response contains no data", "symbol", marketRequests[i].Symbol)
- continue
- }
-
- prices := response.Chart.Result[0].Indicators.Quote[0].Close
-
- if len(prices) > marketChartDays {
- prices = prices[len(prices)-marketChartDays:]
- }
-
- previous := response.Chart.Result[0].Meta.RegularMarketPrice
-
- if len(prices) >= 2 && prices[len(prices)-2] != 0 {
- previous = prices[len(prices)-2]
- }
-
- points := SvgPolylineCoordsFromYValues(100, 50, maybeCopySliceWithoutZeroValues(prices))
-
- currency, exists := currencyToSymbol[response.Chart.Result[0].Meta.Currency]
-
- if !exists {
- currency = response.Chart.Result[0].Meta.Currency
- }
-
- markets = append(markets, Market{
- MarketRequest: marketRequests[i],
- Price: response.Chart.Result[0].Meta.RegularMarketPrice,
- Currency: currency,
- PercentChange: percentChange(
- response.Chart.Result[0].Meta.RegularMarketPrice,
- previous,
- ),
- SvgChartPoints: points,
- })
- }
-
- if len(markets) == 0 {
- return nil, ErrNoContent
- }
-
- if failed > 0 {
- return markets, fmt.Errorf("%w: could not fetch data for %d market(s)", ErrPartialContent, failed)
- }
-
- return markets, nil
-}
diff --git a/internal/feed/youtube.go b/internal/feed/youtube.go
deleted file mode 100644
index e478259..0000000
--- a/internal/feed/youtube.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package feed
-
-import (
- "fmt"
- "log/slog"
- "net/http"
- "net/url"
- "strings"
- "time"
-)
-
-type youtubeFeedResponseXml struct {
- Channel string `xml:"title"`
- ChannelLink struct {
- Href string `xml:"href,attr"`
- } `xml:"link"`
- Videos []struct {
- Title string `xml:"title"`
- Published string `xml:"published"`
- Link struct {
- Href string `xml:"href,attr"`
- } `xml:"link"`
-
- Group struct {
- Thumbnail struct {
- Url string `xml:"url,attr"`
- } `xml:"http://search.yahoo.com/mrss/ thumbnail"`
- } `xml:"http://search.yahoo.com/mrss/ group"`
- } `xml:"entry"`
-}
-
-func parseYoutubeFeedTime(t string) time.Time {
- parsedTime, err := time.Parse("2006-01-02T15:04:05-07:00", t)
-
- if err != nil {
- return time.Now()
- }
-
- return parsedTime
-}
-
-func FetchYoutubeChannelUploads(channelIds []string, videoUrlTemplate string) (Videos, error) {
- requests := make([]*http.Request, 0, len(channelIds))
-
- for i := range channelIds {
- request, _ := http.NewRequest("GET", "https://www.youtube.com/feeds/videos.xml?channel_id="+channelIds[i], nil)
- requests = append(requests, request)
- }
-
- job := newJob(decodeXmlFromRequestTask[youtubeFeedResponseXml](defaultClient), requests).withWorkers(30)
-
- responses, errs, err := workerPoolDo(job)
-
- if err != nil {
- return nil, fmt.Errorf("%w: %v", ErrNoContent, err)
- }
-
- videos := make(Videos, 0, len(channelIds)*15)
-
- var failed int
-
- for i := range responses {
- if errs[i] != nil {
- failed++
- slog.Error("Failed to fetch youtube feed", "channel", channelIds[i], "error", errs[i])
- continue
- }
-
- response := responses[i]
-
- for j := range response.Videos {
- video := &response.Videos[j]
-
- // TODO: figure out a better way of skipping shorts
- if strings.Contains(video.Title, "#shorts") {
- continue
- }
-
- var videoUrl string
-
- if videoUrlTemplate == "" {
- videoUrl = video.Link.Href
- } else {
- parsedUrl, err := url.Parse(video.Link.Href)
-
- if err == nil {
- videoUrl = strings.ReplaceAll(videoUrlTemplate, "{VIDEO-ID}", parsedUrl.Query().Get("v"))
- } else {
- videoUrl = "#"
- }
- }
-
- videos = append(videos, Video{
- ThumbnailUrl: video.Group.Thumbnail.Url,
- Title: video.Title,
- Url: videoUrl,
- Author: response.Channel,
- AuthorUrl: response.ChannelLink.Href + "/videos",
- TimePosted: parseYoutubeFeedTime(video.Published),
- })
- }
- }
-
- if len(videos) == 0 {
- return nil, ErrNoContent
- }
-
- videos.SortByNewest()
-
- if failed > 0 {
- return videos, fmt.Errorf("%w: missing videos from %d channels", ErrPartialContent, failed)
- }
-
- return videos, nil
-}
diff --git a/internal/glance/cli.go b/internal/glance/cli.go
index 5987368..f5a16fb 100644
--- a/internal/glance/cli.go
+++ b/internal/glance/cli.go
@@ -2,41 +2,138 @@ package glance
import (
"flag"
+ "fmt"
"os"
+ "strings"
+
+ "github.com/shirou/gopsutil/v4/disk"
+ "github.com/shirou/gopsutil/v4/sensors"
)
-type CliIntent uint8
+type cliIntent uint8
const (
- CliIntentServe CliIntent = iota
- CliIntentCheckConfig = iota
+ cliIntentVersionPrint cliIntent = iota
+ cliIntentServe
+ cliIntentConfigValidate
+ cliIntentConfigPrint
+ cliIntentDiagnose
+ cliIntentSensorsPrint
+ cliIntentMountpointInfo
)
-type CliOptions struct {
- Intent CliIntent
- ConfigPath string
+type cliOptions struct {
+ intent cliIntent
+ configPath string
+ args []string
}
-func ParseCliOptions() (*CliOptions, error) {
+func parseCliOptions() (*cliOptions, error) {
+ var args []string
+
+ args = os.Args[1:]
+ if len(args) == 1 && (args[0] == "--version" || args[0] == "-v" || args[0] == "version") {
+ return &cliOptions{
+ intent: cliIntentVersionPrint,
+ }, nil
+ }
+
flags := flag.NewFlagSet("", flag.ExitOnError)
+ flags.Usage = func() {
+ fmt.Println("Usage: glance [options] command")
- checkConfig := flags.Bool("check-config", false, "Check whether the config is valid")
+ fmt.Println("\nOptions:")
+ flags.PrintDefaults()
+
+ fmt.Println("\nCommands:")
+ fmt.Println(" config:validate Validate the config file")
+ fmt.Println(" config:print Print the parsed config file with embedded includes")
+ fmt.Println(" sensors:print List all sensors")
+ fmt.Println(" mountpoint:info Print information about a given mountpoint path")
+ fmt.Println(" diagnose Run diagnostic checks")
+ }
configPath := flags.String("config", "glance.yml", "Set config path")
-
err := flags.Parse(os.Args[1:])
-
if err != nil {
return nil, err
}
- intent := CliIntentServe
+ var intent cliIntent
+ args = flags.Args()
+ unknownCommandErr := fmt.Errorf("unknown command: %s", strings.Join(args, " "))
- if *checkConfig {
- intent = CliIntentCheckConfig
+ if len(args) == 0 {
+ intent = cliIntentServe
+ } else if len(args) == 1 {
+ if args[0] == "config:validate" {
+ intent = cliIntentConfigValidate
+ } else if args[0] == "config:print" {
+ intent = cliIntentConfigPrint
+ } else if args[0] == "sensors:print" {
+ intent = cliIntentSensorsPrint
+ } else if args[0] == "diagnose" {
+ intent = cliIntentDiagnose
+ } else {
+ return nil, unknownCommandErr
+ }
+ } else if len(args) == 2 {
+ if args[0] == "mountpoint:info" {
+ intent = cliIntentMountpointInfo
+ } else {
+ return nil, unknownCommandErr
+ }
+ } else {
+ return nil, unknownCommandErr
}
- return &CliOptions{
- Intent: intent,
- ConfigPath: *configPath,
+ return &cliOptions{
+ intent: intent,
+ configPath: *configPath,
+ args: args,
}, nil
}
+
+func cliSensorsPrint() int {
+ tempSensors, err := sensors.SensorsTemperatures()
+ if err != nil {
+ fmt.Printf("Failed to retrieve list of sensors: %v\n", err)
+ if warns, ok := err.(*sensors.Warnings); ok {
+ for _, w := range warns.List {
+ fmt.Printf(" - %v\n", w)
+ }
+ }
+
+ return 1
+ }
+
+ if len(tempSensors) == 0 {
+ fmt.Println("No sensors found")
+ return 0
+ }
+
+ for _, sensor := range tempSensors {
+ fmt.Printf("%s: %.1f°C\n", sensor.SensorKey, sensor.Temperature)
+ }
+
+ return 0
+}
+
+func cliMountpointInfo(requestedPath string) int {
+ usage, err := disk.Usage(requestedPath)
+ if err != nil {
+ fmt.Printf("Failed to retrieve info for path %s: %v\n", requestedPath, err)
+ if warns, ok := err.(*disk.Warnings); ok {
+ for _, w := range warns.List {
+ fmt.Printf(" - %v\n", w)
+ }
+ }
+
+ return 1
+ }
+
+ fmt.Println("Path:", usage.Path)
+ fmt.Println("FS type:", ternary(usage.Fstype == "", "unknown", usage.Fstype))
+ fmt.Printf("Used percent: %.1f%%\n", usage.UsedPercent)
+
+ return 0
+}
diff --git a/internal/glance/config-fields.go b/internal/glance/config-fields.go
new file mode 100644
index 0000000..e2ece3f
--- /dev/null
+++ b/internal/glance/config-fields.go
@@ -0,0 +1,276 @@
+package glance
+
+import (
+ "crypto/tls"
+ "fmt"
+ "net/http"
+ "net/url"
+ "regexp"
+ "strconv"
+ "strings"
+ "time"
+
+ "gopkg.in/yaml.v3"
+)
+
+var hslColorFieldPattern = regexp.MustCompile(`^(?:hsla?\()?(\d{1,3})(?: |,)+(\d{1,3})%?(?: |,)+(\d{1,3})%?\)?$`)
+
+const (
+ hslHueMax = 360
+ hslSaturationMax = 100
+ hslLightnessMax = 100
+)
+
+type hslColorField struct {
+ Hue uint16
+ Saturation uint8
+ Lightness uint8
+}
+
+func (c *hslColorField) String() string {
+ return fmt.Sprintf("hsl(%d, %d%%, %d%%)", c.Hue, c.Saturation, c.Lightness)
+}
+
+func (c *hslColorField) UnmarshalYAML(node *yaml.Node) error {
+ var value string
+
+ if err := node.Decode(&value); err != nil {
+ return err
+ }
+
+ matches := hslColorFieldPattern.FindStringSubmatch(value)
+
+ if len(matches) != 4 {
+ return fmt.Errorf("invalid HSL color format: %s", value)
+ }
+
+ hue, err := strconv.ParseUint(matches[1], 10, 16)
+ if err != nil {
+ return err
+ }
+
+ if hue > hslHueMax {
+ return fmt.Errorf("HSL hue must be between 0 and %d", hslHueMax)
+ }
+
+ saturation, err := strconv.ParseUint(matches[2], 10, 8)
+ if err != nil {
+ return err
+ }
+
+ if saturation > hslSaturationMax {
+ return fmt.Errorf("HSL saturation must be between 0 and %d", hslSaturationMax)
+ }
+
+ lightness, err := strconv.ParseUint(matches[3], 10, 8)
+ if err != nil {
+ return err
+ }
+
+ if lightness > hslLightnessMax {
+ return fmt.Errorf("HSL lightness must be between 0 and %d", hslLightnessMax)
+ }
+
+ c.Hue = uint16(hue)
+ c.Saturation = uint8(saturation)
+ c.Lightness = uint8(lightness)
+
+ return nil
+}
+
+var durationFieldPattern = regexp.MustCompile(`^(\d+)(s|m|h|d)$`)
+
+type durationField time.Duration
+
+func (d *durationField) UnmarshalYAML(node *yaml.Node) error {
+ var value string
+
+ if err := node.Decode(&value); err != nil {
+ return err
+ }
+
+ matches := durationFieldPattern.FindStringSubmatch(value)
+
+ if len(matches) != 3 {
+ return fmt.Errorf("invalid duration format: %s", value)
+ }
+
+ duration, err := strconv.Atoi(matches[1])
+ if err != nil {
+ return err
+ }
+
+ switch matches[2] {
+ case "s":
+ *d = durationField(time.Duration(duration) * time.Second)
+ case "m":
+ *d = durationField(time.Duration(duration) * time.Minute)
+ case "h":
+ *d = durationField(time.Duration(duration) * time.Hour)
+ case "d":
+ *d = durationField(time.Duration(duration) * 24 * time.Hour)
+ }
+
+ return nil
+}
+
+type customIconField struct {
+ URL string
+ IsFlatIcon bool
+ // TODO: along with whether the icon is flat, we also need to know
+ // whether the icon is black or white by default in order to properly
+ // invert the color based on the theme being light or dark
+}
+
+func newCustomIconField(value string) customIconField {
+ field := customIconField{}
+
+ prefix, icon, found := strings.Cut(value, ":")
+ if !found {
+ field.URL = value
+ return field
+ }
+
+ switch prefix {
+ case "si":
+ field.URL = "https://cdn.jsdelivr.net/npm/simple-icons@latest/icons/" + icon + ".svg"
+ field.IsFlatIcon = true
+ case "di", "sh":
+ // syntax: di:{{ .Place.Name }},{{ if .ShowAreaName }} {{ .Place.Area }},{{ end }} {{ .Place.Country }}
-
+ {{ range .Groups }}
+
+{{ end }}
diff --git a/internal/glance/templates/calendar.html b/internal/glance/templates/calendar.html
new file mode 100644
index 0000000..b3c4a69
--- /dev/null
+++ b/internal/glance/templates/calendar.html
@@ -0,0 +1,7 @@
+{{ template "widget-base.html" . }}
+
+{{ define "widget-content" }}
+
+{{ end }}
diff --git a/internal/assets/templates/change-detection.html b/internal/glance/templates/change-detection.html
similarity index 100%
rename from internal/assets/templates/change-detection.html
rename to internal/glance/templates/change-detection.html
diff --git a/internal/assets/templates/clock.html b/internal/glance/templates/clock.html
similarity index 100%
rename from internal/assets/templates/clock.html
rename to internal/glance/templates/clock.html
diff --git a/internal/glance/templates/custom-api.html b/internal/glance/templates/custom-api.html
new file mode 100644
index 0000000..e1f1f6f
--- /dev/null
+++ b/internal/glance/templates/custom-api.html
@@ -0,0 +1,7 @@
+{{ template "widget-base.html" . }}
+
+{{ define "widget-content-classes" }}{{ if .Frameless }}widget-content-frameless{{ end }}{{ end }}
+
+{{ define "widget-content" }}
+{{ .CompiledHTML }}
+{{ end }}
diff --git a/internal/glance/templates/dns-stats.html b/internal/glance/templates/dns-stats.html
new file mode 100644
index 0000000..bb4222c
--- /dev/null
+++ b/internal/glance/templates/dns-stats.html
@@ -0,0 +1,88 @@
+{{ template "widget-base.html" . }}
+
+{{ define "widget-content" }}
+
+{{ end }}
diff --git a/internal/glance/templates/docker-containers.html b/internal/glance/templates/docker-containers.html
new file mode 100644
index 0000000..d84e9a6
--- /dev/null
+++ b/internal/glance/templates/docker-containers.html
@@ -0,0 +1,66 @@
+{{ template "widget-base.html" . }}
+
+{{- define "widget-content" }}
+
+ {{ if ne .Title "" }}
+ {{ end }}
+{{ .Title }}
{{ end }}
+ -
+ {{ range .Links }}
+
-
+ {{ if ne "" .Icon.URL }}
+ ++ {{ end }} + {{ .Title }} +
+
+ {{ end }}
+
-
+ {{- range .Containers }}
+
-
+
+
+ + {{- if .URL }} + {{ .Title }} + {{- else }} ++ +{{ .Title }}+ {{- end }} + {{- if .Description }} +{{ .Description }}+ {{- end }} ++ {{ template "state-icon" .StateIcon }} ++ + +
+ {{- else }}
+
No containers available to show.
+ {{- end }}
+-
+ {{- range .Posts }}
+
-
+ + {{- if $.ShowThumbnails }} + {{- if .IsCrosspost }} + + {{- else if .ThumbnailUrl }} +++ {{ .Title }} + {{- if .Tags }} + + {{- end }} ++
-
+
+
- {{ .Score | formatApproxNumber }} points +
- {{ .CommentCount | formatApproxNumber }} comments + {{- if .TargetUrl }} +
- {{ .TargetUrlDomain }} + {{- end }} +
+ {{- end }}
+
+ {{ range .Markets }}
+
+{{ end }}
diff --git a/internal/glance/templates/monitor-compact.html b/internal/glance/templates/monitor-compact.html
new file mode 100644
index 0000000..dca5683
--- /dev/null
+++ b/internal/glance/templates/monitor-compact.html
@@ -0,0 +1,39 @@
+{{ template "widget-base.html" . }}
+
+{{ define "widget-content" }}
+{{ if not (and .ShowFailingOnly (not .HasFailing)) }}
+
+
+ {{ end }}
+
+ {{ .Symbol }}
+
+
+
+
+
+
+ {{ .Name }}
+
+
+ {{ printf "%+.2f" .PercentChange }}%
+ {{ .Currency }}{{ .Price | formatPriceWithPrecision .PriceHint }}
+ -
+ {{ range .Sites }}
+ {{ if and $.ShowFailingOnly (eq .StatusStyle "ok" ) }}{{ continue }}{{ end }}
+
+ {{ template "site" . }}
+
+ {{ end }}
+
+
+{{ end }}
+{{ end }}
+
+{{ define "site" }}
+{{ .Title }}
+{{ if not .Status.TimedOut }}All sites are online
+ +{{ .Status.ResponseTime.Milliseconds | formatNumber }}ms
{{ end }}
+{{ if eq .StatusStyle "ok" }}
+
+{{ else }}
+
+{{ end }}
+{{ end }}
diff --git a/internal/glance/templates/monitor.html b/internal/glance/templates/monitor.html
new file mode 100644
index 0000000..7e95b99
--- /dev/null
+++ b/internal/glance/templates/monitor.html
@@ -0,0 +1,53 @@
+{{ template "widget-base.html" . }}
+
+{{ define "widget-content" }}
+{{ if not (and .ShowFailingOnly (not .HasFailing)) }}
+-
+ {{ range .Sites }}
+ {{ if and $.ShowFailingOnly (eq .StatusStyle "ok" ) }} {{ continue }} {{ end }}
+
+ {{ template "site" . }}
+
+ {{ end }}
+
+
+{{ end }}
+{{ end }}
+
+{{ define "site" }}
+{{ if .Icon.URL }}
+All sites are online
+ +
+ {{ .Title }}
+
+{{ if eq .StatusStyle "ok" }}
+
+{{ else }}
+
+{{ end }}
+{{ end }}
diff --git a/internal/glance/templates/old-calendar.html b/internal/glance/templates/old-calendar.html
new file mode 100644
index 0000000..b43d43d
--- /dev/null
+++ b/internal/glance/templates/old-calendar.html
@@ -0,0 +1,34 @@
+{{ template "widget-base.html" . }}
+
+{{ define "widget-content" }}
+
+{{ end }}
diff --git a/internal/assets/templates/content.html b/internal/glance/templates/page-content.html
similarity index 100%
rename from internal/assets/templates/content.html
rename to internal/glance/templates/page-content.html
diff --git a/internal/glance/templates/page.html b/internal/glance/templates/page.html
new file mode 100644
index 0000000..90f7177
--- /dev/null
+++ b/internal/glance/templates/page.html
@@ -0,0 +1,85 @@
+{{ template "document.html" . }}
+
+{{ define "document-title" }}{{ .Page.Title }}{{ end }}
+
+{{ define "document-head-before" }}
+
+{{ end }}
+
+{{ define "document-root-attrs" }}class="{{ if .App.Config.Theme.Light }}light-scheme {{ end }}{{ if ne "" .Page.Width }}page-width-{{ .Page.Width }} {{ end }}{{ if .Page.CenterVertically }}page-center-vertically{{ end }}"{{ end }}
+
+{{ define "document-head-after" }}
+{{ .App.ParsedThemeStyle }}
+
+{{ if ne "" .App.Config.Theme.CustomCSSFile }}
+
+{{ end }}
+
+{{ if ne "" .App.Config.Document.Head }}{{ .App.Config.Document.Head }}{{ end }}
+{{ end }}
+
+{{ define "navigation-links" }}
+{{ range .App.Config.Pages }}
+{{ .Title }}
+{{ end }}
+{{ end }}
+
+{{ define "document-body" }}
+-
+ {{ if not .Status.Error }}
+
- {{ .StatusText }} +
- {{ .Status.ResponseTime.Milliseconds | formatNumber }}ms + {{ else if .Status.TimedOut }} +
- Timed Out + {{ else }} +
- ERROR + {{ end }} +
+ {{ if not .Page.HideDesktopNavigation }}
+
+{{ end }}
diff --git a/internal/assets/templates/reddit-horizontal-cards.html b/internal/glance/templates/reddit-horizontal-cards.html
similarity index 81%
rename from internal/assets/templates/reddit-horizontal-cards.html
rename to internal/glance/templates/reddit-horizontal-cards.html
index 2012435..9ee31b3 100644
--- a/internal/assets/templates/reddit-horizontal-cards.html
+++ b/internal/glance/templates/reddit-horizontal-cards.html
@@ -18,10 +18,10 @@
{{ else }}
+
+ {{ end }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ if not .App.Config.Branding.HideFooter }}
+
+ {{ end }}
+
+
+/r/{{ $.Subreddit }}
{{ end }}
- {{ .Title }}
+ {{ .Title }}
-
-
- {{ .Score | formatNumber }} points +
- {{ .Score | formatApproxNumber }} points
/r/{{ $.Subreddit }}
{{ end }}
- {{ .Title }}
+ {{ .Title }}
-
-
- {{ .Score | formatNumber }} points +
- {{ .Score | formatApproxNumber }} points
-
+ {{ range .Releases }}
+
-
+ + {{ .Name }} + {{ if $.ShowSourceIcon }} ++
+ {{ end }} +
-
+
+
- {{ .Version }} + {{ if gt .Downvotes 3 }} +
- {{ .Downvotes | formatNumber }} ⚠ + {{ end }} +
+ {{ end }}
+
-
+
- {{ .Repository.Stars | formatNumber }} stars +
- {{ .Repository.Forks | formatNumber }} forks +
+Last {{ .CommitsLimit }} commits +
+
+{{ end }}
+
+{{ if gt (len .Repository.PullRequests) 0 }}
+-
+ {{ range .Repository.Commits }}
+
+ {{ end }}
+
-
+ {{ range .Repository.Commits }}
+
- {{ .Message }} + {{ end }} +
+Open pull requests ({{ .Repository.OpenPullRequests | formatNumber }} total) +
+
+{{ end }}
+
+{{ if gt (len .Repository.Issues) 0 }}
+-
+ {{ range .Repository.PullRequests }}
+
+ {{ end }}
+
-
+ {{ range .Repository.PullRequests }}
+
- {{ .Title }} + {{ end }} +
+Open issues ({{ .Repository.OpenIssues | formatNumber }} total) +
+
+{{ end }}
+
+{{ end }}
diff --git a/internal/assets/templates/rss-detailed-list.html b/internal/glance/templates/rss-detailed-list.html
similarity index 97%
rename from internal/assets/templates/rss-detailed-list.html
rename to internal/glance/templates/rss-detailed-list.html
index a926002..311923d 100644
--- a/internal/assets/templates/rss-detailed-list.html
+++ b/internal/glance/templates/rss-detailed-list.html
@@ -33,6 +33,8 @@
{{ end }}
+ {{ else }}
+ -
+ {{ range .Repository.Issues }}
+
+ {{ end }}
+
-
+ {{ range .Repository.Issues }}
+
- {{ .Title }} + {{ end }} +
{{ range .Items }}
@@ -15,7 +16,7 @@
{{ end }}
+{{ else }}
+
+{{ end }}
{{ end }}
diff --git a/internal/assets/templates/rss-horizontal-cards.html b/internal/glance/templates/rss-horizontal-cards.html
similarity index 84%
rename from internal/assets/templates/rss-horizontal-cards.html
rename to internal/glance/templates/rss-horizontal-cards.html
index b9eabf7..d8eef92 100644
--- a/internal/assets/templates/rss-horizontal-cards.html
+++ b/internal/glance/templates/rss-horizontal-cards.html
@@ -3,6 +3,7 @@
{{ define "widget-content-classes" }}widget-content-frameless{{ end }}
{{ define "widget-content" }}
+{{ if gt (len .Items) 0 }}
{{ range .Items }}
@@ -15,7 +16,7 @@
{{ end }}
+{{ else }}
+
+{{ end }}
{{ end }}
diff --git a/internal/assets/templates/rss-list.html b/internal/glance/templates/rss-list.html
similarity index 57%
rename from internal/assets/templates/rss-list.html
rename to internal/glance/templates/rss-list.html
index 8116232..c14eb60 100644
--- a/internal/assets/templates/rss-list.html
+++ b/internal/glance/templates/rss-list.html
@@ -1,10 +1,10 @@
{{ template "widget-base.html" . }}
{{ define "widget-content" }}
--
+
-
- {{ .Title }}
+ {{ .Title }}
- @@ -12,6 +12,8 @@
+ {{ else }}
+ - {{ .NoItemsMessage }} {{ end }}
-
{{ range .Items }}
+{{ range .Widgets }}
+ {{ .Render }}
+{{ end }}
+
+{{ end }}
diff --git a/internal/glance/templates/theme-style.gotmpl b/internal/glance/templates/theme-style.gotmpl
new file mode 100644
index 0000000..878ca0b
--- /dev/null
+++ b/internal/glance/templates/theme-style.gotmpl
@@ -0,0 +1,14 @@
+
diff --git a/internal/assets/templates/twitch-channels.html b/internal/glance/templates/twitch-channels.html
similarity index 57%
rename from internal/assets/templates/twitch-channels.html
rename to internal/glance/templates/twitch-channels.html
index f053122..021a17a 100644
--- a/internal/assets/templates/twitch-channels.html
+++ b/internal/glance/templates/twitch-channels.html
@@ -5,9 +5,17 @@
{{ range .Channels }}
-
+
+