system/yay
system/yay
1
0
Fork 0
mirror of https://github.com/Jguer/yay synced 2024-07-18 08:23:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore(http): use client for news feed

Browse source
This commit is contained in:
jguer 2021-05-16 22:41:33 +02:00 committed by J Guerreiro
parent e20ab8b6a2
commit c7cf7baa48
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd.go
View file

@ -243,7 +243,7 @@ func handlePrint(cmdArgs *settings.Arguments, dbExecutor db.Executor) error {
case cmdArgs.ExistsArg("w", "news"):
double := cmdArgs.ExistsDouble("w", "news")
quiet := cmdArgs.ExistsArg("q", "quiet")
return news.PrintNewsFeed(dbExecutor.LastBuildTime(), config.SortMode, double, quiet)
return news.PrintNewsFeed(config.Runtime.HTTPClient, dbExecutor.LastBuildTime(), config.SortMode, double, quiet)
case cmdArgs.ExistsDouble("c", "complete"):
return completion.Show(dbExecutor, config.AURURL, config.Runtime.CompletionPath, config.CompletionInterval, true)
case cmdArgs.ExistsArg("c", "complete"):

10
pkg/news/news.go
View file

@ -2,6 +2,7 @@ package news
import (
"bytes"
"context"
"encoding/xml"
"fmt"
"html"
@ -59,8 +60,13 @@ type rss struct {
Channel channel `xml:"channel"`
}
func PrintNewsFeed(cutOffDate time.Time, sortMode int, all, quiet bool) error {
resp, err := http.Get("https://archlinux.org/feeds/news")
func PrintNewsFeed(client *http.Client, cutOffDate time.Time, sortMode int, all, quiet bool) error {
req, err := http.NewRequestWithContext(context.Background(), "GET", "https://archlinux.org/feeds/news", nil)
if err != nil {
return err
}
resp, err := client.Do(req)
if err != nil {
return err
}

3
pkg/news/news_test.go
View file

@ -2,6 +2,7 @@ package news
import (
"io/ioutil"
"net/http"
"os"
"testing"
"time"
@ -110,7 +111,7 @@ func TestPrintNewsFeed(t *testing.T) {
r, w, _ := os.Pipe()
os.Stdout = w
err := PrintNewsFeed(tt.args.cutOffDate, tt.args.sortMode, tt.args.all, tt.args.quiet)
err := PrintNewsFeed(&http.Client{}, tt.args.cutOffDate, tt.args.sortMode, tt.args.all, tt.args.quiet)
assert.NoError(t, err)
w.Close()