feat:增加clean指令

Author: JerryZhou343

cmd/clean.go

@@ -0,0 +1,37 @@
+package cmd
+
+import (
+	"github.com/JerryZhou343/cctool/internal/app"
+	"github.com/JerryZhou343/cctool/internal/console"
+	"github.com/JerryZhou343/cctool/internal/flags"
+	"github.com/JerryZhou343/cctool/internal/status"
+	"github.com/spf13/cobra"
+)
+
+var (
+	cleanCmd = cobra.Command{
+		Use:   "clean",
+		Short: "清除空白字幕",
+		Args:  cobra.OnlyValidArgs,
+		RunE: func(cmd *cobra.Command, args []string) (err error) {
+			if len(flags.SrcFiles) == 0 {
+				err = status.ErrSourceFileNotEnough
+				return
+			}
+			application.Run()
+			for _, itr := range flags.SrcFiles {
+				task := app.NewCleanTask(itr)
+				application.AddTask(task)
+			}
+
+			console.Console(application)
+			application.CheckTask()
+			application.Destroy()
+			return nil
+		},
+	}
+)
+
+func init() {
+	cleanCmd.PersistentFlags().StringSliceVarP(&flags.SrcFiles, "source", "s", []string{}, "单个或多个源文件")
+}

cmd/root.go

@@ -18,4 +18,5 @@ func init() {
 	RootCmd.AddCommand(&mergeCmd)
 	RootCmd.AddCommand(&generateCmd)
 	RootCmd.AddCommand(&convertCmd)
+	RootCmd.AddCommand(&cleanCmd)
 }

internal/app/application.go

@@ -19,6 +19,7 @@ import (
 	"github.com/JerryZhou343/cctool/internal/translate/tencent"
 	"github.com/panjf2000/ants/v2"
 	"github.com/pkg/errors"
+	"strings"
 	"sync"
 
 	"time"
@@ -47,6 +48,8 @@ type Application struct {
 	//生成字幕任务
 	generateTaskChan chan Task
 
+	cleanTaskChan chan Task
+
 	//任务数组
 	taskSlice []Task
 	//
@@ -64,6 +67,7 @@ func NewApplication() *Application {
 		translatorLock:    new(sync.Mutex),
 
 		convertTaskChan: make(chan Task, 100),
+		cleanTaskChan:   make(chan Task, 100),
 
 		generatorSet:     map[string]*SrtGenerator{},
 		idleGenerator:    map[string]struct{}{},
@@ -86,6 +90,7 @@ func (a *Application) Run() {
 	go a.translate()
 	go a.convert()
 	go a.generate()
+	go a.clean()
 }
 
 func (a *Application) GetRunningMsg() string {
@@ -190,7 +195,10 @@ func (a *Application) AddTask(task Task) (err error) {
 		a.generateTaskChan <- task
 	case TaskTypeConvert:
 		a.convertTaskChan <- task
+	case TaskTypeClean:
+		a.cleanTaskChan <- task
 	}
+
 	a.msgChan <- fmt.Sprintf("添加任务成功 %s", task)
 	a.taskSlice = append(a.taskSlice, task)
 	return nil
@@ -205,7 +213,7 @@ func (a *Application) CheckTask() {
 		select {
 		case <-time.After(2 * time.Second):
 			for _, itr := range a.taskSlice {
-				a.msgChan <- fmt.Sprintf("时间: %s %s",time.Now().Local().Format("2006-01-02 15:04:05"), itr)
+				a.msgChan <- fmt.Sprintf("时间: %s %s", time.Now().Local().Format("2006-01-02 15:04:05"), itr)
 
 				//任务超过最大重试次数就不再尝试
 				if itr.GetState() == TaskStateFailed && itr.GetFailedTimes() < 10 {
@@ -371,3 +379,61 @@ func (a *Application) convert() {
 		}
 	}
 }
+
+func (a *Application) clean() {
+	for {
+		select {
+		case t := <-a.cleanTaskChan:
+			_ = ants.Submit(func() {
+				var (
+					err error
+					ret []*srt.Srt
+					src []*srt.Srt
+				)
+				task := t.(*CleanTask)
+				task.State = TaskStateInit
+				err = task.Init()
+				if err != nil {
+					task.State = TaskStateFailed
+					task.Failed(err)
+					return
+				}
+
+				src, err = srt.Open(task.SrcFile)
+				if err != nil {
+					task.State = TaskStateFailed
+					task.Failed(err)
+					return
+				}
+				//doing
+				task.State = TaskStateDoing
+				newSequence := 0
+				for idx, itr := range src {
+					task.Progress = float32(idx+1) / float32(len(src))
+					if strings.TrimSpace(itr.Subtitle) == "" {
+						continue
+					} else {
+						newSequence += 1
+						ret = append(ret, &srt.Srt{
+							Sequence: newSequence,
+							Start:    itr.Start,
+							End:      itr.End,
+							Subtitle: itr.Subtitle,
+						})
+					}
+
+				}
+				//done
+				err = srt.WriteSrt(task.DstFile, ret)
+				if err != nil {
+					task.State = TaskStateFailed
+					task.Failed(err)
+					return
+				}
+				task.State = TaskStateDone
+			})
+		case <-a.ctx.Done():
+			return
+		}
+	}
+}

internal/app/common.go

@@ -22,6 +22,7 @@ const (
 	TaskTypeGenerate
 	TaskTypeConvert
 	TaskTypeMerge
+	TaskTypeClean
 )
 
 type TaskState int
@@ -116,7 +117,7 @@ func (t *TranslateTask) Init() (err error) {
 	absPath := filepath.Dir(absFilePath)
 	fileName := filepath.Base(absFilePath)
 	ext := filepath.Ext(fileName)
-	name := strings.Trim(fileName, ext)
+	name := strings.TrimRight(fileName, ext)
 	t.DstFile = filepath.Join(absPath, fmt.Sprintf("%s_%s%s", name, t.To, ext))
 	return
 }
@@ -171,7 +172,7 @@ func (c *ConvertTask) Init() (err error) {
 	absPath := filepath.Dir(absFilePath)
 	fileName := filepath.Base(absFilePath)
 	ext := filepath.Ext(fileName)
-	name := strings.Trim(fileName, ext)
+	name := strings.TrimRight(fileName, ext)
 	c.DstFile = filepath.Join(absPath, fmt.Sprintf("%s.%s", name, c.To))
 	return
 }
@@ -255,3 +256,67 @@ func (g *GenerateTask) Failed(err error) {
 func (g *GenerateTask) GetFailedTimes() int {
 	return g.FailedTimes
 }
+
+type CleanTask struct {
+	SrcFile     string
+	DstFile     string
+	State       TaskState
+	Err         error
+	Progress    float32
+	FailedTimes int
+}
+
+func NewCleanTask(srcFile string) *CleanTask {
+	return &CleanTask{
+		SrcFile:     srcFile,
+		DstFile:     "",
+		State:       TaskStateInit,
+		Err:         nil,
+		Progress:    0,
+		FailedTimes: 0,
+	}
+}
+
+func (c *CleanTask) Init() (err error) {
+	var (
+		absFilePath string
+	)
+	absFilePath, err = filepath.Abs(c.SrcFile)
+	if err != nil {
+		return
+	}
+	absPath := filepath.Dir(absFilePath)
+	fileName := filepath.Base(absFilePath)
+	ext := filepath.Ext(fileName)
+	name := strings.TrimRight(fileName, ext)
+	c.DstFile = filepath.Join(absPath, fmt.Sprintf("%s_%s%s", name, "clean", ext))
+
+	return
+}
+
+func (t *CleanTask) String() string {
+	if t.Err == nil {
+		return fmt.Sprintf("源文件: %s 目标文件: %s 进度: %.2f", t.SrcFile, t.DstFile, t.Progress*100) +
+			"% " + fmt.Sprintf("状态: %s", t.State)
+	} else {
+		return fmt.Sprintf("源文件: %s 目标文件: %s 进度: %.2f", t.SrcFile, t.DstFile, t.Progress*100) +
+			"% " + fmt.Sprintf("状态: %s 错误: %+v", t.State, t.Err)
+	}
+}
+
+func (t *CleanTask) Type() TaskType {
+	return TaskTypeClean
+}
+
+func (t *CleanTask) GetState() TaskState {
+	return t.State
+}
+
+func (g *CleanTask) Failed(err error) {
+	g.Err = err
+	g.FailedTimes++
+}
+
+func (g *CleanTask) GetFailedTimes() int {
+	return g.FailedTimes
+}

internal/app/translator.go

@@ -70,7 +70,7 @@ func (t *Translator) Do(ctx context.Context, task *TranslateTask, doneCallBack f
 				time.Sleep(t.interval)
 				tmp := strings.ReplaceAll(strings.ReplaceAll(itr.Subtitle, "\r\n", " "), "\n", " ")
 				strings.TrimSpace(tmp)
-				if tmp != ""{
+				if tmp != "" {
 					subtitle, err = t.tool.Do(tmp, task.From, task.To)
 				}
 				if err != nil {

internal/translate/baidu/baidu.go

@@ -88,7 +88,7 @@ func (t *Translator) call(params *url.Values) (ret *response, err error) {
 	}
 	defer rsp.Body.Close()
 	content, err = ioutil.ReadAll(rsp.Body)
-	if err != nil  || rsp.StatusCode != http.StatusOK{
+	if err != nil || rsp.StatusCode != http.StatusOK {
 		return
 	}
 	//log.Printf("%+v", string(content))

internal/translate/google/google.go

@@ -86,13 +86,13 @@ func (t *Translator) call(params *url.Values) (ret *response, err error) {
 	defer rsp.Body.Close()
 
 	content, err = ioutil.ReadAll(rsp.Body)
-	if err != nil || rsp.StatusCode != http.StatusOK{
+	if err != nil || rsp.StatusCode != http.StatusOK {
 		return
 	}
 	var arr []interface{}
 	json.Unmarshal(content, &arr)
 	ret = new(response)
-	if result, ok := arr[0].([]interface{});ok{
+	if result, ok := arr[0].([]interface{}); ok {
 		for _, itr := range result {
 			if v, ok := itr.([]interface{})[0].(string); ok {
 				ret.Dst += v

internal/translate/tencent/tencent.go

@@ -73,7 +73,7 @@ func (t *Translator) call(params *url.Values) (ret *response, err error) {
 	}
 	defer rsp.Body.Close()
 	content, err = ioutil.ReadAll(rsp.Body)
-	if err != nil  || rsp.StatusCode != http.StatusOK{
+	if err != nil || rsp.StatusCode != http.StatusOK {
 		return
 	}
 

main.go

@@ -7,8 +7,8 @@ import (
 
 var (
 	Major = 1
-	Minor = 0
-	Patch = 1
+	Minor = 1
+	Patch = 0
 )
 
 func main() {