Fix bug where customized video was not created

Author: marcelGoerentz

Dockerfile

@@ -73,11 +73,17 @@ RUN mkdir $THREADFIN_CONF && chmod a+rwX $THREADFIN_CONF && mkdir $THREADFIN_TEM
 # For VLC
 RUN sed -i 's/geteuid/getppid/' /usr/bin/vlc
 
+# Add threadfin group and user
+RUN addgroup -S threadfin -g ${THREADFIN_GID} && adduser -S threadfin -G threadfin -u ${THREADFIN_UID} -g ${THREADFIN_GID} -s /bin/sh
+
 # Configure container volume mappings
 VOLUME $THREADFIN_CONF
 VOLUME $THREADFIN_TEMP
 
 EXPOSE $THREADFIN_PORT
 
+# Set user
+USER threadfin
+
 # Run the Threadfin executable
 ENTRYPOINT ${THREADFIN_BIN}/threadfin -port=${THREADFIN_PORT} -config=${THREADFIN_CONF} -debug=${THREADFIN_DEBUG} -branch=${THREADFIN_BRANCH}

go.mod

@@ -7,10 +7,10 @@ require (
 	github.com/gorilla/websocket v1.5.3
 	github.com/hashicorp/go-version v1.7.0
 	github.com/koron/go-ssdp v0.0.4
-	golang.org/x/text v0.17.0
+	golang.org/x/text v0.18.0
 )
 
 require (
-	golang.org/x/net v0.26.0 // indirect
-	golang.org/x/sys v0.21.0 // indirect
+	golang.org/x/net v0.29.0 // indirect
+	golang.org/x/sys v0.25.0 // indirect
 )

go.sum

@@ -8,7 +8,13 @@ github.com/koron/go-ssdp v0.0.4 h1:1IDwrghSKYM7yLf7XCzbByg2sJ/JcNOZRXS2jczTwz0=
 github.com/koron/go-ssdp v0.0.4/go.mod h1:oDXq+E5IL5q0U8uSBcoAXzTzInwy5lEgC91HoKtbmZk=
 golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
 golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
+golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
+golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
 golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
 golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
+golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
 golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
+golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=

src/buffer.go

@@ -65,8 +65,7 @@ func createAlternativNoMoreStreamsVideo(pathToFile string) (error) {
 
 	}
 	if len(cmd.Args) > 0 {
-		fmt.Println("Executing command:", cmd.String())
-
+		showInfo("Streaming Status:Creating video from uploaded image for a customized no more stream video")
 		err := cmd.Run()
 		if err != nil {
 			return err
@@ -198,26 +197,40 @@ func bufferingStream(playlistID, streamingURL, backupStreamingURL1, backupStream
 				var contentOk, customizedVideo bool
 
 				imageFileList, err := os.ReadDir(System.Folder.Custom)
+				if err != nil {
+					ShowError(err, 0)
+				}
+				// Check if a customized video is available and use it if so
+				fileList, err := os.ReadDir(System.Folder.Video)
 				if err == nil {
-					// Check if a customized video is available and use it if so
-					fileList, err := os.ReadDir(System.Folder.Video)
-					if err == nil {
-						if len(fileList) == 1 {
-							content, err = os.ReadFile(System.Folder.Video + fileList[0].Name())
-							if err == nil {
-								contentOk = true
-								customizedVideo = true
-							} else {
-								ShowError(err, 0) // log error
-								return
+					var createContent = false
+					switch len(fileList) {
+					case 0: // If no customized video is available create one
+						createContent = true
+					case 1: // Is there only one file, use it
+						break
+					default:
+						// remove all found files
+						for _, file := range fileList {
+							os.Remove(System.Folder.Video + file.Name())
+						}
+						createContent = true
+					}
+					if createContent {
+						if len(imageFileList) > 0 {
+							err := createAlternativNoMoreStreamsVideo(System.Folder.Custom + imageFileList[0].Name())
+							if err != nil {
+								ShowError(err, 0)
 							}
 						}
+					}
+					content, err = os.ReadFile(System.Folder.Video + "stream-limit.ts")
+					if err == nil {
+						contentOk = true
+						customizedVideo = true
 					} else {
-						err := createAlternativNoMoreStreamsVideo(System.Folder.Custom + imageFileList[0].Name())
-						if err == nil {
-							contentOk = true
-							customizedVideo = true
-						}
+						ShowError(err, 0) // log error
+						return
 					}
 				}
 

threadfin.go

@@ -42,7 +42,7 @@ var GitHub = GitHubStruct{Branch: "Main", User: "marcelGoerentz", Repo: "Threadf
 const Name = "Threadfin"
 
 // Version : Version, die Build Nummer wird in der main func geparst.
-const Version = "1.5.0-beta"
+const Version = "1.5.1-beta"
 
 // DBVersion : Datanbank Version
 const DBVersion = "0.5.0"