Encoding force stop feature implemented

vpoluyaktov · Nov 17, 2023 · 46f9122 · 46f9122
1 parent 27388f2
commit 46f9122
Show file tree

Hide file tree

Showing 9 changed files with 61 additions and 32 deletions.
diff --git a/internal/controller/buildController.go b/internal/controller/buildController.go
@@ -107,10 +107,12 @@ func (c *BuildController) startBuild(cmd *dto.BuildCommand) {
 	go c.updateTotalProgress()
 	jd.Start()
 
-	c.stopFlag = true
 	c.mq.SendMessage(mq.BuildController, mq.Footer, &dto.SetBusyIndicator{Busy: false}, false)
 	c.mq.SendMessage(mq.BuildController, mq.Footer, &dto.UpdateStatus{Message: ""}, false)
-	c.mq.SendMessage(mq.BuildController, mq.BuildPage, &dto.BuildComplete{Audiobook: cmd.Audiobook}, true)
+	if !c.stopFlag {
+		c.mq.SendMessage(mq.BuildController, mq.BuildPage, &dto.BuildComplete{Audiobook: cmd.Audiobook}, true)
+	}
+	c.stopFlag = true
 }
 
 func (c *BuildController) createFilesLists(ab *dto.Audiobook) {
@@ -218,21 +220,30 @@ func (c *BuildController) buildAudiobookPart(ab *dto.Audiobook, partId int) {
 		logger.Error("FFMPEG Error: " + string(err.Error()))
 	} else {
 		// add Metadata, cover image and convert to .m4b
-		_, err := ffmpeg.NewFFmpeg().
+		ffmpeg := ffmpeg.NewFFmpeg().
 			Input(part.AACFile, "").
 			Input(part.MetadataFile, "").
 			Input(ab.CoverURL, "").
 			Output(part.M4BFile, "-map_metadata 1 -y -acodec copy -y -vf pad='width=ceil(iw/2)*2:height=ceil(ih/2)*2'").
 			Overwrite(true).
 			Params("-hide_banner -nostdin -nostats").
-			SendProgressTo("http://127.0.0.1:" + strconv.Itoa(port)).
-			Run()
-		if err != nil {
+			SendProgressTo("http://127.0.0.1:" + strconv.Itoa(port))
+
+		go c.killSwitch(ffmpeg)
+		_, err := ffmpeg.Run()
+		if err != nil && ! c.stopFlag {
 			logger.Error("FFMPEG Error: " + string(err.Error()))
 		}
 	}
 }
 
+func (c *BuildController) killSwitch(ffmpeg *ffmpeg.FFmpeg) {
+	for !c.stopFlag {
+		time.Sleep(mq.PullFrequency)
+	}
+	ffmpeg.Kill()
+}
+
 func (c *BuildController) startProgressListener(fileId int) (net.Listener, int) {
 
 	basePortNumber := 31000

diff --git a/internal/controller/chaptersController.go b/internal/controller/chaptersController.go
@@ -124,7 +124,10 @@ func (c *ChaptersController) createChapters(cmd *dto.ChaptersCreate) {
 
 	c.mq.SendMessage(mq.ChaptersController, mq.Footer, &dto.SetBusyIndicator{Busy: false}, false)
 	c.mq.SendMessage(mq.ChaptersController, mq.Footer, &dto.UpdateStatus{Message: ""}, false)
-	c.mq.SendMessage(mq.ChaptersController, mq.ChaptersPage, &dto.ChaptersReady{Audiobook: cmd.Audiobook}, true)
+	if !c.stopFlag {
+		c.mq.SendMessage(mq.ChaptersController, mq.ChaptersPage, &dto.ChaptersReady{Audiobook: cmd.Audiobook}, true)
+	}
+	c.stopFlag = true
 }
 
 func (c *ChaptersController) searchReplaceDescription(cmd *dto.SearchReplaceDescriptionCommand) {

diff --git a/internal/controller/copyController.go b/internal/controller/copyController.go
@@ -115,10 +115,12 @@ func (c *CopyController) startCopy(cmd *dto.CopyCommand) {
 	go c.updateTotalCopyProgress()
 	jd.Start()
 
-	c.stopFlag = true
 	c.mq.SendMessage(mq.CopyController, mq.Footer, &dto.SetBusyIndicator{Busy: false}, false)
 	c.mq.SendMessage(mq.CopyController, mq.Footer, &dto.UpdateStatus{Message: ""}, false)
-	c.mq.SendMessage(mq.CopyController, mq.BuildPage, &dto.CopyComplete{Audiobook: cmd.Audiobook}, true)
+	if !c.stopFlag {
+		c.mq.SendMessage(mq.CopyController, mq.BuildPage, &dto.CopyComplete{Audiobook: cmd.Audiobook}, true)
+	}
+	c.stopFlag = true
 }
 
 func (c *CopyController) stopCopy(cmd *dto.StopCommand) {

diff --git a/internal/controller/downloadController.go b/internal/controller/downloadController.go
@@ -87,16 +87,15 @@ func (c *DownloadController) startDownload(cmd *dto.DownloadCommand) {
 		jd.AddJob(i, ia.DownloadFile, c.ab.OutputDir, localFileName, item.Server, item.Dir, iaFile.Name, i, iaFile.Size, c.updateFileProgress)
 	}
 	go c.updateTotalProgress()
-	// if c.stopFlag {
-	// 	break
-	// }
 
 	jd.Start()
 
-	c.stopFlag = true
 	c.mq.SendMessage(mq.DownloadController, mq.Footer, &dto.SetBusyIndicator{Busy: false}, false)
 	c.mq.SendMessage(mq.DownloadController, mq.Footer, &dto.UpdateStatus{Message: ""}, false)
-	c.mq.SendMessage(mq.DownloadController, mq.DownloadPage, &dto.DownloadComplete{Audiobook: cmd.Audiobook}, true)
+	if ! c.stopFlag {
+		c.mq.SendMessage(mq.DownloadController, mq.DownloadPage, &dto.DownloadComplete{Audiobook: cmd.Audiobook}, true)
+	}
+	c.stopFlag = true
 }
 
 func (c *DownloadController) updateFileProgress(fileId int, fileName string, size int64, pos int64, percent int) {

diff --git a/internal/controller/encodingController.go b/internal/controller/encodingController.go
@@ -93,10 +93,12 @@ func (c *EncodingController) startEncoding(cmd *dto.EncodeCommand) {
 	go c.updateTotalProgress()
 	jd.Start()
 
-	c.stopFlag = true
 	c.mq.SendMessage(mq.EncodingController, mq.Footer, &dto.SetBusyIndicator{Busy: false}, false)
 	c.mq.SendMessage(mq.EncodingController, mq.Footer, &dto.UpdateStatus{Message: ""}, false)
-	c.mq.SendMessage(mq.EncodingController, mq.EncodingPage, &dto.EncodingComplete{Audiobook: cmd.Audiobook}, true)
+	if !c.stopFlag {
+		c.mq.SendMessage(mq.EncodingController, mq.EncodingPage, &dto.EncodingComplete{Audiobook: cmd.Audiobook}, true)
+	}
+	c.stopFlag = true
 }
 
 func (c *EncodingController) encodeFile(fileId int, outputDir string) {
@@ -113,14 +115,16 @@ func (c *EncodingController) encodeFile(fileId int, outputDir string) {
 	go c.updateFileProgress(fileId, l)
 
 	// launch ffmpeg process
-	_, err := ffmpeg.NewFFmpeg().
+	ffmpeg := ffmpeg.NewFFmpeg().
 		Input(filePath, "-f mp3").
 		Output(tmpFile, fmt.Sprintf("-f mp3 -ab %dk -ar %d -vn", c.ab.Config.GetBitRate(), c.ab.Config.GetSampleRate())).
 		Overwrite(true).
 		Params("-hide_banner -nostdin -nostats -loglevel fatal").
-		SendProgressTo("http://127.0.0.1:" + strconv.Itoa(port)).
-		Run()
-	if err != nil {
+		SendProgressTo("http://127.0.0.1:" + strconv.Itoa(port))
+
+	go c.killSwitch(ffmpeg)
+	_, err := ffmpeg.Run()
+	if err != nil && !c.stopFlag {
 		logger.Error("FFMPEG Error: " + string(err.Error()))
 	} else {
 		err := os.Remove(filePath)
@@ -132,6 +136,13 @@ func (c *EncodingController) encodeFile(fileId int, outputDir string) {
 	}
 }
 
+func (c *EncodingController) killSwitch(ffmpeg *ffmpeg.FFmpeg) {
+	for !c.stopFlag {
+		time.Sleep(mq.PullFrequency)
+	}
+	ffmpeg.Kill()
+}
+
 func (c *EncodingController) startProgressListener(fileId int) (net.Listener, int) {
 	portNumber := config.Instance().GetBasePortNumber() + fileId
 	l, err := net.Listen("tcp", "127.0.0.1:"+strconv.Itoa(portNumber))

diff --git a/internal/ffmpeg/ffmpeg.go b/internal/ffmpeg/ffmpeg.go
@@ -1,7 +1,6 @@
 package ffmpeg
 
 import (
-	"os"
 	"os/exec"
 
 	"github.com/vpoluyaktov/abb_ia/internal/logger"
@@ -11,7 +10,7 @@ type FFmpeg struct {
 	input  input
 	output output
 	params params
-	process *os.Process
+	cmd    *exec.Cmd
 }
 
 type input struct {
@@ -33,7 +32,7 @@ func NewFFmpeg() *FFmpeg {
 		input:  input{},
 		output: output{},
 		params: params{},
-		process: nil,
+		cmd:    nil,
 	}
 	return ffmpeg
 }
@@ -76,13 +75,20 @@ func (f *FFmpeg) Run() (string, *exitErr) {
 		args = args.AppendArgs("-i").AppendFileName(fileName)
 	}
 	args = args.AppendArgs(f.output.args).AppendFileName(f.output.fileName)
-	command := exec.Command(cmd, args.String()...)
-	logger.Debug("FFMPEG cmd: " + command.String())
-	f.process = command.Process
-	out, err := command.Output()
+	f.cmd = exec.Command(cmd, args.String()...)
+	logger.Debug("FFMPEG cmd: " + f.cmd.String())
+	out, err := f.cmd.Output()
 	if err != nil {
 		return string(out), ExitErr(err)
 	} else {
 		return string(out), nil
 	}
 }
+
+func (f *FFmpeg) Kill() error {
+	if f.cmd != nil && f.cmd.Process != nil {
+		return f.cmd.Process.Kill()
+	} else {
+		return nil
+	}
+}
diff --git a/internal/ui/chaptersPage.go b/internal/ui/chaptersPage.go
@@ -332,7 +332,6 @@ func (p *ChaptersPage) stopConfirmation() {
 }
 
 func (p *ChaptersPage) stopChapters() {
-	// Stop the chapters here
 	p.mq.SendMessage(mq.ChaptersPage, mq.ChaptersController, &dto.StopCommand{Process: "Chapters", Reason: "User request"}, true)
 	p.mq.SendMessage(mq.ChaptersPage, mq.Frame, &dto.SwitchToPageCommand{Name: "SearchPage"}, true)
 }

diff --git a/internal/ui/downloadPage.go b/internal/ui/downloadPage.go
@@ -130,7 +130,6 @@ func (p *DownloadPage) stopConfirmation() {
 }
 
 func (p *DownloadPage) stopDownload() {
-	// Stop the download here
 	p.mq.SendMessage(mq.DownloadPage, mq.DownloadController, &dto.StopCommand{Process: "Download", Reason: "User request"}, false)
 	p.mq.SendMessage(mq.DownloadPage, mq.Frame, &dto.SwitchToPageCommand{Name: "SearchPage"}, false)
 }

diff --git a/internal/ui/encodingPage.go b/internal/ui/encodingPage.go
@@ -130,9 +130,8 @@ func (p *EncodingPage) stopConfirmation() {
 }
 
 func (p *EncodingPage) stopEncoding() {
-	// Stop the encoding here
-	p.mq.SendMessage(mq.EncodingPage, mq.EncodingController, &dto.StopCommand{Process: "Encoding", Reason: "User request"}, false)
-	p.mq.SendMessage(mq.EncodingPage, mq.Frame, &dto.SwitchToPageCommand{Name: "SearchPage"}, false)
+	p.mq.SendMessage(mq.EncodingPage, mq.EncodingController, &dto.StopCommand{Process: "Encoding", Reason: "User request"}, true)
+	p.mq.SendMessage(mq.EncodingPage, mq.Frame, &dto.SwitchToPageCommand{Name: "SearchPage"}, true)
 }
 
 func (p *EncodingPage) updateFileProgress(dp *dto.EncodingFileProgress) {