Skip to content

Commit c3d2ba3

Browse files
ligang945mxpv
ligang945
authored and
mxpv
committed
fix warnning: Variable 'feed' collides with imported package name
1 parent 0ee0c6e commit c3d2ba3

7 files changed

Lines changed: 81 additions & 81 deletions

File tree

‎cmd/podsync/config.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -155,29 +155,29 @@ func (c *Config) applyDefaults(configPath string) {
155155
c.Database.Dir = filepath.Join(filepath.Dir(configPath), "db")
156156
}
157157

158-
for _, feed := range c.Feeds {
159-
if feed.UpdatePeriod == 0 {
160-
feed.UpdatePeriod = model.DefaultUpdatePeriod
158+
for _, _feed := range c.Feeds {
159+
if _feed.UpdatePeriod == 0 {
160+
_feed.UpdatePeriod = model.DefaultUpdatePeriod
161161
}
162162

163-
if feed.Quality == "" {
164-
feed.Quality = model.DefaultQuality
163+
if _feed.Quality == "" {
164+
_feed.Quality = model.DefaultQuality
165165
}
166166

167-
if feed.Custom.CoverArtQuality == "" {
168-
feed.Custom.CoverArtQuality = model.DefaultQuality
167+
if _feed.Custom.CoverArtQuality == "" {
168+
_feed.Custom.CoverArtQuality = model.DefaultQuality
169169
}
170170

171-
if feed.Format == "" {
172-
feed.Format = model.DefaultFormat
171+
if _feed.Format == "" {
172+
_feed.Format = model.DefaultFormat
173173
}
174174

175-
if feed.PageSize == 0 {
176-
feed.PageSize = model.DefaultPageSize
175+
if _feed.PageSize == 0 {
176+
_feed.PageSize = model.DefaultPageSize
177177
}
178178

179-
if feed.PlaylistSort == "" {
180-
feed.PlaylistSort = model.SortingAsc
179+
if _feed.PlaylistSort == "" {
180+
_feed.PlaylistSort = model.SortingAsc
181181
}
182182
}
183183
}

‎cmd/podsync/main.go‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,9 @@ func main() {
154154

155155
// In Headless mode, do one round of feed updates and quit
156156
if opts.Headless {
157-
for _, feed := range cfg.Feeds {
158-
if err := manager.Update(ctx, feed); err != nil {
159-
log.WithError(err).Errorf("failed to update feed: %s", feed.URL)
157+
for _, _feed := range cfg.Feeds {
158+
if err := manager.Update(ctx, _feed); err != nil {
159+
log.WithError(err).Errorf("failed to update feed: %s", _feed.URL)
160160
}
161161
}
162162
return
@@ -182,11 +182,11 @@ func main() {
182182
group.Go(func() error {
183183
for {
184184
select {
185-
case feed := <-updates:
186-
if err := manager.Update(ctx, feed); err != nil {
187-
log.WithError(err).Errorf("failed to update feed: %s", feed.URL)
185+
case _feed := <-updates:
186+
if err := manager.Update(ctx, _feed); err != nil {
187+
log.WithError(err).Errorf("failed to update feed: %s", _feed.URL)
188188
} else {
189-
log.Infof("next update of %s: %s", feed.ID, c.Entry(m[feed.ID]).Next)
189+
log.Infof("next update of %s: %s", _feed.ID, c.Entry(m[_feed.ID]).Next)
190190
}
191191
case <-ctx.Done():
192192
return ctx.Err()
@@ -198,22 +198,22 @@ func main() {
198198
group.Go(func() error {
199199
var cronID cron.EntryID
200200

201-
for _, feed := range cfg.Feeds {
202-
if feed.CronSchedule == "" {
203-
feed.CronSchedule = fmt.Sprintf("@every %s", feed.UpdatePeriod.String())
201+
for _, _feed := range cfg.Feeds {
202+
if _feed.CronSchedule == "" {
203+
_feed.CronSchedule = fmt.Sprintf("@every %s", _feed.UpdatePeriod.String())
204204
}
205-
_feed := feed
206-
if cronID, err = c.AddFunc(_feed.CronSchedule, func() {
207-
log.Debugf("adding %q to update queue", _feed.ID)
208-
updates <- _feed
205+
cronFeed := _feed
206+
if cronID, err = c.AddFunc(cronFeed.CronSchedule, func() {
207+
log.Debugf("adding %q to update queue", cronFeed.ID)
208+
updates <- cronFeed
209209
}); err != nil {
210-
log.WithError(err).Fatalf("can't create cron task for feed: %s", _feed.ID)
210+
log.WithError(err).Fatalf("can't create cron task for feed: %s", cronFeed.ID)
211211
}
212212

213-
m[_feed.ID] = cronID
214-
log.Debugf("-> %s (update '%s')", _feed.ID, _feed.CronSchedule)
213+
m[cronFeed.ID] = cronID
214+
log.Debugf("-> %s (update '%s')", cronFeed.ID, cronFeed.CronSchedule)
215215
// Perform initial update after CLI restart
216-
updates <- _feed
216+
updates <- cronFeed
217217
}
218218

219219
c.Start()

‎pkg/builder/soundcloud.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func (s *SoundCloudBuilder) Build(_ctx context.Context, cfg *feed.Config) (*mode
2222
return nil, err
2323
}
2424

25-
feed := &model.Feed{
25+
_feed := &model.Feed{
2626
ItemID: info.ItemID,
2727
Provider: info.Provider,
2828
LinkType: info.LinkType,
@@ -39,16 +39,16 @@ func (s *SoundCloudBuilder) Build(_ctx context.Context, cfg *feed.Config) (*mode
3939
return nil, err
4040
}
4141

42-
feed.Title = scplaylist.Title
43-
feed.Description = scplaylist.Description
44-
feed.ItemURL = cfg.URL
42+
_feed.Title = scplaylist.Title
43+
_feed.Description = scplaylist.Description
44+
_feed.ItemURL = cfg.URL
4545

4646
date, err := time.Parse(time.RFC3339, scplaylist.CreatedAt)
4747
if err == nil {
48-
feed.PubDate = date
48+
_feed.PubDate = date
4949
}
50-
feed.Author = scplaylist.User.Username
51-
feed.CoverArt = scplaylist.ArtworkURL
50+
_feed.Author = scplaylist.User.Username
51+
_feed.CoverArt = scplaylist.ArtworkURL
5252

5353
var added = 0
5454
for _, track := range scplaylist.Tracks {
@@ -60,7 +60,7 @@ func (s *SoundCloudBuilder) Build(_ctx context.Context, cfg *feed.Config) (*mode
6060
trackSize = track.DurationMS * 15 // very rough estimate
6161
)
6262

63-
feed.Episodes = append(feed.Episodes, &model.Episode{
63+
_feed.Episodes = append(_feed.Episodes, &model.Episode{
6464
ID: videoID,
6565
Title: track.Title,
6666
Description: track.Description,
@@ -74,12 +74,12 @@ func (s *SoundCloudBuilder) Build(_ctx context.Context, cfg *feed.Config) (*mode
7474

7575
added++
7676

77-
if added >= feed.PageSize {
78-
return feed, nil
77+
if added >= _feed.PageSize {
78+
return _feed, nil
7979
}
8080
}
8181

82-
return feed, nil
82+
return _feed, nil
8383
}
8484
}
8585

‎pkg/builder/soundcloud_test.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@ func TestSoundCloud_BuildFeed(t *testing.T) {
1919

2020
for _, addr := range urls {
2121
t.Run(addr, func(t *testing.T) {
22-
feed, err := builder.Build(testCtx, &feed.Config{URL: addr})
22+
_feed, err := builder.Build(testCtx, &feed.Config{URL: addr})
2323
require.NoError(t, err)
2424

25-
assert.NotEmpty(t, feed.Title)
26-
assert.NotEmpty(t, feed.Description)
27-
assert.NotEmpty(t, feed.Author)
28-
assert.NotEmpty(t, feed.ItemURL)
25+
assert.NotEmpty(t, _feed.Title)
26+
assert.NotEmpty(t, _feed.Description)
27+
assert.NotEmpty(t, _feed.Author)
28+
assert.NotEmpty(t, _feed.ItemURL)
2929

30-
assert.NotZero(t, len(feed.Episodes))
30+
assert.NotZero(t, len(_feed.Episodes))
3131

32-
for _, item := range feed.Episodes {
32+
for _, item := range _feed.Episodes {
3333
assert.NotEmpty(t, item.Title)
3434
assert.NotEmpty(t, item.VideoURL)
3535
assert.NotZero(t, item.Duration)

‎pkg/builder/vimeo.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ func (v *VimeoBuilder) Build(ctx context.Context, cfg *feed.Config) (*model.Feed
164164
return nil, err
165165
}
166166

167-
feed := &model.Feed{
167+
_feed := &model.Feed{
168168
ItemID: info.ItemID,
169169
Provider: info.Provider,
170170
LinkType: info.LinkType,
@@ -175,39 +175,39 @@ func (v *VimeoBuilder) Build(ctx context.Context, cfg *feed.Config) (*model.Feed
175175
}
176176

177177
if info.LinkType == model.TypeChannel {
178-
if err := v.queryChannel(feed); err != nil {
178+
if err := v.queryChannel(_feed); err != nil {
179179
return nil, err
180180
}
181181

182-
if err := v.queryVideos(v.client.Channels.ListVideo, feed); err != nil {
182+
if err := v.queryVideos(v.client.Channels.ListVideo, _feed); err != nil {
183183
return nil, err
184184
}
185185

186-
return feed, nil
186+
return _feed, nil
187187
}
188188

189189
if info.LinkType == model.TypeGroup {
190-
if err := v.queryGroup(feed); err != nil {
190+
if err := v.queryGroup(_feed); err != nil {
191191
return nil, err
192192
}
193193

194-
if err := v.queryVideos(v.client.Groups.ListVideo, feed); err != nil {
194+
if err := v.queryVideos(v.client.Groups.ListVideo, _feed); err != nil {
195195
return nil, err
196196
}
197197

198-
return feed, nil
198+
return _feed, nil
199199
}
200200

201201
if info.LinkType == model.TypeUser {
202-
if err := v.queryUser(feed); err != nil {
202+
if err := v.queryUser(_feed); err != nil {
203203
return nil, err
204204
}
205205

206-
if err := v.queryVideos(v.client.Users.ListVideo, feed); err != nil {
206+
if err := v.queryVideos(v.client.Users.ListVideo, _feed); err != nil {
207207
return nil, err
208208
}
209209

210-
return feed, nil
210+
return _feed, nil
211211
}
212212

213213
return nil, errors.New("unsupported feed type")

‎pkg/builder/youtube.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ func (yt *YouTubeBuilder) Build(ctx context.Context, cfg *feed.Config) (*model.F
410410
return nil, err
411411
}
412412

413-
feed := &model.Feed{
413+
_feed := &model.Feed{
414414
ItemID: info.ItemID,
415415
Provider: info.Provider,
416416
LinkType: info.LinkType,
@@ -423,32 +423,32 @@ func (yt *YouTubeBuilder) Build(ctx context.Context, cfg *feed.Config) (*model.F
423423
UpdatedAt: time.Now().UTC(),
424424
}
425425

426-
if feed.PageSize == 0 {
427-
feed.PageSize = maxYoutubeResults
426+
if _feed.PageSize == 0 {
427+
_feed.PageSize = maxYoutubeResults
428428
}
429429

430430
// Query general information about feed (title, description, lang, etc)
431-
if err := yt.queryFeed(ctx, feed, &info); err != nil {
431+
if err := yt.queryFeed(ctx, _feed, &info); err != nil {
432432
return nil, err
433433
}
434434

435-
if err := yt.queryItems(ctx, feed); err != nil {
435+
if err := yt.queryItems(ctx, _feed); err != nil {
436436
return nil, err
437437
}
438438

439439
// YT API client gets 50 episodes per query.
440440
// Round up to page size.
441-
if len(feed.Episodes) > feed.PageSize {
442-
feed.Episodes = feed.Episodes[:feed.PageSize]
441+
if len(_feed.Episodes) > _feed.PageSize {
442+
_feed.Episodes = _feed.Episodes[:_feed.PageSize]
443443
}
444444

445-
sort.Slice(feed.Episodes, func(i, j int) bool {
446-
item1, _ := strconv.Atoi(feed.Episodes[i].Order)
447-
item2, _ := strconv.Atoi(feed.Episodes[j].Order)
445+
sort.Slice(_feed.Episodes, func(i, j int) bool {
446+
item1, _ := strconv.Atoi(_feed.Episodes[i].Order)
447+
item2, _ := strconv.Atoi(_feed.Episodes[j].Order)
448448
return item1 < item2
449449
})
450450

451-
return feed, nil
451+
return _feed, nil
452452
}
453453

454454
func NewYouTubeBuilder(key string) (*YouTubeBuilder, error) {

‎pkg/builder/youtube_test.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,17 @@ func TestYT_BuildFeed(t *testing.T) {
5252

5353
for _, addr := range urls {
5454
t.Run(addr, func(t *testing.T) {
55-
feed, err := builder.Build(testCtx, &feed.Config{URL: addr})
55+
_feed, err := builder.Build(testCtx, &feed.Config{URL: addr})
5656
require.NoError(t, err)
5757

58-
assert.NotEmpty(t, feed.Title)
59-
assert.NotEmpty(t, feed.Description)
60-
assert.NotEmpty(t, feed.Author)
61-
assert.NotEmpty(t, feed.ItemURL)
58+
assert.NotEmpty(t, _feed.Title)
59+
assert.NotEmpty(t, _feed.Description)
60+
assert.NotEmpty(t, _feed.Author)
61+
assert.NotEmpty(t, _feed.ItemURL)
6262

63-
assert.NotZero(t, len(feed.Episodes))
63+
assert.NotZero(t, len(_feed.Episodes))
6464

65-
for _, item := range feed.Episodes {
65+
for _, item := range _feed.Episodes {
6666
assert.NotEmpty(t, item.Title)
6767
assert.NotEmpty(t, item.VideoURL)
6868
assert.NotZero(t, item.Duration)
@@ -91,10 +91,10 @@ func TestYT_GetVideoCount(t *testing.T) {
9191
{Provider: model.ProviderYoutube, LinkType: model.TypePlaylist, ItemID: "PLUVl5pafUrBydT_gsCjRGeCy0hFHloec8"},
9292
}
9393

94-
for _, f := range feeds {
95-
feed := f
96-
t.Run(f.ItemID, func(t *testing.T) {
97-
count, err := builder.GetVideoCount(testCtx, feed)
94+
for _, _feed := range feeds {
95+
feedCopy := _feed
96+
t.Run(_feed.ItemID, func(t *testing.T) {
97+
count, err := builder.GetVideoCount(testCtx, feedCopy)
9898
assert.NoError(t, err)
9999
assert.NotZero(t, count)
100100
})

0 commit comments

Comments
 (0)