LogalDeveloper/owncast
0
Fork 0
Code Activity

Simplify HLS storage paths (#1393)

Browse Source 
* Remove private vs public HLS paths and add a HLS controller. Closes #875

* Use http.ServeFile instead
This commit is contained in:
Gabe Kangas
2021-09-12 11:32:42 -07:00
committed by GitHub
parent b92ad00926
commit 1b053ffd1b
11 changed files with 71 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/streamState.go
View File

@@ -50,17 +50,12 @@ func setStreamAsConnected(rtmpOut *io.PipeReader) {
go _yp.Start()
}
segmentPath := config.PublicHLSStoragePath
s3Config := data.GetS3Config()
segmentPath := config.HLSStoragePath
if err := setupStorage(); err != nil {
log.Fatalln("failed to setup the storage", err)
}
if s3Config.Enabled {
segmentPath = config.PrivateHLSStoragePath
}
go func() {
_transcoder = transcoder.NewTranscoder()
_transcoder.TranscoderCompleted = func(error) {
@@ -100,8 +95,8 @@ func SetStreamAsDisconnected() {
}
for index := range _currentBroadcast.OutputSettings {
playlistFilePath := fmt.Sprintf(filepath.Join(config.PrivateHLSStoragePath, "%d/stream.m3u8"), index)
segmentFilePath := fmt.Sprintf(filepath.Join(config.PrivateHLSStoragePath, "%d/%s"), index, offlineFilename)
playlistFilePath := fmt.Sprintf(filepath.Join(config.HLSStoragePath, "%d/stream.m3u8"), index)
segmentFilePath := fmt.Sprintf(filepath.Join(config.HLSStoragePath, "%d/%s"), index, offlineFilename)
if err := utils.Copy(offlineFilePath, segmentFilePath); err != nil {
log.Warnln(err)
@@ -191,7 +186,7 @@ func startOnlineCleanupTimer() {
_onlineCleanupTicker = time.NewTicker(1 * time.Minute)
go func() {
for range _onlineCleanupTicker.C {
transcoder.CleanupOldContent(config.PrivateHLSStoragePath)
transcoder.CleanupOldContent(config.HLSStoragePath)
}
}()
}