Merge 700d563 into 7dbe36d

CyrilleB79 · web-flow · commit c9815a9e5313 · 2024-12-05T11:13:34.000+01:00
diff --git a/source/core.py b/source/core.py
@@ -214,6 +214,28 @@ class NewNVDAInstance:
 	directory: Optional[str] = None
 
 
+def computeRestartCLIArgs(removeArgsList: list[str] | None = None) -> list[str]:
+	"""Generate an equivalent list of CLI arguments from the values in globalVars.appArgs.
+	:param removeArgsList: A list of value to ignore when looking in globalVars.appArgs.
+	"""
+	from __main__ import parser  # import from nda.pyw
+
+	if not removeArgsList:
+		removeArgsList = []
+	args = []
+	for arg, val in globalVars.appArgs._get_kwargs():
+		if val == parser.get_default(arg):
+			continue
+		if arg in removeArgsList:
+			continue
+		flag = [a.option_strings[0] for a in parser._actions if a.dest == arg][0]
+		args.append(flag)
+		if isinstance(val, bool):
+			continue
+		args.append(f"{val}")
+	return args
+
+
 def restartUnsafely():
 	"""Start a new copy of NVDA immediately.
 	Used as a last resort, in the event of a serious error to immediately restart NVDA without running any
@@ -239,13 +261,16 @@ def restartUnsafely():
 			sys.argv.remove(paramToRemove)
 		except ValueError:
 			pass
+	restartCLIArgs = computeRestartCLIArgs(
+		removeArgsList=["easeOfAccess"],
+	)
 	options = []
 	if NVDAState.isRunningAsSource():
 		options.append(os.path.basename(sys.argv[0]))
 	_startNewInstance(
 		NewNVDAInstance(
 			sys.executable,
-			subprocess.list2cmdline(options + sys.argv[1:]),
+			subprocess.list2cmdline(options + restartCLIArgs),
 			globalVars.appDir,
 		),
 	)
@@ -260,15 +285,9 @@ def restart(disableAddons=False, debugLogging=False):
 		return
 	import subprocess
 
-	for paramToRemove in (
-		"--disable-addons",
-		"--debug-logging",
-		"--ease-of-access",
-	) + languageHandler.getLanguageCliArgs():
-		try:
-			sys.argv.remove(paramToRemove)
-		except ValueError:
-			pass
+	restartCLIArgs = computeRestartCLIArgs(
+		removeArgsList=["disableAddons", "debugLogging", "language", "easeOfAccess"],
+	)
 	options = []
 	if NVDAState.isRunningAsSource():
 		options.append(os.path.basename(sys.argv[0]))
@@ -280,7 +299,7 @@ def restart(disableAddons=False, debugLogging=False):
 	if not triggerNVDAExit(
 		NewNVDAInstance(
 			sys.executable,
-			subprocess.list2cmdline(options + sys.argv[1:]),
+			subprocess.list2cmdline(options + restartCLIArgs),
 			globalVars.appDir,
 		),
 	):
diff --git a/source/globalVars.py b/source/globalVars.py
@@ -1,5 +1,5 @@
 # A part of NonVisual Desktop Access (NVDA)
-# Copyright (C) 2006-2022 NV Access Limited, Łukasz Golonka, Leonard de Ruijter, Babbage B.V.,
+# Copyright (C) 2006-2024 NV Access Limited, Łukasz Golonka, Leonard de Ruijter, Babbage B.V.,
 # Aleksey Sadovoy, Peter Vágner
 # This file may be used under the terms of the GNU General Public License, version 2 or later.
 # For more details see: https://www.gnu.org/licenses/gpl-2.0.html
@@ -41,7 +41,7 @@ class DefaultAppArgs(argparse.Namespace):
 	logFileName: Optional[os.PathLike] = ""
 	logLevel: int = 0
 	configPath: Optional[os.PathLike] = None
-	language: str = "en"
+	language: str | None = None
 	minimal: bool = False
 	secure: bool = False
 	"""
diff --git a/source/gui/settingsDialogs.py b/source/gui/settingsDialogs.py
@@ -800,16 +800,9 @@ def makeSettings(self, settingsSizer):
 		self.languageNames = languageHandler.getAvailableLanguages(presentational=True)
 		languageChoices = [x[1] for x in self.languageNames]
 		if languageHandler.isLanguageForced():
-			try:
-				cmdLangDescription = next(
-					ld for code, ld in self.languageNames if code == globalVars.appArgs.language
-				)
-			except StopIteration:
-				# In case --lang=Windows is passed to the command line, globalVars.appArgs.language is the current
-				# Windows language,, which may not be in the list of NVDA supported languages, e.g. Windows language may
-				# be 'fr_FR' but NVDA only supports 'fr'.
-				# In this situation, only use language code as a description.
-				cmdLangDescription = globalVars.appArgs.language
+			cmdLangDescription = next(
+				ld for code, ld in self.languageNames if code == globalVars.appArgs.language
+			)
 			languageChoices.append(
 				# Translators: Shown for a language which has been provided from the command line
 				# 'langDesc' would be replaced with description of the given locale.
diff --git a/source/languageHandler.py b/source/languageHandler.py
@@ -9,7 +9,6 @@
 """
 
 import os
-import sys
 import ctypes
 
 import weakref
@@ -25,7 +24,6 @@
 	List,
 	Optional,
 	Tuple,
-	Union,
 )
 
 # a few Windows locale constants
@@ -44,6 +42,10 @@
 
 LANGS_WITHOUT_TRANSLATIONS: FrozenSet[str] = frozenset(("en",))
 
+_language: str | None = None
+"""Language of NVDA's UI.
+"""
+
 installedTranslation: Optional[weakref.ReferenceType] = None
 """Saved copy of the installed translation for ease of wrapping.
 """
@@ -291,24 +293,9 @@ def getAvailableLanguages(presentational: bool = False) -> List[Tuple[str, str]]
 	return langs
 
 
-def getLanguageCliArgs() -> Tuple[str, ...]:
-	"""Returns all command line arguments which were used to set current NVDA language
-	or an empty tuple if language has not been specified from the CLI."""
-	for argIndex, argValue in enumerate(sys.argv):
-		if argValue == "--lang":
-			# Language was provided in a form `--lang lang_CODE`. The next position in `sys.argv` is a language code.
-			# It is impossible not to provide it in this case as it would be flagged as an error
-			# during arguments validation.
-			return (argValue, sys.argv[argIndex + 1])
-		if argValue.startswith("--lang="):
-			# Language in a form `--lang=lang_CODE`
-			return (argValue,)
-	return tuple()
-
-
 def isLanguageForced() -> bool:
 	"""Returns `True` if language is provided from the command line - `False` otherwise."""
-	return bool(getLanguageCliArgs())
+	return globalVars.appArgs.language is not None
 
 
 def getWindowsLanguage():
@@ -326,17 +313,15 @@ def getWindowsLanguage():
 
 def _createGettextTranslation(
 	localeName: str,
-) -> Union[None, gettext.GNUTranslations, gettext.NullTranslations]:
+) -> tuple[(None | gettext.GNUTranslations | gettext.NullTranslations), (str | None)]:
 	if localeName in LANGS_WITHOUT_TRANSLATIONS:
-		globalVars.appArgs.language = localeName
-		return gettext.translation("nvda", fallback=True)
+		return gettext.translation("nvda", fallback=True), localeName
 	try:
 		trans = gettext.translation("nvda", localedir="locale", languages=[localeName])
-		globalVars.appArgs.language = localeName
-		return trans
+		return trans, localeName
 	except IOError:
 		log.debugWarning(f"couldn't set the translation service locale to {localeName}")
-		return None
+		return None, None
 
 
 def setLanguage(lang: str) -> None:
@@ -347,6 +332,8 @@ def setLanguage(lang: str) -> None:
 	 - Current NVDA language (match the translation service)
 	 - the python locale for the thread (match the translation service, fallback to system default)
 	"""
+	global _language
+
 	if lang == "Windows":
 		localeName = getWindowsLanguage()
 	else:
@@ -356,12 +343,13 @@ def setLanguage(lang: str) -> None:
 		if winKernel.kernel32.SetThreadLocale(LCID) == 0:
 			log.debugWarning(f"couldn't set windows thread locale to {lang}")
 
-	trans = _createGettextTranslation(localeName)
+	trans, validatedLocalName = _createGettextTranslation(localeName)
 	if trans is None and "_" in localeName:
 		localeName = localeName.split("_")[0]
-		trans = _createGettextTranslation(localeName)
+		trans, validatedLocalName = _createGettextTranslation(localeName)
 	if trans is None:
-		trans = _createGettextTranslation("en")
+		trans, validatedLocalName = _createGettextTranslation("en")
+	_language = validatedLocalName
 
 	trans.install(names=["pgettext", "npgettext", "ngettext"])
 	setLocale(getLanguage())
@@ -451,7 +439,7 @@ def setLocale(localeName: str) -> None:
 
 
 def getLanguage() -> str:
-	return globalVars.appArgs.language
+	return _language
 
 
 def normalizeLanguage(lang: str) -> Optional[str]:
diff --git a/source/nvda.pyw b/source/nvda.pyw
@@ -190,9 +190,10 @@ parser.add_argument(
 	"The default value is forced if secure mode is enabled.\n",
 )
 parser.add_argument(
+	"-n",
 	"--lang",
 	dest="language",
-	default="en",
+	default=None,
 	type=stringToLang,
 	help=(
 		"Override the configured NVDA language.\n"
@@ -218,7 +219,12 @@ parser.add_argument(
 	help="Starts NVDA in secure mode",
 )
 parser.add_argument(
-	"--disable-addons", action="store_true", dest="disableAddons", default=False, help="Disable all add-ons"
+	"-d",
+	"--disable-addons",
+	action="store_true",
+	dest="disableAddons",
+	default=False,
+	help="Disable all add-ons"
 )
 parser.add_argument(
 	"--debug-logging",
@@ -320,6 +326,8 @@ parser.add_argument(
 	help="Started by Windows Ease of Access",
 )
 (globalVars.appArgs, globalVars.unknownAppArgs) = parser.parse_known_args()
+# Copy original app args
+globalVars.originalAppArgs = argparse.Namespace(**{k: v for (k, v) in globalVars.appArgs._get_kwargs()})
 # Make any app args path values absolute
 # So as to not be affected by the current directory changing during process lifetime.
 pathAppArgs = [
diff --git a/user_docs/en/changes.md b/user_docs/en/changes.md
@@ -46,6 +46,7 @@ To use this feature, "allow NVDA to control the volume of other applications" mu
 * Component updates:
   * Updated LibLouis Braille translator to [3.32.0](https://github.com/liblouis/liblouis/releases/tag/v3.32.0). (#17469, @LeonarddeR)
   * Updated CLDR to version 46.0. (#17484, @OzancanKaratas)
+* Short versions of the most commonly used command line Options have been added: `-d` for `--disable-addons` and `-n` for `--lang`. (#11644, @CyrilleB79)
 
 ### Bug Fixes
 
@@ -135,6 +136,7 @@ As the NVDA update check URL is now configurable directly within NVDA, no replac
 * The `space` keyword argument for `brailleDisplayDrivers.seikantk.InputGesture` now expects an `int` rather than a `bool`. (#17047, @school510587)
 * The `[upgrade]` configuration section including `[upgrade][newLaptopKeyboardLayout]` has been removed. (#17191)
 * In `NVDAObjects.window.scintilla.ScintillaTextInfo`, if no text is selected, the `collapse` method is overriden to expand to line if the `end` parameter is set to `True` (#17431, @nvdaes)
+* `languageHandler.getLanguageCliArgs` has been removed with no replacement. (#17486, @CyrilleB79)
 
 #### Deprecations
 
