Issue 7: Import fails. Blank Screen. No Error Messages.

README.md

@@ -1,5 +1,7 @@
 # Google Keep Import Plugin
 
+In case it's not glaringly obvious: This is a fork from [daledesilva/obsidian_google-keep-import](https://github.com/daledesilva/obsidian_google-keep-import)
+
 Google Keep Import is a plugin for [Obsidian](https://obsidian.md) that enables easily importing an exported set of backup notes and related attachments from Google Keep.
 
 <div>

manifest.json

@@ -2,7 +2,7 @@
 	"id": "google-keep-import",
 	"name": "Google Keep Import",
 	"description": "Allows import of Google Keep backup json files and their attachments. Can also be used to import other files.",
-	"version": "1.0.1",
+	"version": "1.0.3",
 	"author": "Dale de Silva",
 	"minAppVersion": "1.1.10",
 	"authorUrl": "https://designdebt.club",

package.json

@@ -23,6 +23,7 @@
 	},
 	"dependencies": {
 		"esbuild-plugin-copy": "^2.0.1",
-		"esbuild-sass-plugin": "^2.4.4"
+		"esbuild-sass-plugin": "^2.4.4",
+		"sanitize-filename": "^1.6.3"
 	}
 }

src/logic/import-logic.ts

@@ -1,7 +1,7 @@
 import { DataWriteOptions, Notice, Plugin, TAbstractFile, TFile, TFolder, Vault } from "obsidian";
 import GoogleKeepImportPlugin from "src/main";
 import { ImportProgressModal } from "src/modals/import-progress-modal/import-progress-modal";
-import { filenameSanitize, getFileExtension } from "./string-processes";
+import { getFileExtension, stripFileExtension } from "./string-processes";
 import { CreatedDateTypes, PluginSettings } from "src/types/plugin-settings";
 import { KeepJson, objectIsKeepJson } from "src/types/keep-data";
 import { IgnoreImportReason, ImportResult, LogStatus as LogStatus } from "src/types/results";
@@ -374,10 +374,13 @@ async function importJson(vault: Vault, folder: TFolder, file: File, settings: P
 			}
 
 
-
-
-			const path = `${folder.path}/${filenameSanitize(content.title || file.name)}`;	// TODO: Strip file extension from filename
-
+			var sanitize = require("sanitize-filename");
+			let fileName = file.name ;
+			if (content.title === "")
+			{
+				fileName = stripFileExtension(file.name);
+			}
+			const path = `${folder.path}/${sanitize(content.title || fileName )}`;	// TODO: Strip file extension from filename
 
 
 			// TODO: Refactor this as createNewMarkdownFile function
@@ -411,7 +414,35 @@ async function importJson(vault: Vault, folder: TFolder, file: File, settings: P
 			}
 
 
+			try {
+				if (content.annotations) //wild guess
+				{
 
+					await vault.append(fileRef, `\n\n`);
+					await vault.append(fileRef, `| | |\n`);
+					await vault.append(fileRef, `|---|----|\n`);
+					for(let i=0; i<content.annotations.length; i++) {
+						//Might be better as front-matter, but for righ now...
+						let sDescription = content.annotations[i].description;
+						sDescription = sDescription.replace("\n","<br>");
+
+						await vault.append(fileRef, `${`|**Description**| ${sDescription}|`}\n`);	
+						await vault.append(fileRef, `${`|**Source**| ${content.annotations[i].source}|`}\n`);	
+						await vault.append(fileRef, `${`|**Title**| ${content.annotations[i].title}|` }\n`);	
+						await vault.append(fileRef, `${`|**URL**| ${content.annotations[i].url}|`}\n`);	
+						await vault.append(fileRef, `|<hr>|<hr>|\n`);
+					}
+				}
+			}
+			catch (error) {
+				result.logStatus = LogStatus.Error;
+				result.error = error;
+				result.details = 'Error adding Annotations file.'
+				return resolve(result);
+			}
+
+
+
 			// TODO: Refactor this as appendTextContent
 			// Add in text content
 			try {

src/logic/string-processes.ts

@@ -78,4 +78,14 @@ export function getFileExtension(filename: string): string {
 	} else {
 		return '';
 	}
+}
+
+/**
+ * Strips the file extension when passed a filename string.
+ */
+export function stripFileExtension(filename: string): string {
+	let split = filename.split('.');
+	split.pop();
+	let finalName = split.join("."); 
+	return finalName;
 }

src/types/keep-data.ts

@@ -11,7 +11,15 @@ export interface KeepAttachment {
 	mimetype: string;
 }
 
+export interface KeepAnnotation {
+	description: string;
+	source: string;
+	title: string;
+	url: URL;
+
+}
 export interface KeepJson {
+	annotations: KeepAnnotation[];
 	color: string;
 	createdTimestampUsec: number;
 	isArchived: boolean;