Update manifest for release.

Author: andymac4182

CHANGELOG.md

@@ -7,6 +7,21 @@
     * @markdown-confluence/lib bumped from 3.0.4 to 3.0.0
     * @markdown-confluence/mermaid-electron-renderer bumped from 3.0.4 to 3.0.0
 
+## [5.3.0](https://github.com/markdown-confluence/markdown-confluence/compare/obsidian-confluence-v5.2.6...obsidian-confluence-v5.3.0) (2023-05-11)
+
+
+### Features
+
+* Move ImageUpload and MermaidRendering to plugins to allow for more plugins easily ([cfae670](https://github.com/markdown-confluence/markdown-confluence/commit/cfae670d3bc94c4a88d02936c94ca9c1ab47ce9e))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @markdown-confluence/lib bumped from 5.2.6 to 5.3.0
+    * @markdown-confluence/mermaid-electron-renderer bumped from 5.2.6 to 5.3.0
+
 ## [5.2.6](https://github.com/markdown-confluence/markdown-confluence/compare/obsidian-confluence-v5.2.5...obsidian-confluence-v5.2.6) (2023-05-11)
 
 

manifest.json

@@ -1,7 +1,7 @@
 {
 	"id": "confluence-integration",
 	"name": "Confluence Integration",
-	"version": "5.2.6",
+	"version": "5.3.0",
 	"minAppVersion": "1.0.0",
 	"description": "This plugin allows you to publish your notes to Confluence",
 	"author": "andymac4182",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "obsidian-confluence",
-    "version": "5.2.6",
+    "version": "5.3.0",
     "description": "This library allows you to publish your notes to Confluence",
     "main": "main.js",
     "type": "module",
@@ -24,8 +24,8 @@
         "mime-types": "^2.1.35",
         "react": "^16.14.0",
         "react-dom": "^16.14.0",
-        "@markdown-confluence/lib": "5.2.6",
-        "@markdown-confluence/mermaid-electron-renderer": "5.2.6"
+        "@markdown-confluence/lib": "5.3.0",
+        "@markdown-confluence/mermaid-electron-renderer": "5.3.0"
     },
     "resolutions": {
         "prosemirror-model": "1.14.3"

src/main.ts

@@ -5,6 +5,8 @@ import {
 	ConfluencePageConfig,
 	StaticSettingsLoader,
 	renderADFDoc,
+	MermaidRendererPlugin,
+	UploadAdfFileResult,
 } from "@markdown-confluence/lib";
 import { ElectronMermaidRenderer } from "@markdown-confluence/mermaid-electron-renderer";
 import { ConfluenceSettingTab } from "./ConfluenceSettingTab";
@@ -30,6 +32,17 @@ export interface ObsidianPluginSettings
 		| "forest";
 }
 
+interface FailedFile {
+	fileName: string;
+	reason: string;
+}
+
+interface UploadResults {
+	errorMessage: string | null;
+	failedFiles: FailedFile[];
+	filesUploadResult: UploadAdfFileResult[];
+}
+
 export default class ConfluencePlugin extends Plugin {
 	settings!: ObsidianPluginSettings;
 	private isSyncing = false;
@@ -74,7 +87,7 @@ export default class ConfluencePlugin extends Plugin {
 			this.adaptor,
 			settingsLoader,
 			confluenceClient,
-			mermaidRenderer
+			[new MermaidRendererPlugin(mermaidRenderer)]
 		);
 	}
 
@@ -149,6 +162,32 @@ export default class ConfluencePlugin extends Plugin {
 		};
 	}
 
+	async doPublish(publishFilter?: string): Promise<UploadResults> {
+		const adrFiles = await this.publisher.publish(publishFilter);
+
+		const returnVal: UploadResults = {
+			errorMessage: null,
+			failedFiles: [],
+			filesUploadResult: [],
+		};
+
+		adrFiles.forEach((element) => {
+			if (element.successfulUploadResult) {
+				returnVal.filesUploadResult.push(
+					element.successfulUploadResult
+				);
+				return;
+			}
+
+			returnVal.failedFiles.push({
+				fileName: element.node.file.absoluteFilePath,
+				reason: element.reason ?? "No Reason Provided",
+			});
+		});
+
+		return returnVal;
+	}
+
 	override async onload() {
 		await this.init();
 
@@ -159,7 +198,7 @@ export default class ConfluencePlugin extends Plugin {
 			}
 			this.isSyncing = true;
 			try {
-				const stats = await this.publisher.doPublish();
+				const stats = await this.doPublish();
 				new CompletedModal(this.app, {
 					uploadResults: stats,
 				}).open();
@@ -225,8 +264,7 @@ export default class ConfluencePlugin extends Plugin {
 				if (!this.isSyncing) {
 					if (!checking) {
 						this.isSyncing = true;
-						this.publisher
-							.doPublish(this.activeLeafPath(this.workspace))
+						this.doPublish(this.activeLeafPath(this.workspace))
 							.then((stats) => {
 								new CompletedModal(this.app, {
 									uploadResults: stats,
@@ -268,8 +306,7 @@ export default class ConfluencePlugin extends Plugin {
 				if (!this.isSyncing) {
 					if (!checking) {
 						this.isSyncing = true;
-						this.publisher
-							.doPublish()
+						this.doPublish()
 							.then((stats) => {
 								new CompletedModal(this.app, {
 									uploadResults: stats,