修复 badger 初始化读取硬盘中数据的bug

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

internal/logic/cron_helper/cron_helper.go

@@ -109,9 +109,9 @@ func (ch *CronHelper) Start(runImmediately bool) {
 
 		ch.log.Infoln("First Time scanVideoProcessAdd2DownloadQueue Start")
 
-		if ch.settings.SpeedDevMode == false {
-			ch.scanVideoProcessAdd2DownloadQueue()
-		}
+		//if ch.settings.SpeedDevMode == false {
+		ch.scanVideoProcessAdd2DownloadQueue()
+		//}
 
 		ch.downloader.SupplierCheck()
 

internal/logic/task_queue/daily_download_limit.go

@@ -1,7 +1,6 @@
 package task_queue
 
 import (
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/badger_err_check"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"
 	"github.com/dgraph-io/badger/v3"
 	"time"
@@ -27,12 +26,11 @@ func GetDailyDownloadCount(supplierName string, publicIP string, whichDay ...str
 			key := []byte(MergeBucketAndKeyName(BucketNamePrefixSupplierDailyDownloadCounter, KeyName))
 			e, err := tx.Get(key)
 			if err != nil {
-
-				if badger_err_check.IsErrOk(err) == true {
+				if err == badger.ErrKeyNotFound {
 					return nil
+				} else {
+					return err
 				}
-
-				return err
 			}
 			valCopy, err := e.ValueCopy(nil)
 			if err != nil {

internal/logic/task_queue/task_queue.go

@@ -3,7 +3,6 @@ package task_queue
 import (
 	"errors"
 	"fmt"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/badger_err_check"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/global_value"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/settings"
@@ -364,10 +363,11 @@ func (t *TaskQueue) read() {
 				var item *badger.Item
 				item, err = tx.Get(key)
 				if err != nil {
-					if badger_err_check.IsErrOk(err) == true {
-						return nil
+					if err == badger.ErrKeyNotFound {
+						continue
+					} else {
+						return err
 					}
-					return err
 				}
 				valCopy, err := item.ValueCopy(nil)
 				if err != nil {
@@ -437,11 +437,9 @@ func (t *TaskQueue) save(taskPriority int) error {
 		func(tx *badger.Txn) error {
 			var err error
 
-			key := []byte(MergeBucketAndKeyName(BucketNamePrefixVideoSubDownloadQueue,
+			key := []byte(MergeBucketAndKeyName(
+				BucketNamePrefixVideoSubDownloadQueue,
 				fmt.Sprintf("%s_%d", t.queueName, taskPriority)))
-			if err != nil {
-				return err
-			}
 
 			b, err := t.taskPriorityMapList[taskPriority].ToJSON()
 			if err != nil {

internal/pkg/badger_err_check/checker.go

@@ -1,11 +0,0 @@
-package badger_err_check
-
-import "github.com/dgraph-io/badger/v3"
-
-func IsErrOk(err error) bool {
-	if err == badger.ErrKeyNotFound {
-		return true
-	}
-
-	return false
-}

internal/pkg/download_file_cache/download_file_cahce.go

@@ -2,7 +2,6 @@ package download_file_cache
 
 import (
 	"encoding/json"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/badger_err_check"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/settings"
 	"github.com/allanpk716/ChineseSubFinder/internal/types/supplier"
 	"github.com/dgraph-io/badger/v3"
@@ -28,11 +27,11 @@ func (d *DownloadFileCache) Get(fileUrlUID string) (bool, *supplier.SubInfo, err
 			e, err := tx.Get(key)
 			if err != nil {
 
-				if badger_err_check.IsErrOk(err) == true {
+				if err == badger.ErrKeyNotFound {
 					return nil
+				} else {
+					return err
 				}
-
-				return err
 			}
 			valCopy, err := e.ValueCopy(nil)
 			if err != nil {