Add "Fuzzy" search

dat/dat.go

@@ -4,9 +4,17 @@ package dat
 
 import (
 	"encoding/xml"
+	"fmt"
+	"strings"
+	//"slices"
+	"sort"
+	//"github.com/kr/pretty"
 	"log"
+	//"path/filepath"
 	"strconv"
 	"sync"
+	"path/filepath"
+	//"github.com/libretro/ludo/utils"
 )
 
 // DB is a database that contains many Dats, mapped to their system name
@@ -63,9 +71,15 @@ func Parse(dat []byte) Dat {
 }
 
 // FindByCRC loops over the Dats in the DB and concurrently matches CRC checksums.
-func (db *DB) FindByCRC(romPath string, romName string, crc uint32, games chan (Game)) {
+func (db *DB) FindByCRC(romPath string, romName string, crc uint32, games chan (Game)) (bool) {
 	var wg sync.WaitGroup
 	wg.Add(len(*db))
+	// this structure and subsequent object are remade ever run.
+	type SafeBool struct {
+		mu    sync.Mutex
+		found bool
+	}
+	game_found := SafeBool{found: false}
 	// For every Dat in the DB
 	for system, dat := range *db {
 		go func(dat Dat, crc uint32, system string) {
@@ -79,17 +93,41 @@ func (db *DB) FindByCRC(romPath string, romName string, crc uint32, games chan (
 					game.Path = romPath
 					game.System = system
 					games <- game
+					game_found.mu.Lock()
+					fmt.Printf("CRC match: %s -> %s\n", romName, game.Name)
+					game_found.found = true
+					game_found.mu.Unlock()
 				}
 			}
 			wg.Done()
 		}(dat, crc, system)
 	}
 	// Synchronize all the goroutines
 	wg.Wait()
+	// then check if the game was found or not. If it wasn't pass it to
+	// FindByROMName. For some reason this isn't consistently working.
+	//fmt.Printf("%s: %v\n", romName, game_found.found)
+	return game_found.found
+	// if !game_found.found {
+	// 	db.FindByROMName(romPath, filepath.Base(romPath), crc, games)
+	// }
 }
 
 // FindByROMName loops over the Dats in the DB and concurrently matches ROM names.
-func (db *DB) FindByROMName(romPath string, romName string, crc uint32, games chan (Game)) {
+// I'm going to update this to do fuzzy matching. To me that means:
+//   - try to build a list with a mutex,
+//   - if there is an exact name match use that
+//   - otherwise at the end look through the potential matches with a few
+//     adjustments for country codes (hoping for exact match)
+//   - finally try to find a match without country code
+//   - before failing
+func (db *DB) FindByROMName(romPath string, romName string, crc uint32, games chan (Game)) (bool) {
+	type SafeLookup struct {
+		mu    sync.Mutex
+		options []Game
+		found bool
+	}
+	game_found := SafeLookup{found: false}
 	var wg sync.WaitGroup
 	wg.Add(len(*db))
 	// For every Dat in the DB
@@ -103,16 +141,57 @@ func (db *DB) FindByROMName(romPath string, romName string, crc uint32, games ch
 				// If the checksums match
 				for _, ROM := range game.ROMs {
 					if romName == ROM.Name {
+						fmt.Printf("Exact match: %s -> %s\n", romName, ROM.Name)
 						game.Path = romPath
 						game.System = system
 						games <- game
+						game_found.mu.Lock()
+						game_found.found = true
+						game_found.mu.Unlock()
+					} else {
+						var gameName = strings.Split(romName, ".")[0]
+						var gameExt  = strings.Split(romName, ".")[1]
+						if (strings.Contains(ROM.Name, gameName)) &&
+						   (strings.Contains(ROM.Name, gameExt)) {
+							var option_has bool
+							for _, option := range game_found.options {
+								//fmt.Println(romName, option.Name)
+								if option.Name == game.Name {
+									option_has = true
+								} 
+							}
+							if !(option_has) {
+								game_found.mu.Lock()
+								//fmt.Println(romName, game.Name)
+								game.Path = romPath
+								game.System = system
+								game_found.options = append(game_found.options, game)
+								game_found.mu.Unlock()
+							}
+						}
 					}
-					// element is the element from someSlice for where we are
 				}
 			}
 			wg.Done()
 		}(dat, crc, system)
 	}
 	// Synchronize all the goroutines
 	wg.Wait()
+	if !game_found.found {
+		if len(game_found.options) > 0 {
+			game_found.found = true
+			sort.SliceStable(game_found.options, func(i, j int) bool {
+				return len(game_found.options[i].Name) < len(game_found.options[j].Name)
+			})
+			for _, option := range game_found.options {
+				fmt.Printf("Fuzzy match: %s -> %s for %s\n", filepath.Base(romPath), option.Name, option.System)
+				games <- option
+				break
+			}
+		}
+		//if game_found.found == false {
+		//	fmt.Printf("No match: %s\n", romName)
+		//}
+	}
+	return game_found.found
 }

go.mod

@@ -2,33 +2,38 @@ module github.com/libretro/ludo
 
 require (
 	github.com/adrg/xdg v0.4.0
-	github.com/andybalholm/brotli v1.1.0 // indirect
 	github.com/cavaliercoder/grab v2.0.0+incompatible
-	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/disintegration/imaging v1.6.2
 	github.com/fatih/structs v1.1.0
 	github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71
 	github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240118000515-a250818d05e3
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0
+	github.com/kr/pretty v0.2.1
+	github.com/lucasb-eyer/go-colorful v1.2.0
+	github.com/mholt/archiver/v3 v3.5.1
+	github.com/pelletier/go-toml v1.9.5
+	github.com/tanema/gween v0.0.0-20221212145351-621cc8a459d1
+	github.com/youpy/go-wav v0.3.2
+	golang.org/x/image v0.15.0
+	golang.org/x/mobile v0.0.0-20240112133503-c713f31d574b
+)
+
+require (
+	github.com/andybalholm/brotli v1.1.0 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/klauspost/compress v1.17.6 // indirect
 	github.com/klauspost/pgzip v1.2.6 // indirect
 	github.com/kr/text v0.2.0 // indirect
-	github.com/lucasb-eyer/go-colorful v1.2.0
-	github.com/mholt/archiver/v3 v3.5.1
 	github.com/nwaples/rardecode v1.1.3 // indirect
-	github.com/pelletier/go-toml v1.9.5
 	github.com/pierrec/lz4/v4 v4.1.21 // indirect
-	github.com/tanema/gween v0.0.0-20221212145351-621cc8a459d1
 	github.com/ulikunitz/xz v0.5.11 // indirect
-	github.com/youpy/go-wav v0.3.2
+	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
+	github.com/youpy/go-riff v0.1.0 // indirect
 	github.com/zaf/g711 v1.4.0 // indirect
-	golang.org/x/image v0.15.0
-	golang.org/x/mobile v0.0.0-20240112133503-c713f31d574b
 	golang.org/x/sys v0.17.0 // indirect
-	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
-	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/yaml.v3 v3.0.0 // indirect
 )
 
-go 1.13
+go 1.18