diff --git a/main.go b/main.go index bf358c8..176d6f2 100644 --- a/main.go +++ b/main.go @@ -7,16 +7,16 @@ import ( "net/http" "os" "segmento/pkg/media" - "segmento/pkg/playlist2" + "segmento/pkg/playlist" ) type consumer struct{} -func (c *consumer) PlaylistSegmentAdded(p playlist2.Playlist, s *playlist2.PlaylistSegment) { +func (c *consumer) PlaylistSegmentAdded(p playlist.Playlist, s *playlist.PlaylistSegment) { fmt.Println("in PlaylistSegmentAdded") } -func (c *consumer) PlaylistUpdated(p playlist2.Playlist) { +func (c *consumer) PlaylistUpdated(p playlist.Playlist) { fmt.Println("in PlaylistUpdated") } @@ -50,7 +50,7 @@ func main() { segmenter := media.NewMP3Segmenter() publisher := &media.FakePublisher{} - playlist := playlist2.NewMediaPlaylist(resp.Body, segmenter, publisher) + playlist := playlist.NewMediaPlaylist(resp.Body, segmenter, publisher) playlist.AddConsumer(&consumer{}) if err = playlist.Run(); err != nil { log.Fatal(err) diff --git a/pkg/playlist2/playlist.go b/pkg/playlist/playlist.go similarity index 99% rename from pkg/playlist2/playlist.go rename to pkg/playlist/playlist.go index 7be555e..8da014b 100644 --- a/pkg/playlist2/playlist.go +++ b/pkg/playlist/playlist.go @@ -1,4 +1,4 @@ -package playlist2 +package playlist import ( "fmt" diff --git a/pkg/playlist2/playlist_test.go b/pkg/playlist/playlist_test.go similarity index 74% rename from pkg/playlist2/playlist_test.go rename to pkg/playlist/playlist_test.go index bfef669..99aa6d8 100644 --- a/pkg/playlist2/playlist_test.go +++ b/pkg/playlist/playlist_test.go @@ -1,9 +1,9 @@ -package playlist2_test +package playlist_test import ( "io" "segmento/pkg/media" - "segmento/pkg/playlist2" + "segmento/pkg/playlist" "strings" "testing" "time" @@ -51,21 +51,21 @@ type consumer struct { pCount, sCount int } -func (c *consumer) PlaylistUpdated(p playlist2.Playlist) { +func (c *consumer) PlaylistUpdated(p playlist.Playlist) { c.pCount++ } -func (c *consumer) PlaylistSegmentAdded(p playlist2.Playlist, s *playlist2.PlaylistSegment) { +func (c *consumer) PlaylistSegmentAdded(p playlist.Playlist, s *playlist.PlaylistSegment) { c.sCount++ } func TestMediaPlaylistImplements(t *testing.T) { - require.Implements(t, (*playlist2.Playlist)(nil), new(playlist2.MediaPlaylist)) + require.Implements(t, (*playlist.Playlist)(nil), new(playlist.MediaPlaylist)) } func TestMediaPlaylist(t *testing.T) { publisher := &FakeSegmentPublisher{} - playlist := playlist2.NewMediaPlaylist(&FakeReader{}, &FakeSegmenter{3}, publisher) + playlist := playlist.NewMediaPlaylist(&FakeReader{}, &FakeSegmenter{3}, publisher) err := playlist.Run() require.NoError(t, err) @@ -74,7 +74,7 @@ func TestMediaPlaylist(t *testing.T) { } func TestMediaPlaylistRender(t *testing.T) { - playlist := playlist2.NewMediaPlaylist(&FakeReader{}, &FakeSegmenter{2}, &FakeSegmentPublisher{}) + playlist := playlist.NewMediaPlaylist(&FakeReader{}, &FakeSegmenter{2}, &FakeSegmentPublisher{}) err := playlist.Run() require.NoError(t, err) @@ -91,9 +91,9 @@ func TestMediaPlaylistRender(t *testing.T) { func TestMediaPlaylistConsumer(t *testing.T) { consumer := &consumer{} - require.Implements(t, (*playlist2.Consumer)(nil), consumer) + require.Implements(t, (*playlist.Consumer)(nil), consumer) - playlist := playlist2.NewMediaPlaylist(&FakeReader{}, &FakeSegmenter{4}, &FakeSegmentPublisher{}) + playlist := playlist.NewMediaPlaylist(&FakeReader{}, &FakeSegmenter{4}, &FakeSegmentPublisher{}) playlist.AddConsumer(consumer) err := playlist.Run() require.NoError(t, err)