Fix #168: avoid creating duplicate link for addon

pythonFiles/include/blender_vscode/__init__.py

@@ -1,5 +1,6 @@
 import sys
 from dataclasses import dataclass
+from typing import List
 from pathlib import Path
 
 import bpy
@@ -11,7 +12,7 @@ class AddonInfo:
     module_name: str
 
 
-def startup(editor_address, addons_to_load: list[AddonInfo], allow_modify_external_python):
+def startup(editor_address, addons_to_load: List[AddonInfo], allow_modify_external_python: bool):
     if bpy.app.version < (2, 80, 34):
         handle_fatal_error("Please use a newer version of Blender")
 

pythonFiles/include/blender_vscode/communication.py

@@ -1,4 +1,5 @@
 import time
+from typing import Dict
 import flask
 import debugpy
 import random
@@ -88,12 +89,12 @@ def handle_get():
     return "OK"
 
 
-def register_post_handler(type, handler):
+def register_post_handler(type: str, handler):
     assert type not in post_handlers
     post_handlers[type] = handler
 
 
-def register_post_action(type, handler):
+def register_post_action(type: str, handler):
     def request_handler_wrapper(data):
         run_in_main_thread(partial(handler, data))
         return "OK"
@@ -105,7 +106,7 @@ def request_handler_wrapper(data):
 ###############################
 
 
-def send_connection_information(path_mappings):
+def send_connection_information(path_mappings: Dict):
     send_dict_as_json(
         {
             "type": "setup",

pythonFiles/include/blender_vscode/installation.py

@@ -9,7 +9,7 @@
 cwd_for_subprocesses = python_path.parent
 
 
-def ensure_packages_are_installed(package_names, allow_modify_external_python):
+def ensure_packages_are_installed(package_names, allow_modify_external_python: bool):
     if packages_are_installed(package_names):
         return
 

pythonFiles/include/blender_vscode/load_addons.py

@@ -2,6 +2,7 @@
 import sys
 import traceback
 from pathlib import Path
+from typing import List, Union, Optional, Dict
 
 import bpy
 
@@ -11,25 +12,28 @@
 from .utils import is_addon_legacy
 
 
-def setup_addon_links(addons_to_load: list[AddonInfo]):
-
-    path_mappings = []
+def setup_addon_links(addons_to_load: List[AddonInfo]) -> List[Dict]:
+    path_mappings: List[Dict] = []
 
     for addon_info in addons_to_load:
-        user_addon_directory = get_user_addon_directory(Path(addon_info.load_dir))
-        print(f"USER ADDON: {user_addon_directory}")
-
-        if not os.path.exists(user_addon_directory):
-            os.makedirs(user_addon_directory)
-
-        if is_addon_legacy(Path(addon_info.load_dir)) and not str(user_addon_directory) in sys.path:
-            sys.path.append(str(user_addon_directory))
-
-        if is_in_any_addon_directory(addon_info.load_dir):
-            load_path = addon_info.load_dir
+        default_directory = get_user_addon_directory(Path(addon_info.load_dir))
+        if is_addon_legacy(Path(addon_info.load_dir)):
+            if is_in_any_addon_directory(addon_info.load_dir):
+                # blender knows about addon and can load it
+                load_path = addon_info.load_dir
+            else:  # is in external dir of is in extensions dir
+                load_path = os.path.join(default_directory, addon_info.module_name)
+                if str(load_path) not in sys.path:
+                    sys.path.append(str(load_path))
+                create_link_in_user_addon_directory(addon_info.load_dir, load_path)
         else:
-            load_path = os.path.join(user_addon_directory, addon_info.module_name)
-            create_link_in_user_addon_directory(addon_info.load_dir, load_path)
+            if is_in_any_extension_directory(Path(addon_info.load_dir)):
+                # blender knows about extension and can load it
+                load_path = addon_info.load_dir
+            else:
+                os.makedirs(default_directory, exist_ok=True)
+                load_path = os.path.join(default_directory, addon_info.module_name)
+                create_link_in_user_addon_directory(addon_info.load_dir, load_path)
 
         path_mappings.append({"src": str(addon_info.load_dir), "load": str(load_path)})
 
@@ -44,23 +48,24 @@ def get_user_addon_directory(source_path: Path):
         return Path(bpy.utils.user_resource("EXTENSIONS", path="user_default"))
 
 
-def load(addons_to_load: list[AddonInfo]):
+def load(addons_to_load: List[AddonInfo]):
     for addon_info in addons_to_load:
         if is_addon_legacy(Path(addon_info.load_dir)):
             bpy.ops.preferences.addon_refresh()
             addon_name = addon_info.module_name
         else:
             bpy.ops.extensions.repo_refresh_all()
-            addon_name = "bl_ext.user_default." + addon_info.module_name
-
+            repo = is_in_any_extension_directory(addon_info.load_dir)
+            module = getattr(repo, "module", "user_default")
+            addon_name = ".".join(("bl_ext", module, addon_info.module_name))
         try:
             bpy.ops.preferences.addon_enable(module=addon_name)
         except Exception:
             traceback.print_exc()
             send_dict_as_json({"type": "enableFailure", "addonPath": str(addon_info.load_dir)})
 
 
-def create_link_in_user_addon_directory(directory, link_path):
+def create_link_in_user_addon_directory(directory: Union[str, os.PathLike], link_path: Union[str, os.PathLike]):
     if os.path.exists(link_path):
         os.remove(link_path)
 
@@ -72,8 +77,18 @@ def create_link_in_user_addon_directory(directory, link_path):
         os.symlink(str(directory), str(link_path), target_is_directory=True)
 
 
-def is_in_any_addon_directory(module_path):
+def is_in_any_addon_directory(module_path: Path) -> bool:
     for path in addon_directories:
         if path == module_path.parent:
             return True
     return False
+
+
+def is_in_any_extension_directory(module_path: Path) -> Optional[bpy.types.UserExtensionRepo]:
+    for repo in bpy.context.preferences.extensions.repos:
+        if not repo.enabled:
+            continue
+        repo_dir = repo.custom_directory if repo.use_custom_directory else repo.directory
+        if Path(repo_dir) == module_path.parent:
+            return repo
+    return None

pythonFiles/include/blender_vscode/operators/addon_update.py

@@ -4,6 +4,7 @@
 import traceback
 from bpy.props import *
 from ..utils import is_addon_legacy, redraw_all
+from ..load_addons import is_in_any_extension_directory
 from ..communication import send_dict_as_json, register_post_action
 
 
@@ -44,7 +45,10 @@ def reload_addon_action(data):
         if is_addon_legacy(Path(dir)):
             module_names.append(name)
         else:
-            module_names.append("bl_ext.user_default." + name)
+            repo = is_in_any_extension_directory(Path(dir))
+            module = getattr(repo, "module", "user_default")
+            addon_name = ".".join(("bl_ext", module, name))
+            module_names.append(addon_name)
 
     for name in module_names:
         bpy.ops.dev.update_addon(module_name=name)

pythonFiles/include/blender_vscode/utils.py

@@ -4,7 +4,7 @@
 import traceback
 
 
-def is_addon_legacy(addon_dir: Path):
+def is_addon_legacy(addon_dir: Path) -> bool:
     """Return whether an addon uses the legacy bl_info behavior, or the new blender_manifest behavior"""
     if bpy.app.version < (4, 2, 0):
         return True

pythonFiles/tests/blender_vscode/.gitignore

@@ -0,0 +1 @@
+scripts