修复 hotfix 001

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

internal/pkg/hot_fix/hot_fix_001.go

@@ -30,6 +30,13 @@ func (h HotFix001) GetKey() string {
 }
 
 func (h HotFix001) Process() (interface{}, error) {
+
+	defer func() {
+		log_helper.GetLogger().Infoln("Hotfix", h.GetKey(), "End")
+	}()
+
+	log_helper.GetLogger().Infoln("Hotfix", h.GetKey(), "Start...")
+
 	return h.process()
 }
 
@@ -55,7 +62,7 @@ func (h HotFix001) process() (interface{}, error) {
 
 	for i, dir := range h.seriesRootDirs {
 		log_helper.GetLogger().Infoln("Fix Series Dir Index", i, dir, "Start...")
-		fixSeries, err := h.fixMovie(dir)
+		fixSeries, err := h.fixSeries(dir)
 		if err != nil {
 			log_helper.GetLogger().Infoln("Fix Series Dir Index", i, dir, "End...")
 			return nil, err

internal/pkg/hot_fix/hot_fix_hub.go

@@ -33,39 +33,47 @@ func HotFixProcess(param types.HotFixParam) error {
 	// 交叉对比，这个执行的顺序又上面 []ifaces.IHotFix 指定
 	for _, hotfixCase := range hotfixCases {
 		_, bFound := hotFixRecord[hotfixCase.GetKey()]
-		if bFound == false {
-			// 没有找到那么就需要进行修复
-			log_helper.GetLogger().Infoln("hotfix", hotfixCase.GetKey(), "start...")
-			processResult, err := hotfixCase.Process()
-			// 找到对应的 hotfix 方案进行 interface 数据的转换输出
-			switch hotfixCase.GetKey() {
-			case "001":
-				outStruct := processResult.(OutStruct001)
-				if err != nil {
-					for i, file := range outStruct.ErrFiles {
-						log_helper.GetLogger().Errorln("hotfix 001, rename failed,", i, file)
-					}
-					// 如果任意故障则跳出后续的修复
-					log_helper.GetLogger().Errorln("hotfix 001 failed, break")
-					return err
+		if bFound == true {
+			// 如果修复过了，那么就跳过
+			continue
+		}
+		// 没有找到那么就需要进行修复
+		processResult, err := hotfixCase.Process()
+		// 找到对应的 hotfix 方案进行 interface 数据的转换输出
+		switch hotfixCase.GetKey() {
+		case "001":
+			outStruct := processResult.(OutStruct001)
+			if err != nil {
+				for i, file := range outStruct.ErrFiles {
+					log_helper.GetLogger().Errorln("Hotfix 001, rename failed,", i, file)
+				}
+				// 如果任意故障则跳出后续的修复
+				log_helper.GetLogger().Errorln("Hotfix 001 failed, break")
+				return err
+			} else {
+				for i, file := range outStruct.RenamedFiles {
+					log_helper.GetLogger().Infoln("Hotfix 001, rename done,", i, file)
 				}
-				break
-			default:
-				continue
-			}
-			// 执行成功则存入数据库中，标记完成
-			markHotFixDone := models.HotFix{Key: hotfixCase.GetKey(), Done: true}
-			result = dao.GetDb().Create(&markHotFixDone)
-			if result == nil {
-				return errors.New(fmt.Sprintf("hotfix %s is done, but record failed, dao.GetDb().Create return nil", hotfixCase.GetKey()))
-			}
-			if result.Error != nil {
-				return errors.New(fmt.Sprintf("hotfix %s is done, but record failed, %s", hotfixCase.GetKey(), result.Error))
 			}
-			log_helper.GetLogger().Infoln("hotfix", hotfixCase.GetKey(), "is done")
+			break
+		default:
+			continue
 		}
+		// 执行成功则存入数据库中，标记完成
+		markHotFixDone := models.HotFix{Key: hotfixCase.GetKey(), Done: true}
+		result = dao.GetDb().Create(&markHotFixDone)
+		if result == nil {
+			nowError := errors.New(fmt.Sprintf("hotfix %s is done, but record failed, dao.GetDb().Create return nil", hotfixCase.GetKey()))
+			log_helper.GetLogger().Errorln(nowError)
+			return nowError
+		}
+		if result.Error != nil {
+			nowError := errors.New(fmt.Sprintf("hotfix %s is done, but record failed, %s", hotfixCase.GetKey(), result.Error))
+			log_helper.GetLogger().Errorln(nowError)
+			return nowError
+		}
+		log_helper.GetLogger().Infoln("Hotfix", hotfixCase.GetKey(), "is Recorded")
 		// 找到了，目前的逻辑是成功才插入，那么查询到了，就默认是执行成功了
 	}
 	return nil
-
 }