Browse Source

修复下载队列获取任务的时间判断错误问题,完善日志

Signed-off-by: allan716 <[email protected]>
allan716 3 years ago
parent
commit
c2980b7b41

+ 5 - 0
internal/logic/scan_played_video_subinfo/scan_played_video_subinfo.go

@@ -87,6 +87,11 @@ func NewScanPlayedVideoSubInfo(log *logrus.Logger, _settings *settings.Settings)
 }
 
 func (s *ScanPlayedVideoSubInfo) Cancel() {
+
+	defer func() {
+		s.log.Infoln("ScanPlayedVideoSubInfo.Cancel()")
+	}()
+
 	s.canceledLock.Lock()
 	s.canceled = true
 	s.canceledLock.Unlock()

+ 3 - 2
internal/pkg/task_queue/get.go

@@ -72,7 +72,7 @@ func (t *TaskQueue) GetOneWaitingJob() (bool, task_queue.OneJob, error) {
 				// 优先级 <= 3 也可以提前取出
 				TaskPriority <= HighTaskPriorityLevel ||
 				// 默认是 12h, A.After(B) : A > B == true
-				(time.Time)(tOneJob.UpdateTime).AddDate(0, 0, t.settings.AdvancedSettings.TaskQueue.OneSubDownloadInterval).After(time.Now()) == false && tOneJob.DownloadTimes > 0) {
+				(time.Time)(tOneJob.UpdateTime).Add(time.Duration(t.settings.AdvancedSettings.TaskQueue.OneSubDownloadInterval)*time.Hour).After(time.Now()) == false && tOneJob.DownloadTimes > 0) {
 				// 找到就返回
 				found = true
 				return true
@@ -114,7 +114,8 @@ func (t *TaskQueue) GetOneDoneJob() (bool, task_queue.OneJob, error) {
 				// 要在 三个月内
 				(time.Time)(tOneJob.CreatedTime).AddDate(0, 0, t.settings.AdvancedSettings.TaskQueue.ExpirationTime).After(time.Now()) == true &&
 				// 已经下载过的视频,要间隔 12 小时再次下载
-				(time.Time)(tOneJob.UpdateTime).AddDate(0, 0, t.settings.AdvancedSettings.TaskQueue.OneSubDownloadInterval).After(time.Now()) == false {
+				(time.Time)(tOneJob.UpdateTime).Add(
+					time.Duration(t.settings.AdvancedSettings.TaskQueue.OneSubDownloadInterval)*time.Hour).After(time.Now()) == false {
 				// 找到就返回
 				found = true
 				return true

+ 3 - 0
internal/pkg/video_scan_and_refresh_helper/video_scan_and_refresh_helper.go

@@ -90,6 +90,9 @@ func (v *VideoScanAndRefreshHelper) Start() error {
 }
 
 func (v *VideoScanAndRefreshHelper) Cancel() {
+	defer func() {
+		v.log.Infoln("VideoScanAndRefreshHelper.Cancel()")
+	}()
 	v.taskControl.Release()
 	v.taskControl.Reboot()
 }