Cleanup now unused code
This commit is contained in:
parent
ff5502bbe7
commit
c107891505
22
s3Storage.go
22
s3Storage.go
@ -2,8 +2,6 @@ package main
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"bufio"
|
"bufio"
|
||||||
"fmt"
|
|
||||||
"net/url"
|
|
||||||
"os"
|
"os"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
@ -39,7 +37,9 @@ func (s *S3Storage) Setup(configuration Config) {
|
|||||||
func (s *S3Storage) Save(filePath string) string {
|
func (s *S3Storage) Save(filePath string) string {
|
||||||
// fmt.Println("Saving", filePath)
|
// fmt.Println("Saving", filePath)
|
||||||
|
|
||||||
file, err := os.Open(filePath) // For read access.
|
file, err := os.Open(filePath)
|
||||||
|
defer file.Close()
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal(err)
|
log.Fatal(err)
|
||||||
}
|
}
|
||||||
@ -56,22 +56,6 @@ func (s *S3Storage) Save(filePath string) string {
|
|||||||
panic(err)
|
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)
|
// fmt.Println("Uploaded", filePath, "to", response.Location)
|
||||||
|
|
||||||
return response.Location
|
return response.Location
|
||||||
|
Loading…
x
Reference in New Issue
Block a user