Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions config.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,6 @@ func LoadConfig(path string) (*Config, error) {
}

func (c *Config) compileFilterRegexps() error {
if len(c.Filters) == 0 {
c.Filters = []*Filter{
{Value: ".*", Type: "name"},
}
}

for i, filter := range c.Filters {
re, err := regexp.Compile(filter.Value)
if err != nil {
Expand Down
6 changes: 1 addition & 5 deletions config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -98,14 +98,10 @@ maxStreams: 10
assert.Equal(t, "iptvserver:8080", config.ServerAddress)
assert.True(t, config.UseFFMPEG)
assert.Equal(t, 10, config.MaxStreams)
assert.Len(t, config.Filters, 1)
assert.Equal(t, ".*", config.Filters[0].Value)
assert.Equal(t, "name", config.Filters[0].Type)
assert.NotNil(t, config.Filters[0].GetRegexp())
assert.Len(t, config.Filters, 0)
assert.Equal(t, 2*time.Hour, config.RefreshInterval)
})


// Test with invalid regular expression
t.Run("Invalid Regular Expression", func(t *testing.T) {
content := []byte(`
Expand Down
51 changes: 30 additions & 21 deletions provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,11 @@ func (pl *playlistLoader) OnPlaylistStart() {
}

func (pl *playlistLoader) OnTrack(track *Track) {
if len(pl.filters) == 0 {
pl.processTrack(track, 0)
return
}

for i, filter := range pl.filters {
var field string
switch filter.Type {
Expand All @@ -73,31 +78,35 @@ func (pl *playlistLoader) OnTrack(track *Track) {
}

if filter.regexp.Match([]byte(val)) {
name := track.Name
pl.processTrack(track, i)
}
}
}

if len(track.Tags["tvg-id"]) == 0 {
log.WithField("track", track).Warn("missing tvg-id")
}
func (pl *playlistLoader) processTrack(track *Track, priority int) {
name := track.Name

if existingPriority, exists := pl.priorities[name]; !exists || i < existingPriority {
idx := pl.findIndexWithID(track)
if idx != -1 {
if strings.Contains(track.Name, "HD") {
delete(pl.priorities, pl.tracks[idx].Name)
pl.tracks[idx] = *track
} else {
continue
}
} else {
if !exists {
pl.tracks = append(pl.tracks, *track)
}
}
pl.priorities[name] = i
} else if exists {
log.WithField("track", track).Warn("duplicate name")
if len(track.Tags["tvg-id"]) == 0 {
log.WithField("track", track).Debug("missing tvg-id")
}

if existingPriority, exists := pl.priorities[name]; !exists || priority < existingPriority {
idx := pl.findIndexWithID(track)
if idx != -1 {
if strings.Contains(track.Name, "HD") {
delete(pl.priorities, pl.tracks[idx].Name)
pl.tracks[idx] = *track
} else {
return
}
} else {
if !exists {
pl.tracks = append(pl.tracks, *track)
}
}
pl.priorities[name] = priority
} else {
log.WithField("track", track).Warn("duplicate name")
}
}

Expand Down