diff --git a/manifest.json b/manifest.json index e464390..7fe06b2 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "id": "obsidian42-brat-gitea", "name": "BRAT (Gitea Fork)", - "version": "1.0.0", + "version": "1.0.1", "minAppVersion": "1.11.4", "description": "Easily install beta plugins from GitHub AND self-hosted Gitea/Forgejo instances.", "author": "TfTHacker (Gitea fork)", diff --git a/package.json b/package.json index ba8e887..5932de3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "obsidian42-brat-gitea", - "version": "1.0.0", + "version": "1.0.1", "description": "BRAT fork with Gitea support — install beta plugins from GitHub or self-hosted Gitea/Forgejo.", "main": "main.js", "scripts": { diff --git a/src/features/BetaPlugins.ts b/src/features/BetaPlugins.ts index 91771af..b783069 100644 --- a/src/features/BetaPlugins.ts +++ b/src/features/BetaPlugins.ts @@ -641,11 +641,13 @@ export default class BetaPlugins { ); // @ts-expect-error await this.plugin.app.plugins.loadManifests(); - await this.reloadPlugin(primaryManifest.id); - const msg = `${primaryManifest.id}\nUpdated: ${localManifestJson.version} → ${primaryManifest.version}. `; + const reloaded = await this.reloadPlugin(primaryManifest.id); + const msg = reloaded + ? `${primaryManifest.id}\nUpdated: ${localManifestJson.version} → ${primaryManifest.version}. ` + : `${primaryManifest.id}\nUpdated files to ${primaryManifest.version}, but failed to re-enable automatically. Enable it manually in Community Plugins.`; await this.plugin.log(msg, true); - toastMessage(this.plugin, msg, 30); - return true; + toastMessage(this.plugin, msg, reloaded ? 30 : 0); + return reloaded; } if (reportIfNotUpdated) { @@ -669,14 +671,32 @@ export default class BetaPlugins { /** * reloads a plugin */ - async reloadPlugin(pluginName: string): Promise { + async reloadPlugin(pluginName: string): Promise { // @ts-expect-error const { plugins } = this.plugin.app; try { await plugins.disablePlugin(pluginName); await plugins.enablePlugin(pluginName); + return true; } catch (e) { - if (this.plugin.settings.debuggingMode) console.log("reload plugin", e); + const errorMessage = e instanceof Error ? e.message : String(e); + console.error(`BRAT: Failed to reload plugin ${pluginName}`, e); + await this.plugin.log( + `Failed to reload ${pluginName} after update: ${errorMessage}`, + true, + ); + try { + await plugins.enablePluginAndSave(pluginName); + return true; + } catch (e2) { + const fallbackMessage = e2 instanceof Error ? e2.message : String(e2); + console.error(`BRAT: Fallback re-enable failed for ${pluginName}`, e2); + await this.plugin.log( + `Fallback re-enable also failed for ${pluginName}: ${fallbackMessage}`, + true, + ); + return false; + } } }