Navy.gif/owncast
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10 from graywolf336/fix-initial-offline-state

Browse Source 
Fix initial offline state
This commit is contained in:
Gabe Kangas 2020-06-18 18:08:26 -07:00 committed by GitHub
commit 88b2301321
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
utils.go
View File

@ -46,8 +46,7 @@ func copy(src, dst string) {
return return
} }
err = ioutil.WriteFile(dst, input, 0644) if err := ioutil.WriteFile(dst, input, 0644); err != nil {
if err != nil {
fmt.Println("Error creating", dst) fmt.Println("Error creating", dst)
fmt.Println(err) fmt.Println(err)
return return
@ -63,6 +62,9 @@ func resetDirectories(configuration Config) {
os.MkdirAll(configuration.PublicHLSPath, 0777) os.MkdirAll(configuration.PublicHLSPath, 0777)
os.MkdirAll(configuration.PrivateHLSPath, 0777) os.MkdirAll(configuration.PrivateHLSPath, 0777)
// Remove the previous thumbnail
os.Remove("webroot/thumbnail.jpg")
// Create private hls data dirs // Create private hls data dirs
if !configuration.VideoSettings.EnablePassthrough || len(configuration.VideoSettings.StreamQualities) == 0 { if !configuration.VideoSettings.EnablePassthrough || len(configuration.VideoSettings.StreamQualities) == 0 {
for index := range configuration.VideoSettings.StreamQualities { for index := range configuration.VideoSettings.StreamQualities {
@ -73,7 +75,6 @@ func resetDirectories(configuration Config) {
os.MkdirAll(path.Join(configuration.PrivateHLSPath, strconv.Itoa(0)), 0777) os.MkdirAll(path.Join(configuration.PrivateHLSPath, strconv.Itoa(0)), 0777)
os.MkdirAll(path.Join(configuration.PublicHLSPath, strconv.Itoa(0)), 0777) os.MkdirAll(path.Join(configuration.PublicHLSPath, strconv.Itoa(0)), 0777)
} }
} }
func createInitialOfflineState() { func createInitialOfflineState() {
@ -81,6 +82,7 @@ func createInitialOfflineState() {
if !fileExists("webroot/thumbnail.jpg") { if !fileExists("webroot/thumbnail.jpg") {
copy("static/logo.png", "webroot/thumbnail.jpg") copy("static/logo.png", "webroot/thumbnail.jpg")
} }
showStreamOfflineState(configuration) showStreamOfflineState(configuration)
} }

BIN
webroot/thumbnail.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 55 KiB