misc: rss and media changes (#27)

* refactor: tweak rss processing

* media: override trakt network with tvdb network if trakts is empty

* media: dont merge tvdb language with trakt language

* media: resolve issue with imdb ids
This commit is contained in:
l3uddz
2021-03-05 22:35:16 +00:00
committed by GitHub
parent c3ab8eda6e
commit 5091d78acf
8 changed files with 64 additions and 9 deletions

View File

@@ -26,7 +26,7 @@ func (c *Client) AddJob(feed feedItem) error {
job := &rssJob{
name: feed.Name,
log: l,
http: util.NewRetryableHttpClient(30*time.Second, nil, &l),
http: util.NewRetryableHttpClient(60*time.Second, nil, &l),
url: feed.URL,
pvrs: make(map[string]pvr.PVR, 0),

View File

@@ -4,6 +4,7 @@ import (
"encoding/xml"
"fmt"
"github.com/l3uddz/nabarr/media"
"github.com/l3uddz/nabarr/util"
"github.com/lucperkins/rek"
"sort"
"strings"
@@ -113,13 +114,13 @@ func (j *rssJob) getFeed() ([]media.FeedItem, error) {
// validate item
switch {
case b.Channel.Items[p].TvdbId != "" && b.Channel.Items[p].TvdbId != "0":
case b.Channel.Items[p].TvdbId != "" && !util.StringSliceContains([]string{"0", "1"}, b.Channel.Items[p].TvdbId):
// tvdb id is present, allow processing
break
case b.Channel.Items[p].ImdbId != "":
case b.Channel.Items[p].ImdbId != "" && strings.HasPrefix(b.Channel.Items[p].ImdbId, "tt"):
// imdb id present, allow processing
break
case b.Channel.Items[p].TmdbId != "" && b.Channel.Items[p].TmdbId != "0":
case b.Channel.Items[p].TmdbId != "" && !util.StringSliceContains([]string{"0", "1"}, b.Channel.Items[p].TmdbId):
// tmdb id present, allow processing
break
default: