Add enhancements (#39)

* Add enhancements

* more

Author: loganmc10

cheat-parser.go

@@ -35,57 +35,66 @@ func main() {
 		log.Panic(err)
 	}
 
-	basePath := "Config/Cheats"
-	items, err := fs.ReadDir(basePath)
-	if err != nil {
-		log.Panic(err)
-	}
-
 	cheatDB := map[string]map[string]Cheat{}
-	currentGame := ""
-	currentCheat := ""
-	for _, item := range items {
-		file, err := fs.Open(filepath.Join(basePath, item.Name()))
+
+	paths := []string{"Config/Cheats", "Config/Enhancements"}
+	for _, basePath := range paths {
+		items, err := fs.ReadDir(basePath)
 		if err != nil {
 			log.Panic(err)
 		}
-		defer file.Close() //nolint:errcheck
-		scanner := bufio.NewScanner(file)
-		for scanner.Scan() {
-			game := cheatDB[currentGame]
-			cheat := game[currentCheat]
-			if strings.HasPrefix(scanner.Text(), "[") {
-				currentGame = strings.Trim(scanner.Text(), "[]")
-				cheatDB[currentGame] = map[string]Cheat{}
-			} else if strings.HasPrefix(scanner.Text(), "Name=") {
-				// do nothing
-			} else if strings.HasPrefix(scanner.Text(), "$") {
-				currentCheat = strings.TrimPrefix(scanner.Text(), "$")
-				game[currentCheat] = Cheat{}
-				cheatDB[currentGame] = game
-			} else if strings.HasPrefix(scanner.Text(), "Note=") {
-				cheat.Note = strings.TrimPrefix(scanner.Text(), "Note=")
-				game[currentCheat] = cheat
-			} else if scanner.Text() == "" {
-				// do nothing
-			} else if strings.Contains(scanner.Text(), "?") && cheat.Options == nil {
-				cheat.Options = map[string]string{}
-				cheat.Data = append(cheat.Data, scanner.Text())
-				game[currentCheat] = cheat
-			} else if cheat.Options != nil && len(strings.Split(scanner.Text(), " ")[0]) < 8 {
-				cheat.Options[strings.Join(strings.Split(scanner.Text(), " ")[1:], " ")] = strings.Split(scanner.Text(), " ")[0]
-				game[currentCheat] = cheat
-			} else if isHex(scanner.Text()) {
-				cheat.Data = append(cheat.Data, scanner.Text())
-				game[currentCheat] = cheat
-			} else {
-				delete(game, currentCheat)
-				log.Printf("Unknown line in cheat file %s, %s: %s\n", filepath.Join(basePath, item.Name()), currentCheat, scanner.Text())
+		for _, item := range items {
+			currentGame := ""
+			currentCheat := ""
+			file, err := fs.Open(filepath.Join(basePath, item.Name()))
+			if err != nil {
+				log.Panic(err)
+			}
+			defer file.Close() //nolint:errcheck
+			scanner := bufio.NewScanner(file)
+			for scanner.Scan() {
+				if strings.HasPrefix(scanner.Text(), "[") {
+					currentGame = strings.Trim(scanner.Text(), "[]")
+					if cheatDB[currentGame] == nil {
+						cheatDB[currentGame] = map[string]Cheat{}
+					}
+				} else if strings.HasPrefix(scanner.Text(), "Name=") {
+					// do nothing
+				} else if strings.HasPrefix(scanner.Text(), "$") {
+					currentCheat = strings.TrimPrefix(scanner.Text(), "$")
+					cheatDB[currentGame][currentCheat] = Cheat{}
+				} else if strings.HasPrefix(scanner.Text(), "Note=") && currentCheat != "" {
+					current := cheatDB[currentGame][currentCheat]
+					current.Note = strings.TrimPrefix(scanner.Text(), "Note=")
+					cheatDB[currentGame][currentCheat] = current
+				} else if scanner.Text() == "" {
+					// do nothing
+				} else if strings.Contains(scanner.Text(), "?") && currentCheat != "" && cheatDB[currentGame][currentCheat].Options == nil {
+					current := cheatDB[currentGame][currentCheat]
+					current.Options = map[string]string{}
+					current.Data = append(cheatDB[currentGame][currentCheat].Data, scanner.Text())
+					cheatDB[currentGame][currentCheat] = current
+				} else if currentCheat != "" && cheatDB[currentGame][currentCheat].Options != nil && len(strings.Split(scanner.Text(), " ")[0]) < 8 {
+					cheatDB[currentGame][currentCheat].Options[strings.Join(strings.Split(scanner.Text(), " ")[1:], " ")] = strings.Split(scanner.Text(), " ")[0]
+				} else if isHex(scanner.Text()) && currentCheat != "" {
+					current := cheatDB[currentGame][currentCheat]
+					current.Data = append(cheatDB[currentGame][currentCheat].Data, scanner.Text())
+					cheatDB[currentGame][currentCheat] = current
+				} else if currentCheat != "" && (strings.HasPrefix(scanner.Text(), "OnByDefault=1") || strings.HasPrefix(scanner.Text(), "PluginList=")) {
+					// PJ64 specific, ignore
+					delete(cheatDB[currentGame], currentCheat)
+					log.Printf("Ignoring line in cheat file %s, %s: %s\n", filepath.Join(basePath, item.Name()), currentCheat, scanner.Text())
+					currentCheat = ""
+				} else if currentCheat != "" {
+					delete(cheatDB[currentGame], currentCheat)
+					log.Printf("Unknown line in cheat file %s, %s: %s\n", filepath.Join(basePath, item.Name()), currentCheat, scanner.Text())
+					currentCheat = ""
+				}
 			}
-		}
 
-		if err := scanner.Err(); err != nil {
-			log.Panic(err)
+			if err := scanner.Err(); err != nil {
+				log.Panic(err)
+			}
 		}
 	}