From c1078915058355f4680bd4c073be92da8ac5ff81 Mon Sep 17 00:00:00 2001 From: Gabe Kangas Date: Tue, 9 Jun 2020 09:31:27 -0700 Subject: [PATCH] Cleanup now unused code --- s3Storage.go | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/s3Storage.go b/s3Storage.go index 5fac389f6..a0480164b 100644 --- a/s3Storage.go +++ b/s3Storage.go @@ -2,8 +2,6 @@ package main import ( "bufio" - "fmt" - "net/url" "os" "strings" @@ -39,7 +37,9 @@ func (s *S3Storage) Setup(configuration Config) { func (s *S3Storage) Save(filePath string) string { // fmt.Println("Saving", filePath) - file, err := os.Open(filePath) // For read access. + file, err := os.Open(filePath) + defer file.Close() + if err != nil { log.Fatal(err) } @@ -56,22 +56,6 @@ func (s *S3Storage) Save(filePath string) string { panic(err) } - if s.host == "" { - // Take note of the root host location so we can regenerate full - // URLs to these files later when building the playlist in GenerateRemotePlaylist. - url, err := url.Parse(response.Location) - if err != nil { - fmt.Println(err) - } - - // The following is a bit of a hack to take the location URL string of that file - // and get just the base URL without the file from it. - pathComponents := strings.Split(url.Path, "/") - pathComponents[len(pathComponents)-1] = "" - pathString := strings.Join(pathComponents, "/") - s.host = fmt.Sprintf("%s://%s%s", url.Scheme, url.Host, pathString) - } - // fmt.Println("Uploaded", filePath, "to", response.Location) return response.Location