测试和调整定时器的执行逻辑细节。现在是多个任务可以并行执行，但是单个任务有且只有一个

Signed-off-by: allan716 <[email protected]>

TestCode/test_cron_runner.go

@@ -0,0 +1,27 @@
+package TestCode
+
+import (
+	"github.com/robfig/cron/v3"
+	"time"
+)
+
+func CronRunner() {
+	cronInstance := cron.New(cron.WithChain(cron.DelayIfStillRunning(cron.DefaultLogger)))
+
+	cronInstance.AddFunc("@every 2s", func() {
+		println(time.Now().Format("2006-01-02 15:04:05"), "cron runner A Start")
+		time.Sleep(5 * time.Second)
+		println(time.Now().Format("2006-01-02 15:04:05"), "cron runner A End")
+
+	})
+
+	cronInstance.AddFunc("@every 5s", func() {
+		println(time.Now().Format("2006-01-02 15:04:05"), "cron runner B Start")
+
+		println(time.Now().Format("2006-01-02 15:04:05"), "cron runner B End")
+	})
+
+	cronInstance.Start()
+
+	select {}
+}

TestCode/test_cron_runner_test.go

@@ -0,0 +1,8 @@
+package TestCode
+
+import "testing"
+
+func TestCronRunner(t *testing.T) {
+
+	CronRunner()
+}

internal/backend/backend_test.go

@@ -6,7 +6,7 @@ import (
 
 func TestStartBackEnd(t *testing.T) {
 
-	//cronHelper, err := cron_helper.NewCronHelper()
+	//cronHelper, err := cron_manager.NewCronHelper()
 	//if err != nil {
 	//	panic("NewCronHelper " + err.Error())
 	//}

internal/logic/cron_helper/cron_helper.go

@@ -25,7 +25,6 @@ type CronHelper struct {
 	videoScanAndRefreshHelper     *video_scan_and_refresh_helper.VideoScanAndRefreshHelper // 视频扫描和刷新的帮助类
 	cronLock                      sync.Mutex                                               // 锁
 	c                             *cron.Cron                                               // 定时器实例
-	c4UploadSub                   *cron.Cron                                               // 上传字幕专用定时器实例
 	Settings                      *settings.Settings                                       // 设置实例
 	log                           *logrus.Logger                                           // 日志实例
 	entryIDScanVideoProcess       cron.EntryID
@@ -101,8 +100,7 @@ func (ch *CronHelper) Start(runImmediately bool) {
 		}
 	}
 	// ----------------------------------------------
-	ch.c = cron.New(cron.WithChain(cron.SkipIfStillRunning(cron.DefaultLogger)))
-	ch.c4UploadSub = cron.New(cron.WithChain(cron.SkipIfStillRunning(cron.DefaultLogger)))
+	ch.c = cron.New(cron.WithChain(cron.DelayIfStillRunning(cron.DefaultLogger)))
 	{
 		// 测试部分定时器代码，提前运行
 		if ch.Settings.SpeedDevMode == true {
@@ -149,7 +147,7 @@ func (ch *CronHelper) Start(runImmediately bool) {
 		if ch.Settings.SpeedDevMode == true {
 			intervalNowTask = "@every 1s"
 		}
-		ch.entryIDUploadPlayedVideoSub, err = ch.c4UploadSub.AddFunc(intervalNowTask, ch.uploadVideoSub)
+		ch.entryIDUploadPlayedVideoSub, err = ch.c.AddFunc(intervalNowTask, ch.uploadVideoSub)
 		if err != nil {
 			ch.log.Panicln("CronHelper QueueDownloader, uploadVideoSub Cron entryID:", ch.entryIDUploadPlayedVideoSub, "Error:", err)
 		}
@@ -185,7 +183,6 @@ func (ch *CronHelper) Start(runImmediately bool) {
 		//----------------------------------------------
 		ch.log.Infoln("CronHelper Start...")
 		ch.c.Start()
-		ch.c4UploadSub.Start()
 		//----------------------------------------------
 		// 只有定时任务 start 之后才能拿到信息
 		if len(ch.c.Entries()) > 0 {
@@ -237,14 +234,6 @@ func (ch *CronHelper) Stop() {
 		ch.log.Infoln("CronHelper.Stop() context<-Done.")
 	}
 
-	nowContextUpload := ch.c4UploadSub.Stop()
-	select {
-	case <-time.After(5 * time.Minute):
-		ch.log.Warningln("Wait over 5 min, CronHelper upload is timeout")
-	case <-nowContextUpload.Done():
-		ch.log.Infoln("CronHelper.Stop() upload context<-Done.")
-	}
-
 	ch.cronLock.Lock()
 	ch.cronHelperRunning = false
 	ch.stopping = false