diff --git a/go.mod b/go.mod index 2735aa5..64c1c5f 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,7 @@ module segmento go 1.14 require ( + github.com/aws/aws-sdk-go v1.33.4 github.com/stretchr/testify v1.6.1 github.com/tcolgate/mp3 v0.0.0-20170426193717-e79c5a46d300 ) diff --git a/go.sum b/go.sum index c177cf4..9e95fd7 100644 --- a/go.sum +++ b/go.sum @@ -1,14 +1,26 @@ +github.com/aws/aws-sdk-go v1.33.4 h1:lhVZe2TkSjJz26jPBCBAvJvAy70Yxxlbm/Ciw1gmyRY= +github.com/aws/aws-sdk-go v1.33.4/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= +github.com/jmespath/go-jmespath v0.3.0 h1:OS12ieG61fsCg5+qLJ+SsW9NicxNkg3b25OyT2yCeUc= +github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/tcolgate/mp3 v0.0.0-20170426193717-e79c5a46d300 h1:XQdibLKagjdevRB6vAjVY4qbSr8rQ610YzTkWcxzxSI= github.com/tcolgate/mp3 v0.0.0-20170426193717-e79c5a46d300/go.mod h1:FNa/dfN95vAYCNFrIKRrlRo+MBLbwmR9Asa5f2ljmBI= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/main.go b/main.go index 176d6f2..57191ca 100644 --- a/main.go +++ b/main.go @@ -2,24 +2,14 @@ package main import ( "flag" - "fmt" "log" "net/http" "os" "segmento/pkg/media" "segmento/pkg/playlist" + "segmento/pkg/s3" ) -type consumer struct{} - -func (c *consumer) PlaylistSegmentAdded(p playlist.Playlist, s *playlist.PlaylistSegment) { - fmt.Println("in PlaylistSegmentAdded") -} - -func (c *consumer) PlaylistUpdated(p playlist.Playlist) { - fmt.Println("in PlaylistUpdated") -} - func main() { // TODO accept some flags with: // URL - source of stream @@ -51,7 +41,8 @@ func main() { segmenter := media.NewMP3Segmenter() publisher := &media.FakePublisher{} playlist := playlist.NewMediaPlaylist(resp.Body, segmenter, publisher) - playlist.AddConsumer(&consumer{}) + playlist.AddConsumer(&s3.Consumer{}) + if err = playlist.Run(); err != nil { log.Fatal(err) } diff --git a/pkg/playlist/playlist.go b/pkg/playlist/playlist.go index 8da014b..82cef5b 100644 --- a/pkg/playlist/playlist.go +++ b/pkg/playlist/playlist.go @@ -41,6 +41,9 @@ type MediaPlaylist struct { consumers map[Consumer]bool } +// TODO does it make sense to do 50% dependency injection and 50% consumers here? +// Why not just pass everything through the consumer? +// Or how about define these methods on the interface and force implementations to provide them? func NewMediaPlaylist(src io.Reader, segmenter media.Segmenter, publisher media.SegmentPublisher) *MediaPlaylist { p := MediaPlaylist{ src: src, diff --git a/pkg/s3/s3.go b/pkg/s3/s3.go new file mode 100644 index 0000000..92b1fec --- /dev/null +++ b/pkg/s3/s3.go @@ -0,0 +1,37 @@ +package s3 + +import ( + "fmt" + "log" + "segmento/pkg/playlist" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/session" +) + +const DefaultAwsRegion = "eu-west-1" + +func init() { + sess, err := session.NewSession(&aws.Config{Region: aws.String(DefaultAwsRegion)}) + if err != nil { + log.Fatal(err) + } +} + +type Consumer struct { + S3Bucket string + S3PathPrefix string +} + +func NewConsumer(bucket string, pathPrefix string) *Consumer { + c := Consumer{bucket, pathPrefix} + return &c +} + +func (c *Consumer) PlaylistUpdated(p playlist.Playlist) { + fmt.Println("s3: PlaylistUpdated") +} + +func (c *Consumer) PlaylistSegmentAdded(p playlist.Playlist, s *playlist.PlaylistSegment) { + fmt.Println("s3: PlaylistSegmentAdded") +}