feat: Make registry key configurable via software finder config

cetteup · Jan 16, 2023 · d473ea7 · d473ea7
1 parent acfb7cd
commit d473ea7
Show file tree

Hide file tree

Showing 18 changed files with 120 additions and 20 deletions.
diff --git a/internal/domain/game_title_test.go b/internal/domain/game_title_test.go
@@ -112,6 +112,7 @@ func TestGameTitle_AddCustomConfig(t *testing.T) {
 				FinderConfigs: []software_finder.Config{
 					{
 						ForType:           software_finder.RegistryFinder,
+						RegistryKey:       software_finder.RegistryKeyLocalMachine,
 						RegistryPath:      "default",
 						RegistryValueName: "default",
 					},
@@ -322,6 +323,7 @@ func TestGameMod_ComputeFinderConfigs(t *testing.T) {
 				finderConfigs: []software_finder.Config{
 					{
 						ForType:           software_finder.RegistryFinder,
+						RegistryKey:       software_finder.RegistryKeyLocalMachine,
 						RegistryPath:      "some-game\\some-mod",
 						RegistryValueName: "InstallPath",
 					},
@@ -331,6 +333,7 @@ func TestGameMod_ComputeFinderConfigs(t *testing.T) {
 			expectedFinderConfigs: []software_finder.Config{
 				{
 					ForType:           software_finder.RegistryFinder,
+					RegistryKey:       software_finder.RegistryKeyLocalMachine,
 					RegistryPath:      "some-game\\some-mod",
 					RegistryValueName: "InstallPath",
 				},

diff --git a/internal/platforms/origin.go b/internal/platforms/origin.go
@@ -10,6 +10,7 @@ var OriginClient = domain.PlatformClient{
 	Platform: domain.PlatformOrigin,
 	FinderConfig: software_finder.Config{
 		ForType:           software_finder.RegistryFinder,
+		RegistryKey:       software_finder.RegistryKeyLocalMachine,
 		RegistryPath:      "SOFTWARE\\WOW6432Node\\Origin",
 		RegistryValueName: "ClientPath",
 	},

diff --git a/internal/router/router_test.go b/internal/router/router_test.go
@@ -83,6 +83,7 @@ func TestGameRouter_RegisterHandlers(t *testing.T) {
 			FinderConfigs: []software_finder.Config{
 				{
 					ForType:           software_finder.RegistryFinder,
+					RegistryKey:       software_finder.RegistryKeyLocalMachine,
 					RegistryPath:      "SOFTWARE\\some-game",
 					RegistryValueName: "some-value-name",
 				},
@@ -128,6 +129,7 @@ func TestGameRouter_RegisterHandlers(t *testing.T) {
 			FinderConfigs: []software_finder.Config{
 				{
 					ForType:           software_finder.RegistryFinder,
+					RegistryKey:       software_finder.RegistryKeyLocalMachine,
 					RegistryPath:      "SOFTWARE\\some-game",
 					RegistryValueName: "some-value-name",
 				},
@@ -174,13 +176,15 @@ func TestGameRouter_RegisterHandlers(t *testing.T) {
 				Platform: "some-platform",
 				FinderConfig: software_finder.Config{
 					ForType:           software_finder.RegistryFinder,
+					RegistryKey:       software_finder.RegistryKeyLocalMachine,
 					RegistryPath:      "SOFTWARE\\some-client",
 					RegistryValueName: "some-value-name",
 				},
 			},
 			FinderConfigs: []software_finder.Config{
 				{
 					ForType:           software_finder.RegistryFinder,
+					RegistryKey:       software_finder.RegistryKeyLocalMachine,
 					RegistryPath:      "SOFTWARE\\some-game",
 					RegistryValueName: "some-value-name",
 				},
@@ -220,6 +224,7 @@ func TestGameRouter_RegisterHandlers(t *testing.T) {
 			FinderConfigs: []software_finder.Config{
 				{
 					ForType:           software_finder.RegistryFinder,
+					RegistryKey:       software_finder.RegistryKeyLocalMachine,
 					RegistryPath:      "SOFTWARE\\some-game",
 					RegistryValueName: "some-value-name",
 				},
@@ -258,6 +263,7 @@ func TestGameRouter_RegisterHandlers(t *testing.T) {
 			FinderConfigs: []software_finder.Config{
 				{
 					ForType:           software_finder.RegistryFinder,
+					RegistryKey:       software_finder.RegistryKeyLocalMachine,
 					RegistryPath:      "SOFTWARE\\some-game",
 					RegistryValueName: "some-value-name",
 				},
@@ -293,13 +299,15 @@ func TestGameRouter_RegisterHandlers(t *testing.T) {
 				Platform: "some-platform",
 				FinderConfig: software_finder.Config{
 					ForType:           software_finder.RegistryFinder,
+					RegistryKey:       software_finder.RegistryKeyLocalMachine,
 					RegistryPath:      "SOFTWARE\\some-client",
 					RegistryValueName: "some-value-name",
 				},
 			},
 			FinderConfigs: []software_finder.Config{
 				{
 					ForType:           software_finder.RegistryFinder,
+					RegistryKey:       software_finder.RegistryKeyLocalMachine,
 					RegistryPath:      "SOFTWARE\\some-game",
 					RegistryValueName: "some-value-name",
 				},
@@ -335,6 +343,7 @@ func TestGameRouter_RegisterHandlers(t *testing.T) {
 			FinderConfigs: []software_finder.Config{
 				{
 					ForType:           software_finder.RegistryFinder,
+					RegistryKey:       software_finder.RegistryKeyLocalMachine,
 					RegistryPath:      "SOFTWARE\\some-game",
 					RegistryValueName: "some-value-name",
 				},
@@ -364,13 +373,15 @@ func TestGameRouter_RegisterHandlers(t *testing.T) {
 				Platform: "some-platform",
 				FinderConfig: software_finder.Config{
 					ForType:           software_finder.RegistryFinder,
+					RegistryKey:       software_finder.RegistryKeyLocalMachine,
 					RegistryPath:      "SOFTWARE\\some-client",
 					RegistryValueName: "some-value-name",
 				},
 			},
 			FinderConfigs: []software_finder.Config{
 				{
 					ForType:           software_finder.RegistryFinder,
+					RegistryKey:       software_finder.RegistryKeyLocalMachine,
 					RegistryPath:      "SOFTWARE\\some-game",
 					RegistryValueName: "some-value-name",
 				},
@@ -400,6 +411,7 @@ func TestGameRouter_RegisterHandlers(t *testing.T) {
 			FinderConfigs: []software_finder.Config{
 				{
 					ForType:           software_finder.RegistryFinder,
+					RegistryKey:       software_finder.RegistryKeyLocalMachine,
 					RegistryPath:      "SOFTWARE\\some-game",
 					RegistryValueName: "some-value-name",
 				},
@@ -429,6 +441,7 @@ func TestGameRouter_RegisterHandlers(t *testing.T) {
 			FinderConfigs: []software_finder.Config{
 				{
 					ForType:           software_finder.RegistryFinder,
+					RegistryKey:       software_finder.RegistryKeyLocalMachine,
 					RegistryPath:      "SOFTWARE\\some-game",
 					RegistryValueName: "some-value-name",
 				},

diff --git a/internal/titles/bf1.go b/internal/titles/bf1.go
@@ -17,6 +17,7 @@ var Bf1 = domain.GameTitle{
 	FinderConfigs: []software_finder.Config{
 		{
 			ForType:           software_finder.RegistryFinder,
+			RegistryKey:       software_finder.RegistryKeyLocalMachine,
 			RegistryPath:      "SOFTWARE\\WOW6432Node\\EA Games\\Battlefield 1",
 			RegistryValueName: "Install Dir",
 		},

diff --git a/internal/titles/bf1942.go b/internal/titles/bf1942.go
@@ -27,6 +27,7 @@ var Bf1942 = domain.GameTitle{
 	FinderConfigs: []software_finder.Config{
 		{
 			ForType:           software_finder.RegistryFinder,
+			RegistryKey:       software_finder.RegistryKeyLocalMachine,
 			RegistryPath:      "SOFTWARE\\WOW6432Node\\EA Games\\Battlefield 1942",
 			RegistryValueName: "GAMEDIR",
 		},
@@ -38,6 +39,7 @@ var Bf1942 = domain.GameTitle{
 			[]software_finder.Config{
 				{
 					ForType:           software_finder.RegistryFinder,
+					RegistryKey:       software_finder.RegistryKeyLocalMachine,
 					RegistryPath:      "SOFTWARE\\WOW6432Node\\EA Games\\Battlefield 1942 Xpack1",
 					RegistryValueName: "GAMEDIR",
 				},
@@ -54,6 +56,7 @@ var Bf1942 = domain.GameTitle{
 			[]software_finder.Config{
 				{
 					ForType:           software_finder.RegistryFinder,
+					RegistryKey:       software_finder.RegistryKeyLocalMachine,
 					RegistryPath:      "SOFTWARE\\WOW6432Node\\EA Games\\Battlefield 1942 Xpack2",
 					RegistryValueName: "GAMEDIR",
 				},

diff --git a/internal/titles/bf2.go b/internal/titles/bf2.go
@@ -28,6 +28,7 @@ var Bf2 = domain.GameTitle{
 	FinderConfigs: []software_finder.Config{
 		{
 			ForType:           software_finder.RegistryFinder,
+			RegistryKey:       software_finder.RegistryKeyLocalMachine,
 			RegistryPath:      "SOFTWARE\\WOW6432Node\\Electronic Arts\\EA Games\\Battlefield 2",
 			RegistryValueName: "InstallDir",
 		},
@@ -39,6 +40,7 @@ var Bf2 = domain.GameTitle{
 			[]software_finder.Config{
 				{
 					ForType:           software_finder.RegistryFinder,
+					RegistryKey:       software_finder.RegistryKeyLocalMachine,
 					RegistryPath:      "SOFTWARE\\WOW6432Node\\Electronic Arts\\EA Games\\Battlefield 2 Special Forces",
 					RegistryValueName: "InstallDir",
 				},

diff --git a/internal/titles/bf4.go b/internal/titles/bf4.go
@@ -17,6 +17,7 @@ var Bf4 = domain.GameTitle{
 	FinderConfigs: []software_finder.Config{
 		{
 			ForType:           software_finder.RegistryFinder,
+			RegistryKey:       software_finder.RegistryKeyLocalMachine,
 			RegistryPath:      "SOFTWARE\\WOW6432Node\\EA Games\\Battlefield 4",
 			RegistryValueName: "Install Dir",
 		},

diff --git a/internal/titles/bfvietnam.go b/internal/titles/bfvietnam.go
@@ -22,6 +22,7 @@ var BfVietnam = domain.GameTitle{
 	FinderConfigs: []software_finder.Config{
 		{
 			ForType:           software_finder.RegistryFinder,
+			RegistryKey:       software_finder.RegistryKeyLocalMachine,
 			RegistryPath:      "SOFTWARE\\WOW6432Node\\EA Games\\Battlefield Vietnam",
 			RegistryValueName: "GAMEDIR",
 		},

diff --git a/internal/titles/cod.go b/internal/titles/cod.go
@@ -13,6 +13,7 @@ var Cod = domain.GameTitle{
 	FinderConfigs: []software_finder.Config{
 		{
 			ForType:           software_finder.RegistryFinder,
+			RegistryKey:       software_finder.RegistryKeyLocalMachine,
 			RegistryPath:      "SOFTWARE\\WOW6432Node\\Activision\\Call of Duty",
 			RegistryValueName: "InstallPath",
 		},
@@ -31,6 +32,7 @@ var CodUO = domain.GameTitle{
 	FinderConfigs: []software_finder.Config{
 		{
 			ForType:           software_finder.RegistryFinder,
+			RegistryKey:       software_finder.RegistryKeyLocalMachine,
 			RegistryPath:      "SOFTWARE\\WOW6432Node\\Activision\\Call of Duty United Offensive",
 			RegistryValueName: "InstallPath",
 		},

diff --git a/internal/titles/cod2.go b/internal/titles/cod2.go
@@ -13,6 +13,7 @@ var Cod2 = domain.GameTitle{
 	FinderConfigs: []software_finder.Config{
 		{
 			ForType:           software_finder.RegistryFinder,
+			RegistryKey:       software_finder.RegistryKeyLocalMachine,
 			RegistryPath:      "SOFTWARE\\WOW6432Node\\Activision\\Call of Duty 2",
 			RegistryValueName: "InstallPath",
 		},

diff --git a/internal/titles/cod4.go b/internal/titles/cod4.go
@@ -13,6 +13,7 @@ var Cod4 = domain.GameTitle{
 	FinderConfigs: []software_finder.Config{
 		{
 			ForType:           software_finder.RegistryFinder,
+			RegistryKey:       software_finder.RegistryKeyLocalMachine,
 			RegistryPath:      "SOFTWARE\\WOW6432Node\\Activision\\Call of Duty 4",
 			RegistryValueName: "InstallPath",
 		},

diff --git a/internal/titles/codwaw.go b/internal/titles/codwaw.go
@@ -13,6 +13,7 @@ var CodWaw = domain.GameTitle{
 	FinderConfigs: []software_finder.Config{
 		{
 			ForType:           software_finder.RegistryFinder,
+			RegistryKey:       software_finder.RegistryKeyLocalMachine,
 			RegistryPath:      "SOFTWARE\\WOW6432Node\\Activision\\Call of Duty WAW",
 			RegistryValueName: "InstallPath",
 		},

diff --git a/internal/titles/fear_sec2.go b/internal/titles/fear_sec2.go
@@ -16,6 +16,7 @@ var FearSec2 = domain.GameTitle{
 	FinderConfigs: []software_finder.Config{
 		{
 			ForType:           software_finder.RegistryFinder,
+			RegistryKey:       software_finder.RegistryKeyLocalMachine,
 			RegistryPath:      "SOFTWARE\\WOW6432Node\\FEAR-Community.org\\FEAR Combat (SEC2)",
 			RegistryValueName: "Path",
 		},

diff --git a/internal/titles/paraworld.go b/internal/titles/paraworld.go
@@ -23,6 +23,7 @@ var Paraworld = domain.GameTitle{
 	FinderConfigs: []software_finder.Config{
 		{
 			ForType:           software_finder.RegistryFinder,
+			RegistryKey:       software_finder.RegistryKeyLocalMachine,
 			RegistryPath:      "SOFTWARE\\WOW6432Node\\Sunflowers\\ParaWorld",
 			RegistryValueName: "InstallDir",
 		},

diff --git a/internal/titles/swat4.go b/internal/titles/swat4.go
@@ -16,11 +16,13 @@ var Swat4 = domain.GameTitle{
 	FinderConfigs: []software_finder.Config{
 		{
 			ForType:           software_finder.RegistryFinder,
+			RegistryKey:       software_finder.RegistryKeyLocalMachine,
 			RegistryPath:      "SOFTWARE\\WOW6432Node\\Sierra\\SWAT 4",
 			RegistryValueName: "InstallPath",
 		},
 		{
 			ForType:           software_finder.RegistryFinder,
+			RegistryKey:       software_finder.RegistryKeyLocalMachine,
 			RegistryPath:      "SOFTWARE\\WOW6432Node\\GOG.com\\Games\\1409964317",
 			RegistryValueName: "PATH",
 		},
@@ -48,11 +50,13 @@ var Swat4X = domain.GameTitle{
 	FinderConfigs: []software_finder.Config{
 		{
 			ForType:           software_finder.RegistryFinder,
+			RegistryKey:       software_finder.RegistryKeyLocalMachine,
 			RegistryPath:      "SOFTWARE\\WOW6432Node\\Sierra\\SWAT 4 - THE STETCHKOV SYNDICATE",
 			RegistryValueName: "InstallPath",
 		},
 		{
 			ForType:           software_finder.RegistryFinder,
+			RegistryKey:       software_finder.RegistryKeyLocalMachine,
 			RegistryPath:      "SOFTWARE\\WOW6432Node\\GOG.com\\Games\\1409964317",
 			RegistryValueName: "PATH",
 		},

diff --git a/internal/titles/vietcong.go b/internal/titles/vietcong.go
@@ -15,6 +15,7 @@ var Vietcong = domain.GameTitle{
 	FinderConfigs: []software_finder.Config{
 		{
 			ForType:           software_finder.RegistryFinder,
+			RegistryKey:       software_finder.RegistryKeyLocalMachine,
 			RegistryPath:      "SOFTWARE\\WOW6432Node\\Pterodon\\Vietcong",
 			RegistryValueName: "InstallDir",
 		},

diff --git a/pkg/software_finder/software_finder.go b/pkg/software_finder/software_finder.go
@@ -9,12 +9,16 @@ import (
 )
 
 type FinderType string
+type RegistryKey registry.Key
 type PathType int
 
 const (
 	RegistryFinder FinderType = "RegistryFinder"
 	PathFinder     FinderType = "PathFinder"
 
+	RegistryKeyCurrentUser  = RegistryKey(registry.CURRENT_USER)
+	RegistryKeyLocalMachine = RegistryKey(registry.LOCAL_MACHINE)
+
 	PathTypeFile = iota
 	PathTypeDir
 )
@@ -32,6 +36,7 @@ type FileRepository interface {
 
 type Config struct {
 	ForType           FinderType
+	RegistryKey       RegistryKey
 	RegistryPath      string
 	RegistryValueName string
 	InstallPath       string
@@ -159,5 +164,5 @@ func (f *SoftwareFinder) getInstallDirFromPath(config Config) (string, error) {
 }
 
 func (f *SoftwareFinder) getInstallDirFromRegistry(config Config) (string, error) {
-	return f.registryRepository.GetStringValue(registry.LOCAL_MACHINE, config.RegistryPath, config.RegistryValueName)
+	return f.registryRepository.GetStringValue(registry.Key(config.RegistryKey), config.RegistryPath, config.RegistryValueName)
 }