Merge cc5366b into 85efa6d

LeonarddeR · web-flow · commit d16d3b529258 · 2022-11-27T04:49:41.000+10:00
diff --git a/source/addonHandler/__init__.py b/source/addonHandler/__init__.py
@@ -1,6 +1,6 @@
 # A part of NonVisual Desktop Access (NVDA)
 # Copyright (C) 2012-2022 Rui Batista, NV Access Limited, Noelia Ruiz Martínez,
-# Joseph Lee, Babbage B.V., Arnold Loubriat, Łukasz Golonka
+# Joseph Lee, Babbage B.V., Arnold Loubriat, Łukasz Golonka, Leonard de Ruijter
 # This file is covered by the GNU General Public License.
 # See the file COPYING for more details.
 
@@ -21,7 +21,7 @@
 import zipfile
 from configobj import ConfigObj
 from configobj.validate import Validator
-from .packaging import initializeModulePackagePaths
+from .packaging import initializeAddonsNamespacePackage, initializeModulePackagePaths
 import config
 import languageHandler
 from logHandler import log
@@ -30,6 +30,7 @@
 from . import addonVersionCheck
 from .addonVersionCheck import isAddonCompatible
 import extensionPoints
+from types import ModuleType
 
 
 MANIFEST_FILENAME = "manifest.ini"
@@ -168,6 +169,7 @@ def initialize():
 	getAvailableAddons(refresh=True, isFirstLoad=True)
 	state.cleanupRemovedDisabledAddons()
 	state.save()
+	initializeAddonsNamespacePackage()
 	initializeModulePackagePaths()
 
 
@@ -395,16 +397,16 @@ def completeRemove(self,runUninstallTask=True):
 		_blockedAddons.discard(self.name)
 		state.save()
 
-	def addToPackagePath(self, package):
+	def addToPackagePath(self, package: ModuleType):
 		""" Adds this L{Addon} extensions to the specific package path if those exist.
 		This allows the addon to "run" / be available because the package is able to search its path,
 		looking for particular modules. This is used by the following:
 		- `globalPlugins`
 		- `appModules`
 		- `synthDrivers`
 		- `brailleDisplayDrivers`
+		- `visionEnhancementProviders`
 		@param package: the python module representing the package.
-		@type package: python module.
 		"""
 		# #3090: Ensure that we don't add disabled / blocked add-ons to package path.
 		# By returning here the addon does not "run"/ become active / registered.
diff --git a/source/addonHandler/packaging.py b/source/addonHandler/packaging.py
@@ -7,11 +7,15 @@
 """
 
 import os.path
-from typing import Optional
+from typing import Optional, List
 from types import ModuleType
 import globalVars
 import config
+import sys
+import importlib
 
+ADDONS_MODULE_NAME = "addons"
+"""The name of an importable module that nessts add-on code for every active add-on."""
 
 def initializeModulePackagePaths():
 	"""Initializes the module package paths for drivers and plugins.
@@ -60,3 +64,35 @@ def addDirsToPythonPackagePath(module: ModuleType, subdir: Optional[str] = None)
 	pathList = [fullPath]
 	pathList.extend(module.__path__)
 	module.__path__ = pathList
+
+
+def _createModule(moduleName: str, submoduleSearchLocations: Optional[List[str]] = None):
+	"""Creates a module with the given moduleName and adds it to sys.modules.
+	This ensures that the module can be imported.
+	@param moduleName: The name of the module, e.g. addons or addons.example.
+	@param submoduleSearchLocations: Can be provided if the module has to be a python namespace package.
+	"""
+	if moduleName in sys.modules:
+		# module already initialized
+		return
+	spec = importlib._bootstrap.ModuleSpec(moduleName, None)
+	if submoduleSearchLocations:
+		spec.submodule_search_locations = submoduleSearchLocations
+	module = importlib.util.module_from_spec(spec)
+	sys.modules[module.__name__] = module
+
+
+def initializeAddonsNamespacePackage():
+	"""Initializes the addons namespace package.
+	This ensures that all python code in an add-on can be imported, even if code lives
+	outside one of the standard package paths, such as appModules or globalPlugins.
+	For example, if an add-on named example has a python module called lib,
+	that module can be imported with `from addons.example import lib`
+	"""
+	# First, ensure that there is a placeholder addons module that does nothing,
+	# i.e. it has no associated path but is solely there to nest add-ons under it.
+	_createModule(ADDONS_MODULE_NAME)
+
+	from . import getRunningAddons
+	for addon in getRunningAddons():
+		_createModule(f"{ADDONS_MODULE_NAME}.{addon.name}", [addon.path])
