{{ range .Videos }}
{{ template "video-card-contents" . }}
diff --git a/internal/feed/twitch.go b/internal/feed/twitch.go
index 1ff82ee..1ce9354 100644
--- a/internal/feed/twitch.go
+++ b/internal/feed/twitch.go
@@ -44,6 +44,12 @@ func (channels TwitchChannels) SortByViewers() {
})
}
+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 {
diff --git a/internal/glance/main.go b/internal/glance/main.go
index 5eee962..426c41f 100644
--- a/internal/glance/main.go
+++ b/internal/glance/main.go
@@ -36,7 +36,7 @@ func Main() int {
return 1
}
- if app.Serve() != nil {
+ if err := app.Serve(); err != nil {
fmt.Printf("http server error: %v\n", err)
return 1
}
diff --git a/internal/widget/twitch-channels.go b/internal/widget/twitch-channels.go
index 3f36669..3b728b8 100644
--- a/internal/widget/twitch-channels.go
+++ b/internal/widget/twitch-channels.go
@@ -14,6 +14,7 @@ type TwitchChannels struct {
ChannelsRequest []string `yaml:"channels"`
Channels []feed.TwitchChannel `yaml:"-"`
CollapseAfter int `yaml:"collapse-after"`
+ SortBy string `yaml:"sort-by"`
}
func (widget *TwitchChannels) Initialize() error {
@@ -23,6 +24,10 @@ func (widget *TwitchChannels) Initialize() error {
widget.CollapseAfter = 5
}
+ if widget.SortBy != "viewers" && widget.SortBy != "live" {
+ widget.SortBy = "viewers"
+ }
+
return nil
}
@@ -33,7 +38,12 @@ func (widget *TwitchChannels) Update(ctx context.Context) {
return
}
- channels.SortByViewers()
+ if widget.SortBy == "viewers" {
+ channels.SortByViewers()
+ } else if widget.SortBy == "live" {
+ channels.SortByLive()
+ }
+
widget.Channels = channels
}
diff --git a/internal/widget/videos.go b/internal/widget/videos.go
index 252c8ff..717f302 100644
--- a/internal/widget/videos.go
+++ b/internal/widget/videos.go
@@ -10,12 +10,13 @@ import (
)
type Videos struct {
- widgetBase `yaml:",inline"`
- Videos feed.Videos `yaml:"-"`
- VideoUrlTemplate string `yaml:"video-url-template"`
- Style string `yaml:"style"`
- Channels []string `yaml:"channels"`
- Limit int `yaml:"limit"`
+ widgetBase `yaml:",inline"`
+ Videos feed.Videos `yaml:"-"`
+ VideoUrlTemplate string `yaml:"video-url-template"`
+ Style string `yaml:"style"`
+ CollapseAfterRows int `yaml:"collapse-after-rows"`
+ Channels []string `yaml:"channels"`
+ Limit int `yaml:"limit"`
}
func (widget *Videos) Initialize() error {
@@ -25,6 +26,10 @@ func (widget *Videos) Initialize() error {
widget.Limit = 25
}
+ if widget.CollapseAfterRows == 0 || widget.CollapseAfterRows < -1 {
+ widget.CollapseAfterRows = 4
+ }
+
return nil
}
diff --git a/internal/widget/weather.go b/internal/widget/weather.go
index 9d90e03..618237d 100644
--- a/internal/widget/weather.go
+++ b/internal/widget/weather.go
@@ -14,17 +14,26 @@ type Weather struct {
Location string `yaml:"location"`
ShowAreaName bool `yaml:"show-area-name"`
HideLocation bool `yaml:"hide-location"`
+ HourFormat string `yaml:"hour-format"`
Units string `yaml:"units"`
Place *feed.PlaceJson `yaml:"-"`
Weather *feed.Weather `yaml:"-"`
TimeLabels [12]string `yaml:"-"`
}
-var timeLabels = [12]string{"2am", "4am", "6am", "8am", "10am", "12pm", "2pm", "4pm", "6pm", "8pm", "10pm", "12am"}
+var timeLabels12h = [12]string{"2am", "4am", "6am", "8am", "10am", "12pm", "2pm", "4pm", "6pm", "8pm", "10pm", "12am"}
+var timeLabels24h = [12]string{"02:00", "04:00", "06:00", "08:00", "10:00", "12:00", "14:00", "16:00", "18:00", "20:00", "22:00", "00:00"}
func (widget *Weather) Initialize() error {
widget.withTitle("Weather").withCacheOnTheHour()
- widget.TimeLabels = timeLabels
+
+ if widget.HourFormat == "" || widget.HourFormat == "12h" {
+ widget.TimeLabels = timeLabels12h
+ } else if widget.HourFormat == "24h" {
+ widget.TimeLabels = timeLabels24h
+ } else {
+ return fmt.Errorf("invalid hour format '%s' for weather widget, must be either 12h or 24h", widget.HourFormat)
+ }
if widget.Units == "" {
widget.Units = "metric"
diff --git a/scripts/build-and-ship/main.go b/scripts/build-and-ship/main.go
index b371a80..e6b539d 100644
--- a/scripts/build-and-ship/main.go
+++ b/scripts/build-and-ship/main.go
@@ -1,6 +1,7 @@
package main
import (
+ "flag"
"fmt"
"os"
"os/exec"
@@ -77,7 +78,40 @@ var buildTargets = []buildTarget{
},
}
+func hasUncommitedChanges() (bool, error) {
+ output, err := exec.Command("git", "status", "--porcelain").CombinedOutput()
+
+ if err != nil {
+ return false, err
+ }
+
+ return len(output) > 0, nil
+}
+
func main() {
+ flags := flag.NewFlagSet("", flag.ExitOnError)
+
+ specificTag := flags.String("tag", "", "Which tagged version to build")
+
+ err := flags.Parse(os.Args[1:])
+
+ if err != nil {
+ fmt.Println(err)
+ os.Exit(1)
+ }
+
+ uncommitedChanges, err := hasUncommitedChanges()
+
+ if err != nil {
+ fmt.Println(err)
+ os.Exit(1)
+ }
+
+ if uncommitedChanges {
+ fmt.Println("There are uncommited changes - commit, stash or discard them first")
+ os.Exit(1)
+ }
+
cwd, err := os.Getwd()
if err != nil {
@@ -95,10 +129,24 @@ func main() {
os.Mkdir(buildPath, 0755)
os.Mkdir(archivesPath, 0755)
- version, err := getVersionFromGit()
+ var version string
+
+ if *specificTag == "" {
+ version, err := getVersionFromGit()
+
+ if err != nil {
+ fmt.Println(version, err)
+ os.Exit(1)
+ }
+ } else {
+ version = *specificTag
+ }
+
+ output, err := exec.Command("git", "checkout", "tags/"+version).CombinedOutput()
if err != nil {
- fmt.Println(version, err)
+ fmt.Println(string(output))
+ fmt.Println(err)
os.Exit(1)
}
@@ -119,13 +167,19 @@ func main() {
fmt.Println("Building docker image")
- output, err := exec.Command(
- "sudo", "docker", "build",
+ var dockerBuildOptions = []string{
+ "docker", "build",
"--platform=linux/amd64,linux/arm64,linux/arm/v7",
"-t", versionTag,
- "-t", latestTag,
- ".",
- ).CombinedOutput()
+ }
+
+ if !strings.Contains(version, "beta") {
+ dockerBuildOptions = append(dockerBuildOptions, "-t", latestTag)
+ }
+
+ dockerBuildOptions = append(dockerBuildOptions, ".")
+
+ output, err = exec.Command("sudo", dockerBuildOptions...).CombinedOutput()
if err != nil {
fmt.Println(string(output))
@@ -152,6 +206,10 @@ func main() {
os.Exit(1)
}
+ if strings.Contains(version, "beta") {
+ return
+ }
+
output, err = exec.Command(
"sudo", "docker", "push", latestTag,
).CombinedOutput()
- {{ else if $post.HasTargetUrl }} + {{ if ne .ThumbnailUrl "" }} +
+ {{ else if .HasTargetUrl }} @@ -18,14 +18,15 @@ {{ end }} {{ end }} -
- {{ .Title }} + ++ {{ .Title }}@@ -33,7 +34,4 @@ {{ end }} -{{ if gt (len .Posts) $.CollapseAfter }} - -{{ end }} {{ end }} diff --git a/internal/assets/templates/page.html b/internal/assets/templates/page.html index 61fad9e..98bb111 100644 --- a/internal/assets/templates/page.html +++ b/internal/assets/templates/page.html @@ -50,6 +50,7 @@+ {{ if .Exists }} +
{{ else }}
- {{ $channel.Name }} - {{ if $channel.Exists }} - {{ if $channel.IsLive }} - {{ $channel.Category }} + {{ .Name }} + {{ if .Exists }} + {{ if .IsLive }} + {{ .Category }}+
- {{ $category.Name }} + {{ .Name }}