LogalDeveloper/owncast
LogalDeveloper/owncast
0
Fork 0
Code

Fix the destination path. Closes #1455 (#1456)

Browse Source
This commit is contained in:
Gabe Kangas 2021-10-05 16:45:39 -07:00 committed by GitHub
parent 958c78641e
commit fb1c919e59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/storageproviders/s3Storage.go
View File

@ -5,6 +5,7 @@ import (
"fmt" "fmt"
"os" "os"
"path/filepath" "path/filepath"
"strings"
"github.com/owncast/owncast/core/data" "github.com/owncast/owncast/core/data"
"github.com/owncast/owncast/core/playlist" "github.com/owncast/owncast/core/playlist"
@ -130,11 +131,16 @@ func (s *S3Storage) Save(filePath string, retryCount int) (string, error) {
} }
defer file.Close() defer file.Close()
// Convert the local path to the variant/file path by stripping the local storage location.
normalizedPath := strings.TrimPrefix(filePath, config.HLSStoragePath)
// Build the remote path by adding the "hls" path prefix.
remotePath := strings.Join([]string{"hls", normalizedPath}, "")
maxAgeSeconds := utils.GetCacheDurationSecondsForPath(filePath) maxAgeSeconds := utils.GetCacheDurationSecondsForPath(filePath)
cacheControlHeader := fmt.Sprintf("max-age=%d", maxAgeSeconds) cacheControlHeader := fmt.Sprintf("max-age=%d", maxAgeSeconds)
uploadInput := &s3manager.UploadInput{ uploadInput := &s3manager.UploadInput{
Bucket: aws.String(s.s3Bucket), // Bucket to be used Bucket: aws.String(s.s3Bucket), // Bucket to be used
Key: aws.String(filePath), // Name of the file to be saved Key: aws.String(remotePath), // Name of the file to be saved
Body: file, // File Body: file, // File
CacheControl: &cacheControlHeader, CacheControl: &cacheControlHeader,
} }