publishMultiple: stop if nothing to publish (#433)

* publishMultiple: stop if nothing to publish * commands: validate github settings before commands
oleeskild · Sep 30, 2023 · 9dac3cb · 9dac3cb
1 parent 8fe967b
commit 9dac3cb
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 41 deletions.
diff --git a/main.ts b/main.ts
@@ -171,6 +171,7 @@ export default class DigitalGarden extends Plugin {
 						metadataCache,
 						this.settings,
 					);
+					publisher.validateSettings();
 
 					const siteManager = new DigitalGardenSiteManager(
 						metadataCache,
@@ -191,6 +192,18 @@ export default class DigitalGarden extends Plugin {
 					const filesToDelete = publishStatus.deletedNotePaths;
 					const imagesToDelete = publishStatus.deletedImagePaths;
 
+					const totalItems =
+						filesToPublish.length +
+						filesToDelete.length +
+						imagesToDelete.length;
+
+					if (totalItems === 0) {
+						new Notice("Garden is already fully synced!");
+						statusBarItem.remove();
+
+						return;
+					}
+
 					const statusBar = new PublishStatusBar(
 						statusBarItem,
 						filesToPublish.length +
@@ -387,6 +400,7 @@ export default class DigitalGarden extends Plugin {
 				metadataCache,
 				this.settings,
 			);
+			publisher.validateSettings();
 			const publishSuccessful = await publisher.publish(activeFile);
 
 			if (publishSuccessful) {

diff --git a/src/publisher/Publisher.ts b/src/publisher/Publisher.ts
@@ -86,27 +86,7 @@ export default class Publisher {
 	}
 
 	async delete(path: string): Promise<boolean> {
-		if (!this.settings.githubRepo) {
-			new Notice(
-				"Config error: You need to define a GitHub repo in the plugin settings",
-			);
-			throw {};
-		}
-
-		if (!this.settings.githubUserName) {
-			new Notice(
-				"Config error: You need to define a GitHub Username in the plugin settings",
-			);
-			throw {};
-		}
-
-		if (!this.settings.githubToken) {
-			new Notice(
-				"Config error: You need to define a GitHub Token in the plugin settings",
-			);
-			throw {};
-		}
-
+		this.validateSettings();
 		const octokit = new Octokit({ auth: this.settings.githubToken });
 
 		const payload = {
@@ -173,26 +153,7 @@ export default class Publisher {
 	}
 
 	async uploadToGithub(path: string, content: string) {
-		if (!this.settings.githubRepo) {
-			new Notice(
-				"Config error: You need to define a GitHub repo in the plugin settings",
-			);
-			throw {};
-		}
-
-		if (!this.settings.githubUserName) {
-			new Notice(
-				"Config error: You need to define a GitHub Username in the plugin settings",
-			);
-			throw {};
-		}
-
-		if (!this.settings.githubToken) {
-			new Notice(
-				"Config error: You need to define a GitHub Token in the plugin settings",
-			);
-			throw {};
-		}
+		this.validateSettings();
 
 		const octokit = new Octokit({ auth: this.settings.githubToken });
 
@@ -249,4 +210,27 @@ export default class Publisher {
 			await this.uploadImage(image.path, image.content);
 		}
 	}
+
+	validateSettings() {
+		if (!this.settings.githubRepo) {
+			new Notice(
+				"Config error: You need to define a GitHub repo in the plugin settings",
+			);
+			throw {};
+		}
+
+		if (!this.settings.githubUserName) {
+			new Notice(
+				"Config error: You need to define a GitHub Username in the plugin settings",
+			);
+			throw {};
+		}
+
+		if (!this.settings.githubToken) {
+			new Notice(
+				"Config error: You need to define a GitHub Token in the plugin settings",
+			);
+			throw {};
+		}
+	}
 }