Merge 0ae9c7f into 3894e25

LeonarddeR · web-flow · commit 3180e6039830 · 2022-07-19T18:32:45.000+10:00
diff --git a/source/buildVersion.py b/source/buildVersion.py
@@ -70,6 +70,7 @@ def formatVersionForGUI(year, major, minor):
 version_minor = 0
 version_build = 0  # Should not be set manually. Set in 'sconscript' provided by 'appVeyor.yml'
 version=_formatDevVersionString()
+version_detailed = formatBuildVersionString()
 publisher="unknown"
 updateVersionType=None
 try:
diff --git a/source/installer.py b/source/installer.py
@@ -21,6 +21,7 @@
 import easeOfAccess
 import COMRegistrationFixes
 import winKernel
+from typing import Dict, Union
 
 _wsh=None
 def _getWSH():
@@ -227,16 +228,23 @@ def removeOldProgramFiles(destPath):
 					log.warning(f"Couldn't remove file: {path!r}")
 
 
-uninstallerRegInfo={
-	"DisplayName":versionInfo.name,
-	"DisplayVersion":versionInfo.version,
-	"DisplayIcon":u"{installDir}\\images\\nvda.ico",
-	"InstallDir":u"{installDir}",
-	"Publisher":versionInfo.publisher,
-	"UninstallDirectory":u"{installDir}",
-	"UninstallString":u"{installDir}\\uninstall.exe",
-	"URLInfoAbout":versionInfo.url,
-}
+def getUninstallerRegInfo(installDir: str) -> Dict[str, Union[str, int]]:
+	"""
+	Constructs a dictionary that is written to the registry for NVDA to show up
+	in the Windows' Aps and Features overview.
+	"""
+	return dict(
+		DisplayName=f"{versionInfo.name} {versionInfo.version}",
+		DisplayVersion=versionInfo.version_detailed,
+		DisplayIcon=os.path.join(installDir, "images", "nvda.ico"),
+		# EstimatedSize is in KiB
+		EstimatedSize=getDirectorySize(installDir) // 1024,
+		InstallDir=installDir,
+		Publisher=versionInfo.publisher,
+		UninstallDirectory=installDir,
+		UninstallString=os.path.join(installDir, "uninstall.exe"),
+		URLInfoAbout=versionInfo.url,
+	)
 
 
 def getDirectorySize(path: str) -> int:
@@ -259,34 +267,22 @@ def registerInstallation(
 		startOnLogonScreen: bool,
 		configInLocalAppData: bool = False
 ) -> None:
-	calculatedUninstallerRegInfo = uninstallerRegInfo.copy()
-	# EstimatedSize is in KiB
-	estimatedSize = getDirectorySize(installDir)
-	log.debug(f"Estimated install size {estimatedSize}")
-	calculatedUninstallerRegInfo.update(EstimatedSize=estimatedSize // 1024)
+	calculatedUninstallerRegInfo = getUninstallerRegInfo(installDir)
+	log.debug(f"Estimated install size {calculatedUninstallerRegInfo.get('EstimatedSize')}")
 	with winreg.CreateKeyEx(
 		winreg.HKEY_LOCAL_MACHINE,
 		r"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\NVDA",
 		0,
 		winreg.KEY_WRITE
 	) as k:
 		for name, value in calculatedUninstallerRegInfo.items():
-			if isinstance(value, int):
-				winreg.SetValueEx(
-					k,
-					name,
-					None,
-					winreg.REG_DWORD,
-					value
-				)
-			else:
-				winreg.SetValueEx(
-					k,
-					name,
-					None,
-					winreg.REG_SZ,
-					value.format(installDir=installDir)
-				)
+			winreg.SetValueEx(
+				k,
+				name,
+				None,
+				winreg.REG_DWORD if isinstance(value, int) else winreg.REG_SZ,
+				value
+			)
 	with winreg.CreateKeyEx(winreg.HKEY_LOCAL_MACHINE,"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\nvda.exe",0,winreg.KEY_WRITE) as k:
 		winreg.SetValueEx(k,"",None,winreg.REG_SZ,os.path.join(installDir,"nvda.exe"))
 	with winreg.CreateKeyEx(winreg.HKEY_LOCAL_MACHINE, config.RegistryKey.NVDA.value, 0, winreg.KEY_WRITE) as k:
diff --git a/source/versionInfo.py b/source/versionInfo.py
@@ -21,7 +21,7 @@
 aboutMessage = _(
 	# Translators: "About NVDA" dialog box message
 	u"""{longName} ({name})
-Version: {version}
+Version: {version} ({version_detailed})
 URL: {url}
 {copyright}
 
