recorder: #32 fix not matched filename bug

Author: luxcgo

src/parser/ffmpeg.go

@@ -3,7 +3,6 @@ package parser
 import (
 	"io"
 	"os/exec"
-	"path/filepath"
 	"sync"
 
 	l "github.com/go-olive/olive/src/log"
@@ -45,9 +44,6 @@ func (p *ffmpeg) Type() string {
 }
 
 func (p *ffmpeg) Parse(streamURL string, out string) (err error) {
-	ext := filepath.Ext(out)
-	out = out[0:len(out)-len(ext)] + ".flv"
-
 	l.Logger.WithFields(logrus.Fields{
 		// "streamURL": streamURL,
 		"out": out,

src/parser/flv.go

@@ -1,8 +1,6 @@
 package parser
 
 import (
-	"path/filepath"
-
 	"github.com/go-olive/flv"
 	l "github.com/go-olive/olive/src/log"
 	"github.com/sirupsen/logrus"
@@ -25,9 +23,6 @@ func (this *customFlv) New() Parser {
 }
 
 func (this *customFlv) Parse(streamURL string, out string) (err error) {
-	ext := filepath.Ext(out)
-	out = out[0:len(out)-len(ext)] + ".flv"
-
 	l.Logger.WithFields(logrus.Fields{
 		// "streamURL": streamURL,
 		"out": out,

src/parser/streamlink.go

@@ -3,7 +3,6 @@ package parser
 import (
 	"io"
 	"os/exec"
-	"path/filepath"
 	"sync"
 
 	l "github.com/go-olive/olive/src/log"
@@ -42,9 +41,6 @@ func (s *streamlink) Type() string {
 
 // streamlink -o "a.mp4"  https://www.twitch.tv/nnabi best -f
 func (s *streamlink) Parse(streamURL string, out string) (err error) {
-	ext := filepath.Ext(out)
-	out = out[0:len(out)-len(ext)] + ".flv"
-
 	l.Logger.WithFields(logrus.Fields{
 		// "streamURL": streamURL,
 		"out": out,

src/parser/ytdlp.go

@@ -3,7 +3,6 @@ package parser
 import (
 	"io"
 	"os/exec"
-	"path/filepath"
 	"sync"
 
 	l "github.com/go-olive/olive/src/log"
@@ -42,9 +41,6 @@ func (p *ytdlp) Type() string {
 
 // yt-dlp -f "bv[height=1080]+ba/b" https://www.youtube.com/watch?v=f6PdkucL1hk
 func (p *ytdlp) Parse(streamURL string, out string) (err error) {
-	ext := filepath.Ext(out)
-	out = out[0:len(out)-len(ext)] + ".mp4"
-
 	l.Logger.WithFields(logrus.Fields{
 		// "streamURL": streamURL,
 		"out": out,

src/recorder/recorder.go

@@ -199,6 +199,15 @@ func (r *recorder) record() error {
 	}
 	out = filepath.Join(saveDir, out)
 
+	switch r.parser.Type() {
+	case "yt-dlp":
+		ext := filepath.Ext(out)
+		out = out[0:len(out)-len(ext)] + ".mp4"
+	default:
+		ext := filepath.Ext(out)
+		out = out[0:len(out)-len(ext)] + ".flv"
+	}
+
 	r.startTime = time.Now()
 	r.out = out