Merge branch 'pr/985' into develop

Author: eirannejad

pyrevitlib/pyrevit/extensions/extpackages.py

@@ -432,16 +432,21 @@ def get_ext_packages(authorized_only=True):
     """
     extpkgs = []
     for ext_dir in user_config.get_ext_root_dirs():
-        extpkg_deffile = op.join(ext_dir, PLUGIN_EXT_DEF_FILE)
-        mlogger.debug('Looking for %s', extpkg_deffile)
-        # check for external ext def file
-        if op.exists(extpkg_deffile):
-            mlogger.debug('Found %s', extpkg_deffile)
-            _update_extpkgs(extpkg_deffile, extpkgs)
-        # check internals now
-        internal_extpkg_defs = _find_internal_extpkgs(ext_dir)
-        for int_def_file in internal_extpkg_defs:
-            _update_extpkgs(int_def_file, extpkgs)
+        # make a list of all availabe extension definition sources
+        # default is under the extensions directory that ships with pyrevit
+        extpkg_def_files = {op.join(ext_dir, PLUGIN_EXT_DEF_FILE)}
+        # add other sources added by the user (using the cli)
+        extpkg_def_files.update(user_config.get_ext_sources())
+        for extpkg_def_file in extpkg_def_files:
+            mlogger.debug('Looking for %s', extpkg_def_file)
+            # check for external ext def file
+            if op.exists(extpkg_def_file):
+                mlogger.debug('Found %s', extpkg_def_file)
+                _update_extpkgs(extpkg_def_file, extpkgs)
+            # check internals now
+            internal_extpkg_defs = _find_internal_extpkgs(ext_dir)
+            for int_def_file in internal_extpkg_defs:
+                _update_extpkgs(int_def_file, extpkgs)
 
     if authorized_only:
         return [x for x in extpkgs if x.user_has_access]

pyrevitlib/pyrevit/userconfig.py

@@ -108,6 +108,12 @@ def config_file(self):
         """Current config file path."""
         return self._cfg_file_path
 
+    @property
+    def environment(self):
+        if not self.has_section(CONSTS.EnvConfigsSectionName):
+            self.add_section(CONSTS.EnvConfigsSectionName)
+        return self.get_section(CONSTS.EnvConfigsSectionName)
+
     @property
     def core(self):
         if not self.has_section(CONSTS.ConfigsCoreSection):
@@ -562,12 +568,12 @@ def get_thirdparty_ext_root_dirs(self, include_default=True):
         Returns:
             :obj:`list`: list of strings. External user extension directories.
         """
-        dir_list = []
+        dir_list = set()
         if include_default:
             # add default ext path
-            dir_list.append(THIRDPARTY_EXTENSIONS_DEFAULT_DIR)
+            dir_list.add(THIRDPARTY_EXTENSIONS_DEFAULT_DIR)
         try:
-            dir_list.extend([
+            dir_list.update([
                 op.expandvars(op.normpath(x))
                 for x in self.core.get_option(
                     CONSTS.ConfigsUserExtensionsKey,
@@ -586,11 +592,19 @@ def get_ext_root_dirs(self):
             :obj:`list`: list of strings. user extension directories.
 
         """
-        dir_list = []
+        dir_list = set()
         if op.exists(EXTENSIONS_DEFAULT_DIR):
-            dir_list.append(EXTENSIONS_DEFAULT_DIR)
-        dir_list.extend(self.get_thirdparty_ext_root_dirs())
-        return list(set(dir_list))
+            dir_list.add(EXTENSIONS_DEFAULT_DIR)
+        dir_list.update(self.get_thirdparty_ext_root_dirs())
+        return list(dir_list)
+
+    def get_ext_sources(self):
+        """Return a list of extension definition source files"""
+        ext_sources = self.environment.get_option(
+            CONSTS.EnvConfigsExtensionLookupSourcesKey,
+            default_value=[],
+        )
+        return list(set(ext_sources))
 
     def set_thirdparty_ext_root_dirs(self, path_list):
         """Updates list of external extension directories in config file