+
{{ range .Videos }}
-
-
+ {{ template "video-card-contents" . }}
{{ end }}
diff --git a/internal/feed/github.go b/internal/feed/github.go
index 4a34182..43a2459 100644
--- a/internal/feed/github.go
+++ b/internal/feed/github.go
@@ -4,6 +4,7 @@ import (
"fmt"
"log/slog"
"net/http"
+ "sync"
"time"
)
@@ -115,3 +116,133 @@ func FetchLatestReleasesFromGithub(repositories []string, token string) (AppRele
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
index baacdf2..f1db111 100644
--- a/internal/feed/hacker-news.go
+++ b/internal/feed/hacker-news.go
@@ -18,8 +18,8 @@ type hackerNewsPostResponseJson struct {
TimePosted int64 `json:"time"`
}
-func getHackerNewsTopPostIds() ([]int, error) {
- request, _ := http.NewRequest("GET", "https://hacker-news.firebaseio.com/v0/topstories.json", nil)
+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 {
@@ -83,8 +83,8 @@ func getHackerNewsPostsFromIds(postIds []int, commentsUrlTemplate string) (Forum
return posts, nil
}
-func FetchHackerNewsTopPosts(limit int, commentsUrlTemplate string) (ForumPosts, error) {
- postIds, err := getHackerNewsTopPostIds()
+func FetchHackerNewsPosts(sort string, limit int, commentsUrlTemplate string) (ForumPosts, error) {
+ postIds, err := getHackerNewsPostIds(sort)
if err != nil {
return nil, err
diff --git a/internal/feed/primitives.go b/internal/feed/primitives.go
index 99d6763..7982360 100644
--- a/internal/feed/primitives.go
+++ b/internal/feed/primitives.go
@@ -85,12 +85,14 @@ var currencyToSymbol = map[string]string{
}
type Stock struct {
- Name string
- Symbol string
- Currency string
- Price float64
- PercentChange float64
- SvgChartPoints string
+ Name string `yaml:"name"`
+ Symbol string `yaml:"symbol"`
+ ChartLink string `yaml:"chart-link"`
+ SymbolLink string `yaml:"symbol-link"`
+ Currency string `yaml:"-"`
+ Price float64 `yaml:"-"`
+ PercentChange float64 `yaml:"-"`
+ SvgChartPoints string `yaml:"-"`
}
type Stocks []Stock
diff --git a/internal/feed/reddit.go b/internal/feed/reddit.go
index 3ac5dee..676d948 100644
--- a/internal/feed/reddit.go
+++ b/internal/feed/reddit.go
@@ -30,12 +30,29 @@ type subredditResponseJson struct {
} `json:"data"`
}
-func FetchSubredditPosts(subreddit string, commentsUrlTemplate string, requestUrlTemplate string) (ForumPosts, error) {
- subreddit = url.QueryEscape(subreddit)
- requestUrl := fmt.Sprintf("https://www.reddit.com/r/%s/hot.json", subreddit)
+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 {
@@ -93,7 +110,5 @@ func FetchSubredditPosts(subreddit string, commentsUrlTemplate string, requestUr
posts = append(posts, forumPost)
}
- posts.CalculateEngagement()
-
return posts, nil
}
diff --git a/internal/feed/utils.go b/internal/feed/utils.go
index a861e8a..dcf044a 100644
--- a/internal/feed/utils.go
+++ b/internal/feed/utils.go
@@ -28,7 +28,7 @@ func extractDomainFromUrl(u string) string {
return ""
}
- return strings.TrimPrefix(parsed.Host, "www.")
+ return strings.TrimPrefix(strings.ToLower(parsed.Host), "www.")
}
func SvgPolylineCoordsFromYValues(width float64, height float64, values []float64) string {
diff --git a/internal/feed/yahoo.go b/internal/feed/yahoo.go
index a8106d7..69c2731 100644
--- a/internal/feed/yahoo.go
+++ b/internal/feed/yahoo.go
@@ -24,15 +24,10 @@ type stockResponseJson struct {
} `json:"chart"`
}
-type StockRequest struct {
- Symbol string
- Name string
-}
-
// TODO: allow changing chart time frame
const stockChartDays = 21
-func FetchStocksDataFromYahoo(stockRequests []StockRequest) (Stocks, error) {
+func FetchStocksDataFromYahoo(stockRequests Stocks) (Stocks, error) {
requests := make([]*http.Request, 0, len(stockRequests))
for i := range stockRequests {
@@ -86,10 +81,12 @@ func FetchStocksDataFromYahoo(stockRequests []StockRequest) (Stocks, error) {
}
stocks = append(stocks, Stock{
- Name: stockRequests[i].Name,
- Symbol: response.Chart.Result[0].Meta.Symbol,
- Price: response.Chart.Result[0].Meta.RegularMarketPrice,
- Currency: currency,
+ Name: stockRequests[i].Name,
+ Symbol: response.Chart.Result[0].Meta.Symbol,
+ SymbolLink: stockRequests[i].SymbolLink,
+ ChartLink: stockRequests[i].ChartLink,
+ Price: response.Chart.Result[0].Meta.RegularMarketPrice,
+ Currency: currency,
PercentChange: percentChange(
response.Chart.Result[0].Meta.RegularMarketPrice,
previous,
diff --git a/internal/glance/glance.go b/internal/glance/glance.go
index e00809e..653be75 100644
--- a/internal/glance/glance.go
+++ b/internal/glance/glance.go
@@ -55,10 +55,11 @@ type templateData struct {
}
type Page struct {
- Title string `yaml:"name"`
- Slug string `yaml:"slug"`
- Columns []Column `yaml:"columns"`
- mu sync.Mutex
+ Title string `yaml:"name"`
+ Slug string `yaml:"slug"`
+ ShowMobileHeader bool `yaml:"show-mobile-header"`
+ Columns []Column `yaml:"columns"`
+ mu sync.Mutex
}
func (p *Page) UpdateOutdatedWidgets() {
diff --git a/internal/widget/bookmarks.go b/internal/widget/bookmarks.go
index afa8a05..0863d98 100644
--- a/internal/widget/bookmarks.go
+++ b/internal/widget/bookmarks.go
@@ -22,6 +22,7 @@ type Bookmarks struct {
HideArrow bool `yaml:"hide-arrow"`
} `yaml:"links"`
} `yaml:"groups"`
+ Style string `yaml:"style"`
}
func (widget *Bookmarks) Initialize() error {
diff --git a/internal/widget/hacker-news.go b/internal/widget/hacker-news.go
index ff9ece0..9beccb7 100644
--- a/internal/widget/hacker-news.go
+++ b/internal/widget/hacker-news.go
@@ -13,6 +13,8 @@ type HackerNews struct {
widgetBase `yaml:",inline"`
Posts feed.ForumPosts `yaml:"-"`
Limit int `yaml:"limit"`
+ SortBy string `yaml:"sort-by"`
+ ExtraSortBy string `yaml:"extra-sort-by"`
CollapseAfter int `yaml:"collapse-after"`
CommentsUrlTemplate string `yaml:"comments-url-template"`
ShowThumbnails bool `yaml:"-"`
@@ -29,18 +31,24 @@ func (widget *HackerNews) Initialize() error {
widget.CollapseAfter = 5
}
+ if widget.SortBy != "top" && widget.SortBy != "new" && widget.SortBy != "best" {
+ widget.SortBy = "top"
+ }
+
return nil
}
func (widget *HackerNews) Update(ctx context.Context) {
- posts, err := feed.FetchHackerNewsTopPosts(40, widget.CommentsUrlTemplate)
+ posts, err := feed.FetchHackerNewsPosts(widget.SortBy, 40, widget.CommentsUrlTemplate)
if !widget.canContinueUpdateAfterHandlingErr(err) {
return
}
- posts.CalculateEngagement()
- posts.SortByEngagement()
+ if widget.ExtraSortBy == "engagement" {
+ posts.CalculateEngagement()
+ posts.SortByEngagement()
+ }
if widget.Limit < len(posts) {
posts = posts[:widget.Limit]
diff --git a/internal/widget/monitor.go b/internal/widget/monitor.go
index 3375ae5..c4d78f8 100644
--- a/internal/widget/monitor.go
+++ b/internal/widget/monitor.go
@@ -46,14 +46,15 @@ func statusCodeToStyle(status int) string {
type Monitor struct {
widgetBase `yaml:",inline"`
Sites []struct {
- Title string `yaml:"title"`
- Url string `yaml:"url"`
- IconUrl string `yaml:"icon"`
- SameTab bool `yaml:"same-tab"`
- Status *feed.SiteStatus `yaml:"-"`
- StatusText string `yaml:"-"`
- StatusStyle string `yaml:"-"`
+ Title string `yaml:"title"`
+ Url OptionalEnvString `yaml:"url"`
+ IconUrl string `yaml:"icon"`
+ SameTab bool `yaml:"same-tab"`
+ Status *feed.SiteStatus `yaml:"-"`
+ StatusText string `yaml:"-"`
+ StatusStyle string `yaml:"-"`
} `yaml:"sites"`
+ Style string `yaml:"style"`
}
func (widget *Monitor) Initialize() error {
@@ -66,7 +67,7 @@ func (widget *Monitor) Update(ctx context.Context) {
requests := make([]*http.Request, len(widget.Sites))
for i := range widget.Sites {
- request, err := http.NewRequest("GET", widget.Sites[i].Url, nil)
+ request, err := http.NewRequest("GET", string(widget.Sites[i].Url), nil)
if err != nil {
message := fmt.Errorf("failed to create http request for %s: %s", widget.Sites[i].Url, err)
diff --git a/internal/widget/reddit.go b/internal/widget/reddit.go
index 42ee264..0aa5f93 100644
--- a/internal/widget/reddit.go
+++ b/internal/widget/reddit.go
@@ -17,6 +17,10 @@ type Reddit struct {
Subreddit string `yaml:"subreddit"`
Style string `yaml:"style"`
ShowThumbnails bool `yaml:"show-thumbnails"`
+ SortBy string `yaml:"sort-by"`
+ TopPeriod string `yaml:"top-period"`
+ Search string `yaml:"search"`
+ ExtraSortBy string `yaml:"extra-sort-by"`
CommentsUrlTemplate string `yaml:"comments-url-template"`
Limit int `yaml:"limit"`
CollapseAfter int `yaml:"collapse-after"`
@@ -36,6 +40,14 @@ func (widget *Reddit) Initialize() error {
widget.CollapseAfter = 5
}
+ if !isValidRedditSortType(widget.SortBy) {
+ widget.SortBy = "hot"
+ }
+
+ if !isValidRedditTopPeriod(widget.TopPeriod) {
+ widget.TopPeriod = "day"
+ }
+
if widget.RequestUrlTemplate != "" {
if !strings.Contains(widget.RequestUrlTemplate, "{REQUEST-URL}") {
return errors.New("no `{REQUEST-URL}` placeholder specified")
@@ -47,8 +59,32 @@ func (widget *Reddit) Initialize() error {
return nil
}
+func isValidRedditSortType(sortBy string) bool {
+ return sortBy == "hot" ||
+ sortBy == "new" ||
+ sortBy == "top" ||
+ sortBy == "rising"
+}
+
+func isValidRedditTopPeriod(period string) bool {
+ return period == "hour" ||
+ period == "day" ||
+ period == "week" ||
+ period == "month" ||
+ period == "year" ||
+ period == "all"
+}
+
func (widget *Reddit) Update(ctx context.Context) {
- posts, err := feed.FetchSubredditPosts(widget.Subreddit, widget.CommentsUrlTemplate, widget.RequestUrlTemplate)
+ // TODO: refactor, use a struct to pass all of these
+ posts, err := feed.FetchSubredditPosts(
+ widget.Subreddit,
+ widget.SortBy,
+ widget.TopPeriod,
+ widget.Search,
+ widget.CommentsUrlTemplate,
+ widget.RequestUrlTemplate,
+ )
if !widget.canContinueUpdateAfterHandlingErr(err) {
return
@@ -58,7 +94,11 @@ func (widget *Reddit) Update(ctx context.Context) {
posts = posts[:widget.Limit]
}
- posts.SortByEngagement()
+ if widget.ExtraSortBy == "engagement" {
+ posts.CalculateEngagement()
+ posts.SortByEngagement()
+ }
+
widget.Posts = posts
}
diff --git a/internal/widget/repository-overview.go b/internal/widget/repository-overview.go
new file mode 100644
index 0000000..85a896c
--- /dev/null
+++ b/internal/widget/repository-overview.go
@@ -0,0 +1,52 @@
+package widget
+
+import (
+ "context"
+ "html/template"
+ "time"
+
+ "github.com/glanceapp/glance/internal/assets"
+ "github.com/glanceapp/glance/internal/feed"
+)
+
+type Repository struct {
+ widgetBase `yaml:",inline"`
+ RequestedRepository string `yaml:"repository"`
+ Token OptionalEnvString `yaml:"token"`
+ PullRequestsLimit int `yaml:"pull-requests-limit"`
+ IssuesLimit int `yaml:"issues-limit"`
+ RepositoryDetails feed.RepositoryDetails
+}
+
+func (widget *Repository) Initialize() error {
+ widget.withTitle("Repository").withCacheDuration(1 * time.Hour)
+
+ if widget.PullRequestsLimit == 0 || widget.PullRequestsLimit < -1 {
+ widget.PullRequestsLimit = 3
+ }
+
+ if widget.IssuesLimit == 0 || widget.IssuesLimit < -1 {
+ widget.IssuesLimit = 3
+ }
+
+ return nil
+}
+
+func (widget *Repository) Update(ctx context.Context) {
+ details, err := feed.FetchRepositoryDetailsFromGithub(
+ widget.RequestedRepository,
+ string(widget.Token),
+ widget.PullRequestsLimit,
+ widget.IssuesLimit,
+ )
+
+ if !widget.canContinueUpdateAfterHandlingErr(err) {
+ return
+ }
+
+ widget.RepositoryDetails = details
+}
+
+func (widget *Repository) Render() template.HTML {
+ return widget.render(widget, assets.RepositoryTemplate)
+}
diff --git a/internal/widget/rss.go b/internal/widget/rss.go
index 81bd3ae..26d43dc 100644
--- a/internal/widget/rss.go
+++ b/internal/widget/rss.go
@@ -10,12 +10,14 @@ import (
)
type RSS struct {
- widgetBase `yaml:",inline"`
- FeedRequests []feed.RSSFeedRequest `yaml:"feeds"`
- Style string `yaml:"style"`
- Items feed.RSSFeedItems `yaml:"-"`
- Limit int `yaml:"limit"`
- CollapseAfter int `yaml:"collapse-after"`
+ widgetBase `yaml:",inline"`
+ FeedRequests []feed.RSSFeedRequest `yaml:"feeds"`
+ Style string `yaml:"style"`
+ ThumbnailHeight float64 `yaml:"thumbnail-height"`
+ CardHeight float64 `yaml:"card-height"`
+ Items feed.RSSFeedItems `yaml:"-"`
+ Limit int `yaml:"limit"`
+ CollapseAfter int `yaml:"collapse-after"`
}
func (widget *RSS) Initialize() error {
@@ -29,6 +31,14 @@ func (widget *RSS) Initialize() error {
widget.CollapseAfter = 5
}
+ if widget.ThumbnailHeight < 0 {
+ widget.ThumbnailHeight = 0
+ }
+
+ if widget.CardHeight < 0 {
+ widget.CardHeight = 0
+ }
+
return nil
}
@@ -48,7 +58,11 @@ func (widget *RSS) Update(ctx context.Context) {
func (widget *RSS) Render() template.HTML {
if widget.Style == "horizontal-cards" {
- return widget.render(widget, assets.RSSCardsTemplate)
+ return widget.render(widget, assets.RSSHorizontalCardsTemplate)
+ }
+
+ if widget.Style == "horizontal-cards-2" {
+ return widget.render(widget, assets.RSSHorizontalCards2Template)
}
return widget.render(widget, assets.RSSListTemplate)
diff --git a/internal/widget/stocks.go b/internal/widget/stocks.go
index 1863875..27f292b 100644
--- a/internal/widget/stocks.go
+++ b/internal/widget/stocks.go
@@ -9,11 +9,12 @@ import (
"github.com/glanceapp/glance/internal/feed"
)
+// TODO: rename to Markets at some point
type Stocks struct {
widgetBase `yaml:",inline"`
- Stocks feed.Stocks `yaml:"-"`
- Sort string `yaml:"sort-by"`
- Tickers []feed.StockRequest `yaml:"stocks"`
+ Stocks feed.Stocks `yaml:"stocks"`
+ Sort string `yaml:"sort-by"`
+ Style string `yaml:"style"`
}
func (widget *Stocks) Initialize() error {
@@ -23,7 +24,7 @@ func (widget *Stocks) Initialize() error {
}
func (widget *Stocks) Update(ctx context.Context) {
- stocks, err := feed.FetchStocksDataFromYahoo(widget.Tickers)
+ stocks, err := feed.FetchStocksDataFromYahoo(widget.Stocks)
if !widget.canContinueUpdateAfterHandlingErr(err) {
return
diff --git a/internal/widget/videos.go b/internal/widget/videos.go
index a472f0e..252c8ff 100644
--- a/internal/widget/videos.go
+++ b/internal/widget/videos.go
@@ -13,6 +13,7 @@ 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"`
}
@@ -42,5 +43,9 @@ func (widget *Videos) Update(ctx context.Context) {
}
func (widget *Videos) Render() template.HTML {
+ if widget.Style == "grid-cards" {
+ return widget.render(widget, assets.VideosGridTemplate)
+ }
+
return widget.render(widget, assets.VideosTemplate)
}
diff --git a/internal/widget/widget.go b/internal/widget/widget.go
index 367d822..3707b7e 100644
--- a/internal/widget/widget.go
+++ b/internal/widget/widget.go
@@ -43,6 +43,8 @@ func New(widgetType string) (Widget, error) {
return &TwitchGames{}, nil
case "twitch-channels":
return &TwitchChannels{}, nil
+ case "repository":
+ return &Repository{}, nil
default:
return nil, fmt.Errorf("unknown widget type: %s", widgetType)
}
-
- {{ end }}
-