Fix wrong path being used to detect if an addon is an extension or not

JacquesLucke · Jul 7, 2024 · 36b513f · 36b513f
1 parent a1d8af9
commit 36b513f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/pythonFiles/include/blender_vscode/__init__.py b/pythonFiles/include/blender_vscode/__init__.py
@@ -27,13 +27,13 @@ def startup(editor_address, addons_to_load: list[AddonInfo], allow_modify_extern
     from . import communication
     communication.setup(editor_address, path_mappings)
 
-    load_addons.load(addons_to_load)
-
     from . import operators, ui
 
     ui.register()
     operators.register()
 
+    load_addons.load(addons_to_load)
+
 def handle_fatal_error(message):
     print()
     print("#"*80)

diff --git a/pythonFiles/include/blender_vscode/load_addons.py b/pythonFiles/include/blender_vscode/load_addons.py
@@ -46,7 +46,8 @@ def load(addons_to_load: list[AddonInfo]):
             addon_name = addon_info.module_path
 
         try:
-            bpy.ops.preferences.addon_enable(module=addon_name)
+            # bpy.ops.preferences.addon_enable(module=addon_name)
+            bpy.ops.dev.update_addon(module_name=addon_name)
         except:
             traceback.print_exc()
             send_dict_as_json({"type": "enableFailure", "addonPath": str(addon_info.load_dir)})

diff --git a/src/addon_folder.ts b/src/addon_folder.ts
@@ -11,11 +11,9 @@ import {
 
 export class AddonWorkspaceFolder {
     folder: vscode.WorkspaceFolder;
-    isLegacy: boolean;
 
     constructor(folder: vscode.WorkspaceFolder) {
         this.folder = folder;
-        this.isLegacy = fs.existsSync(path.join(folder.uri.fsPath, "blender_manifest.toml"));
     }
 
     public static async All() {
@@ -53,6 +51,10 @@ export class AddonWorkspaceFolder {
         return <boolean>this.getConfig().get('addon.justMyCode');
     }
 
+    public async isLegacy() {
+        return fs.existsSync(path.join(await this.getSourceDirectory(), "blender_manifest.toml"))
+    }
+
     public async hasAddonEntryPoint() {
         try {
             let sourceDir = await this.getSourceDirectory();
@@ -88,7 +90,7 @@ export class AddonWorkspaceFolder {
         let value = <string>getConfig(this.uri).get('addon.moduleName');
         if (value === 'auto') {
             let module_base = path.basename(await this.getLoadDirectory());
-            if (this.isLegacy) {
+            if (await this.isLegacy()) {
                 module_base = "bl_ext.user_default.".concat(module_base)
             }
             return module_base;
@@ -100,7 +102,7 @@ export class AddonWorkspaceFolder {
 
     public async getModuleName() {
         let path = await this.getModulePath();
-        if (this.isLegacy) {
+        if (await this.isLegacy()) {
             return path.split(".").slice(-1)[0];
         }
         return path

diff --git a/src/extension.ts b/src/extension.ts
@@ -120,7 +120,7 @@ async function reloadAddons(addons: AddonWorkspaceFolder[]) {
     await rebuildAddons(addons);
     let names = await Promise.all(addons.map(a => a.getModuleName()));
     let paths = await Promise.all(addons.map(a => a.getModulePath()))
-    let dirs = await Promise.all(addons.map(a => a.folder.uri.fsPath))
+    let dirs = await Promise.all(addons.map(a => a.getSourceDirectory()))
     instances.forEach(instance => instance.post({ type: 'reload', names: names, paths: paths, dirs: dirs}));
 }