Replaced hardcoded SourceType with custom defined ISourceResolver.

2022-11-06 19:33:01 +01:00
parent 7188f88ba1
commit 35eb246080
34 changed files with 313 additions and 117 deletions
--- a/mods/cnc/installer/covertops.yaml
+++ b/mods/cnc/installer/covertops.yaml
@@ -1,4 +1,5 @@
 covertops: Covert Operations Expansion (English)
+	Type: Disc
 	IDFiles:
 		GAME/GAME.DAT: be5a6c4c0a581da09e8f34a3bbf7bd17e525085c
 		CONQUER.MIX: 713b53fa4c188ca9619c6bbeadbfc86513704266
--- a/mods/cnc/installer/firstdecade.yaml
+++ b/mods/cnc/installer/firstdecade.yaml
@@ -1,4 +1,5 @@
 tfd: C&C The First Decade (English)
+	Type: Disc
 	IDFiles:
 		data1.hdr: bef3a08c3fc1b1caf28ca0dbb97c1f900005930e
 		data1.cab: 12ad6113a6890a1b4d5651a75378c963eaf513b9
--- a/mods/cnc/installer/gdi95.yaml
+++ b/mods/cnc/installer/gdi95.yaml
@@ -1,4 +1,5 @@
 gdi95: C&C Gold (GDI Disc, English)
+	Type: Disc
 	IDFiles:
 		DISK.WAV: 8bef9a6687c0fe0afd57c6561df58fa6e64f145d
 		CONQUER.MIX: 833e02a09aae694659eb312d3838367f681d1b30
--- a/mods/cnc/installer/nod95.yaml
+++ b/mods/cnc/installer/nod95.yaml
@@ -1,4 +1,5 @@
 nod95: C&C Gold (Nod Disc, English)
+	Type: Disc
 	IDFiles:
 		DISK.WAV: 83a0235525afa5cd6096f2967e3eae032996e38c
 		CONQUER.MIX: 833e02a09aae694659eb312d3838367f681d1b30
--- a/mods/common/languages/en.ftl
+++ b/mods/common/languages/en.ftl
@@ -247,14 +247,14 @@ archive-validation-failed = Archive validation failed
 extracting = Extracting...
 extracting-entry = Extracting { $entry }
 archive-extraction-failed = Archive extraction failed
-mirror-selection-failed = Online mirror is not available. Please install from an original disc.
+mirror-selection-failed = Online mirror is not available. Please install from an original source.

-## InstallFromDiscLogic
-detecting-drives = Detecting drives
-checking-discs = Checking Discs
-searching-disc-for = Searching for { $title }
+## InstallFromSourceLogic
+detecting-sources = Detecting drives
+checking-sources = Checking Sources
+searching-source-for = Searching for { $title }
 content-package-installation = The following content packages will be installed:
-game-discs = Game Discs
+game-sources = Game Sources
 digital-installs = Digital Installs
 game-content-not-found = Game Content Not Found
 alternative-content-sources = Please insert or install one of the following content sources:
@@ -268,10 +268,10 @@ extracting-filename-progress = Extracting { $filename } ({ $progress }%)
 cancel = Cancel
 retry = Retry

-## InstallFromDiscLogic, LobbyLogic
+## InstallFromSourceLogic, LobbyLogic
 back = Back

-# InstallFromDiscLogic, ModContentPromptLogic
+# InstallFromSourceLogic, ModContentPromptLogic
 continue = Continue

 ## ModContentLogic
--- a/mods/d2k/installer/d2k-a.yaml
+++ b/mods/d2k/installer/d2k-a.yaml
@@ -1,4 +1,5 @@
 d2k-a: Dune 2000 (English)
+	Type: Disc
 	IDFiles:
 		MUSIC/AMBUSH.AUD: bd5926a56a83bc0e49f96037e1f909014ac0772a
 		SETUP/SETUP.Z: 937f5ceb1236bf3f3d4e43929305ffe5004078e7
--- a/mods/d2k/installer/d2k-b.yaml
+++ b/mods/d2k/installer/d2k-b.yaml
@@ -1,4 +1,5 @@
 d2k-b: Dune 2000 (English)
+	Type: Disc
 	IDFiles:
 		MUSIC/AMBUSH.AUD: bd5926a56a83bc0e49f96037e1f909014ac0772a
 		SETUP/SETUP.Z: 029722e70fb7636f8120028f5c9b6ce81627ff90
--- a/mods/d2k/installer/d2k-c.yaml
+++ b/mods/d2k/installer/d2k-c.yaml
@@ -1,4 +1,5 @@
 d2k-c: Dune 2000 (English)
+	Type: Disc
 	IDFiles:
 		MUSIC/AMBUSH.AUD: bd5926a56a83bc0e49f96037e1f909014ac0772a
 		SETUP/SETUP.Z: d939b39bdbc952b259ce2b45c0bbedefa534b7f2
--- a/mods/d2k/installer/d2k-d.yaml
+++ b/mods/d2k/installer/d2k-d.yaml
@@ -1,4 +1,5 @@
 d2k-d: Dune 2000 (English)
+	Type: Disc
 	IDFiles:
 		MUSIC/AMBUSH.AUD: bd5926a56a83bc0e49f96037e1f909014ac0772a
 		SETUP/SETUP.Z: 2411cc5df36954ebd534ceafa3007c8aa9232909
--- a/mods/d2k/installer/d2k-e.yaml
+++ b/mods/d2k/installer/d2k-e.yaml
@@ -1,4 +1,5 @@
 d2k-e: Dune 2000 (English)
+	Type: Disc
 	IDFiles:
 		MUSIC/AMBUSH.AUD: bd5926a56a83bc0e49f96037e1f909014ac0772a
 		SETUP/SETUP.Z: b476661e82eeb05949e97fa1f75fed2343174be5
--- a/mods/modcontent/content.yaml
+++ b/mods/modcontent/content.yaml
@@ -50,7 +50,7 @@ Background@CONTENT_PANEL:
 							Font: Bold
 							TextColor: CC0000
 							Text: Required
-						Image@DISC:
+						Image@SOURCE:
 							X: 275
 							Y: 2
 							Width: 20
@@ -58,7 +58,7 @@ Background@CONTENT_PANEL:
 							ImageCollection: modcontent
 							ImageName: cdicon
 							TooltipContainer: TOOLTIP_CONTAINER
-							TooltipTemplate: DISC_TOOLTIP
+							TooltipTemplate: SOURCE_TOOLTIP
 						Button@DOWNLOAD:
 							X: 304
 							Y: 0
@@ -74,7 +74,7 @@ Background@CONTENT_PANEL:
 							Font: Bold
 							TextColor: 00CC00
 							Text: Installed
-						Label@REQUIRES_DISC:
+						Label@REQUIRES_SOURCE:
 							X: 304
 							Width: 100
 							Height: 23
@@ -82,7 +82,7 @@ Background@CONTENT_PANEL:
 							Font: Bold
 							TextColor: DDDDDD
 							Text: Requires Disc
-		Button@CHECK_DISC_BUTTON:
+		Button@CHECK_SOURCE_BUTTON:
 			X: 30
 			Y: PARENT_BOTTOM - 52
 			Background: button-highlighted
@@ -101,8 +101,8 @@ Background@CONTENT_PANEL:
 			Key: escape
 		TooltipContainer@TOOLTIP_CONTAINER:

-Background@DISC_TOOLTIP:
-	Logic: ModContentDiscTooltipLogic
+Background@SOURCE_TOOLTIP:
+	Logic: ModContentSourceTooltipLogic
 	Background: panel-thinborder
 	Height: 25
 	Children:
@@ -111,12 +111,12 @@ Background@DISC_TOOLTIP:
 			Height: 23
 			Font: Bold
 			Text: Content available from:
-		Container@DISCS:
+		Container@SOURCES:
 			Y: 15
 			Width: PARENT_RIGHT - 10
 			Height: 7 # used as bottom margin
 			Children:
-				Label@DISC_TEMPLATE:
+				Label@SOURCE_TEMPLATE:
 					X: 20
 					Height: 14
 					Font: TinyBold
@@ -177,8 +177,8 @@ Container@PACKAGE_DOWNLOAD_PANEL:
 			Font: Bold
 			Key: escape

-Background@DISC_INSTALL_PANEL:
-	Logic: InstallFromDiscLogic
+Background@SOURCE_INSTALL_PANEL:
+	Logic: InstallFromSourceLogic
 	X: (WINDOW_RIGHT - WIDTH) / 2
 	Y: (WINDOW_BOTTOM - HEIGHT) / 2
 	Width: 500
--- a/mods/ra/installer/aftermath.yaml
+++ b/mods/ra/installer/aftermath.yaml
@@ -1,4 +1,5 @@
 aftermath: Aftermath Expansion Disc (English)
+	Type: Disc
 	IDFiles:
 		README.TXT: 9902fb74c019df1b76ff5634e68f0371d790b5e0
 		SETUP/INSTALL/PATCH.RTP: 5bce93f834f9322ddaa7233242e5b6c7fea0bf17
--- a/mods/ra/installer/allies95.yaml
+++ b/mods/ra/installer/allies95.yaml
@@ -1,4 +1,5 @@
 allied: Red Alert 95 (Allied Disc, English)
+	Type: Disc
 	IDFiles:
 		MAIN.MIX: 20ebe16f91ff79be2d672f1db5bae9048ff9357c
 			Length: 4096
--- a/mods/ra/installer/cnc95.yaml
+++ b/mods/ra/installer/cnc95.yaml
@@ -1,4 +1,5 @@
 cnc95: C&C Gold (GDI or Nod Disc, English)
+	Type: Disc
 	IDFiles:
 		CONQUER.MIX: 833e02a09aae694659eb312d3838367f681d1b30
 	Install:
--- a/mods/ra/installer/counterstrike.yaml
+++ b/mods/ra/installer/counterstrike.yaml
@@ -1,4 +1,5 @@
 counterstrike: Counterstrike Expansion Disc (English)
+	Type: Disc
 	IDFiles:
 		README.TXT: 0efe8087383f0b159a9633f891fb5f53c6097cd4
 		SETUP/INSTALL/CSTRIKE.RTP: fae8ba82db71574f6ecd8fb4ff4026fcb65d2adc
--- a/mods/ra/installer/firstdecade.yaml
+++ b/mods/ra/installer/firstdecade.yaml
@@ -1,4 +1,5 @@
 tfd: C&C The First Decade (English)
+	Type: Disc
 	IDFiles:
 		data1.hdr: bef3a08c3fc1b1caf28ca0dbb97c1f900005930e
 		data1.cab: 12ad6113a6890a1b4d5651a75378c963eaf513b9
--- a/mods/ra/installer/soviet95.yaml
+++ b/mods/ra/installer/soviet95.yaml
@@ -1,4 +1,5 @@
 soviet: Red Alert 95 (Soviet Disc, English)
+	Type: Disc
 	IDFiles:
 		MAIN.MIX: 9d108f18560716b684ab8b1da42cc7f3d1b52519
 			Length: 4096
--- a/mods/ts/installer/firestorm.yaml
+++ b/mods/ts/installer/firestorm.yaml
@@ -1,4 +1,5 @@
 fstorm: Firestorm Expansion Disc (English)
+	Type: Disc
 	IDFiles:
 		Install/README.TXT: f2810b540fce8f3880250213ee08c57780d81c20
 		Install/Language.dll: 4df87c1a2289da57dd14d0a7299546f37357fcca
--- a/mods/ts/installer/firstdecade.yaml
+++ b/mods/ts/installer/firstdecade.yaml
@@ -1,4 +1,5 @@
 tfd: C&C The First Decade (English)
+	Type: Disc
 	IDFiles:
 		data1.hdr: bef3a08c3fc1b1caf28ca0dbb97c1f900005930e
 		data1.cab: 12ad6113a6890a1b4d5651a75378c963eaf513b9
--- a/mods/ts/installer/tibsun.yaml
+++ b/mods/ts/installer/tibsun.yaml
@@ -1,4 +1,5 @@
 tibsun: Tiberian Sun (GDI or Nod Disc, English)
+	Type: Disc
 	IDFiles:
 		README.TXT: 45745c4a0c888317ec900208a426472779c42bf7
 		AUTOPLAY.WAV: 2dfce5d00f98b641849c29942b651f4e98d30e30