Merge pull request #2 from vincenzocaputo/develop

Version 1.2.0
vincenzocaputo · Oct 27, 2024 · ba7c47c · ba7c47c
2 parents ddf90ef + 4192876
commit ba7c47c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 12 deletions.
diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "metal-archives",
 	"name": "Metal Archives (Unofficial)",
-	"version": "1.1.0",
+	"version": "1.2.0",
 	"minAppVersion": "0.15.0",
 	"description": "Create notes about metal bands and album from Metal Archives",
 	"author": "Vincenzo Caputo",

diff --git a/src/main.ts b/src/main.ts
@@ -158,14 +158,16 @@ export default class MetalArchivesPlugin extends Plugin {
 	async renderAlbumNote(album: Album) {
 		const vaultBasePath = this.app.vault.adapter.basePath;
 
-		const albumsDir = `${vaultBasePath}/${this.settings.albumsPathLocation}/${album.band}`;
+		const bandFilename = album.band.replace(/[:\/]/g, " ");
+		const albumFilename = album.name.replace(/[:\/]/g, " ");
+		const albumsDir = `${vaultBasePath}/${this.settings.albumsPathLocation}/${bandFilename}`;
 
 		this.app.vault.adapter.exists(albumsDir).then( (r) => {
 			return this.app.vault.adapter.mkdir(this.settings.albumsPathLocation.toString());
 		}).then((r) => {
-			return this.app.vault.adapter.mkdir(`${this.settings.albumsPathLocation}/${album.band}`);
+			return this.app.vault.adapter.mkdir(`${this.settings.albumsPathLocation}/${bandFilename}`);
 		}).then((r) => {
-			const noteFilename = `${this.settings.albumsPathLocation}/${album.band}/${album.name}.md`;
+			const noteFilename = `${this.settings.albumsPathLocation}/${album.band}/${albumFilename}.md`;
 
 			let songsTable = ``;
 			for (const song of album.songs) {
@@ -180,6 +182,8 @@ format: ${album.format}
 reference: ${album.url}
 ---
 
+# ${album.name}
+
 ![cover|400x400](${album.cover})
 
 ## Songs
@@ -208,13 +212,14 @@ ${songsTable}
 		const vaultBasePath = this.app.vault.adapter.basePath;
 
 		const bandsDir = `${vaultBasePath}/${this.settings.bandsPathLocation}`;
-		const albumsDir = `${this.settings.albumsPathLocation}/${band.name}`;
+
+		const albumsDir = `${this.settings.albumsPathLocation}/${band.name.replace(/[:\/]/g," ")}`;
 
 		this.app.vault.adapter.exists(bandsDir).then( (r) => {
 			return this.app.vault.adapter.mkdir(this.settings.bandsPathLocation.toString());
 		}).then((r) => {
 
-			const noteFilename = `${this.settings.bandsPathLocation}/${band.name}.md`;
+			const noteFilename = `${this.settings.bandsPathLocation}/${band.name.replace(/[:\/]/g, " ")}.md`;
 
 			let tags = ``;
 			for (const tag of band.tags) {
@@ -227,13 +232,16 @@ ${songsTable}
 
 			let discogTable = ``;
 			for (const disc of band.discography) {
-				const albumDir = `${albumsDir}/${disc.discName}`
-				if ("Full-length" === disc.discType) {
-					discogTable += `|**[[${albumDir}\\|${disc.discName}]]**|${disc.discType}|${disc.discYear}|\n`;
-				} else {
-					discogTable += `|[[${disc.discName}]]|${disc.discType}|${disc.discYear}|\n`;
+				if (disc.discName.length > 0) {
+					const albumDir = `${albumsDir}/${disc.discName.replace(/[:\/]/g, " ")}`
+					if ("Full-length" === disc.discType) {
+						discogTable += `|**[[${albumDir}\\|${disc.discName}]]**|${disc.discType}|${disc.discYear}|\n`;
+					} else {
+						discogTable += `|[[${disc.discName}]]|${disc.discType}|${disc.discYear}|\n`;
+					}
 				}
 			}
+
 			const body = `---
 Country: ${band.country}
 Status: ${band.status}
@@ -246,9 +254,11 @@ Reference: ${band.url}
 tags: 
 ${tags}
 ---
+# ${band.name}
+
 ${band.description.replace(/Compilation (a|A)ppearances:.*(?:\n.*)*/g, "")}
 ## Members
-| | |
+|Member name|Instrument|
 |---|---|
 ${membersTable}
 ## Discography