Filter search results…

…for images. This prevents the deletion of other files than images like `appid.json` which holds special information like the logo position in the client.

Fixes boppreh#64

Author: Lucki

backup.go

@@ -33,11 +33,13 @@ func RemoveExisting(gridDir string, gameId string, artStyleExtensions []string)
 	if err != nil {
 		return err
 	}
+	images = filterForImages(images)
 
 	backups, err := filepath.Glob(filepath.Join(gridDir, "originals", gameId + artStyleExtensions[0] + " *.*"))
 	if err != nil {
 		return err
 	}
+	backups = filterForImages(backups)
 
 	all := append(images, backups...)
 	for _, path := range all {
@@ -77,12 +79,29 @@ func InsensitiveFilepath(path string) string {
 	return p
 }
 
+func filterForImages(paths []string) []string {
+	var matchedPaths []string
+	for _, path := range paths {
+		ext := filepath.Ext(path)
+		switch ext {
+		case ".png":
+			matchedPaths = append(matchedPaths, path)
+		case ".jpg":
+			matchedPaths = append(matchedPaths, path)
+		case ".jpeg":
+			matchedPaths = append(matchedPaths, path)
+		}
+	}
+	return matchedPaths
+}
+
 func LoadExisting(overridePath string, gridDir string, game *Game, artStyleExtensions []string) {
 	overridenIDs, _ := filepath.Glob(filepath.Join(overridePath, game.ID + artStyleExtensions[0] + ".*"))
 	if overridenIDs != nil && len(overridenIDs) > 0 {
 		loadImage(game, "local file in directory 'games'", overridenIDs[0])
 		return
 	}
+	overridenIDs = filterForImages(overridenIDs)
 
 	if game.Name != "" {
 		re := regexp.MustCompile(`\W+`)
@@ -105,6 +124,7 @@ func LoadExisting(overridePath string, gridDir string, game *Game, artStyleExten
 	}
 
 	files, err := filepath.Glob(filepath.Join(gridDir, game.ID + artStyleExtensions[0] + ".*"))
+	files = filterForImages(files)
 	if err == nil && len(files) > 0 {
 		err = loadImage(game, "manual customization", files[0])
 		if err == nil {