Skip to content

Commit

Permalink
update deps and fix unmarshall error (#11)
Browse files Browse the repository at this point in the history
* update deps

* update ci
  • Loading branch information
bigspawn authored Nov 12, 2024
1 parent a101920 commit 0dffd76
Show file tree
Hide file tree
Showing 8 changed files with 97 additions and 88 deletions.
15 changes: 6 additions & 9 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
name: test

on: [ push, pull_request ]
on: [push, pull_request]

jobs:
test:
runs-on: ubuntu-latest
steps:
-
name: Install Go
- name: Install Go
uses: actions/setup-go@v2
with:
go-version: 1.18.x
-
name: Checkout code
go-version: 1.23.x
- name: Checkout code
uses: actions/checkout@v2
-
name: Test
run: go test -v ./...
- name: Test
run: go test -v -count 1 -race ./...
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20 as build
FROM golang:1.23 as build

ENV GO111MODULE=on
ENV CGO_ENABLED=1
Expand All @@ -10,7 +10,7 @@ RUN \
cd cmd && go build -o /build/music-news


FROM golang:1.20
FROM golang:1.23

WORKDIR /srv

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ lint:
@go vet ./...

test:
go test -v ./...
go test -v -count 1 -race ./...

run_parser:
go run cmd/main.go
Expand Down
49 changes: 26 additions & 23 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,42 +1,45 @@
module github.com/bigspawn/music-news

go 1.20
go 1.23

toolchain go1.23.2

require (
github.com/PuerkitoBio/goquery v1.8.1
github.com/PuerkitoBio/goquery v1.10.0
github.com/bigspawn/go-itunes-api v0.0.1
github.com/bigspawn/go-odesli v0.0.3
github.com/go-co-op/gocron v1.31.0
github.com/go-pkgz/lgr v0.11.0
github.com/jessevdk/go-flags v1.5.0
github.com/mattn/go-sqlite3 v1.14.17
github.com/mmcdole/gofeed v1.2.1
github.com/prometheus/client_golang v1.16.0
github.com/stretchr/testify v1.8.4
go.uber.org/automaxprocs v1.5.3
golang.org/x/net v0.14.0
gopkg.in/telebot.v3 v3.1.3
github.com/bigspawn/go-odesli v0.0.4
github.com/go-co-op/gocron v1.37.0
github.com/go-pkgz/lgr v0.11.1
github.com/jessevdk/go-flags v1.6.1
github.com/mattn/go-sqlite3 v1.14.24
github.com/mmcdole/gofeed v1.3.0
github.com/prometheus/client_golang v1.20.5
github.com/stretchr/testify v1.9.0
go.uber.org/automaxprocs v1.6.0
golang.org/x/net v0.31.0
gopkg.in/telebot.v3 v3.3.8
)

require (
github.com/andybalholm/cascadia v1.3.2 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mmcdole/goxpp v1.1.0 // indirect
github.com/klauspost/compress v1.17.11 // 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
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.11.1 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.60.1 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/robfig/cron/v3 v3.0.1 // indirect
go.uber.org/atomic v1.11.0 // indirect
golang.org/x/sys v0.11.0 // indirect
golang.org/x/text v0.12.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
golang.org/x/sys v0.27.0 // indirect
golang.org/x/text v0.20.0 // indirect
google.golang.org/protobuf v1.35.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
102 changes: 54 additions & 48 deletions go.sum

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion internal/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,10 @@ func NewApp(ctx context.Context, opt *Options, lgr lgr.L) (*App, error) {
return nil, fmt.Errorf("failed to create itunes api client: %w", err)
}

odesliAPI, err := odesli.NewClient(odesli.ClientOption{APIToken: opt.SongApiKey})
odesliAPI, err := odesli.NewClient(odesli.ClientOption{
APIToken: opt.SongApiKey,
Debug: false,
})
if err != nil {
return nil, fmt.Errorf("failed to create odesli api client: %w", err)
}
Expand Down
4 changes: 2 additions & 2 deletions internal/link.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,12 @@ func NewLinksApi(params LinksApiParams) (*LinksApi, error) {
func (api *LinksApi) GetLinks(ctx context.Context, title string) (string, map[odesli.Platform]string, error) {
id, err := api.getIDiTunes(ctx, clearTitle(title))
if err != nil {
return "", nil, err
return "", nil, fmt.Errorf("get itunes id for %s: %w", title, err)
}

resp, err := api.GetSongLink(ctx, id)
if err != nil {
return "", nil, err
return "", nil, fmt.Errorf("failed to get links for %s: %w", title, err)
}

links := make(map[odesli.Platform]string, len(resp.LinksByPlatform))
Expand Down
4 changes: 2 additions & 2 deletions internal/scraper.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func (s *Scraper) Scrape(ctx context.Context) error {

items, err := s.parser.Parse(ctx)
if err != nil {
s.lgr.Logf("[ERROR] can't parse: err=%v", err)
s.lgr.Logf("[ERROR] can't parse: site:%s, err=%v", s.parser.siteLabel, err)

if netErr(err) || strings.Contains(err.Error(), "network is unreachable") {
return err
Expand Down Expand Up @@ -79,7 +79,7 @@ func (s *Scraper) wait(ctx context.Context) error {
return nil
}

//nolint: errorlint // ok
// nolint: errorlint // ok
func netErr(err error) bool {
if ok := errors.Is(err, &net.DNSError{}); ok {
return ok
Expand Down

0 comments on commit 0dffd76

Please sign in to comment.