From 8c5f680dca51601ad0c69932fb777fe709b31047 Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Sun, 25 Feb 2024 15:06:43 +0200
Subject: [PATCH] server-ts: Fix build errors

---
 src/services/import/mime.ts   | 10 +++++----
 src/services/import/single.ts | 40 +++++++++++++++++++++++------------
 src/services/task_context.ts  |  1 +
 src/services/utils.ts         |  2 +-
 4 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/src/services/import/mime.ts b/src/services/import/mime.ts
index 9cb71c3d5..eebb54ffe 100644
--- a/src/services/import/mime.ts
+++ b/src/services/import/mime.ts
@@ -103,13 +103,15 @@ function getType(options: GetTypeOpts, mime: string) {
 
 function normalizeMimeType(mime: string) {
     mime = mime ? mime.toLowerCase() : '';
+    const mappedMime = CODE_MIME_TYPES[mime];
 
-    if (!(mime in CODE_MIME_TYPES) || CODE_MIME_TYPES[mime] === true) {
+    if (mappedMime === true) {
         return mime;
+    } else if (typeof mappedMime === "string") {
+        return mappedMime;
     }
-    else {
-        return CODE_MIME_TYPES[mime];
-    }
+
+    return undefined;
 }
 
 export = {
diff --git a/src/services/import/single.ts b/src/services/import/single.ts
index 18c45b85e..abf66c529 100644
--- a/src/services/import/single.ts
+++ b/src/services/import/single.ts
@@ -12,7 +12,13 @@ import utils = require('../../services/utils');
 import importUtils = require('./utils');
 import htmlSanitizer = require('../html_sanitizer');
 
-function importSingleFile(taskContext: TaskContext, file, parentNote: BNote) {
+interface File {
+    originalname: string;
+    mimetype: string;
+    buffer: string | Buffer;
+}
+
+function importSingleFile(taskContext: TaskContext, file: File, parentNote: BNote) {
     const mime = mimeService.getMime(file.originalname) || file.mimetype;
 
     if (taskContext?.data?.textImportedAsText) {
@@ -36,15 +42,21 @@ function importSingleFile(taskContext: TaskContext, file, parentNote: BNote) {
     return importFile(taskContext, file, parentNote);
 }
 
-function importImage(file, parentNote: BNote, taskContext) {
-    const {note} = imageService.saveImage(parentNote.noteId, file.buffer, file.originalname, taskContext.data.shrinkImages);
+function importImage(file: File, parentNote: BNote, taskContext: TaskContext) {
+    if (typeof file.buffer === "string") {
+        throw new Error("Invalid file content for image.");
+    }
+    const {note} = imageService.saveImage(parentNote.noteId, file.buffer, file.originalname, !!taskContext.data?.shrinkImages);
 
     taskContext.increaseProgressCount();
 
     return note;
 }
 
-function importFile(taskContext: TaskContext, file, parentNote: BNote) {
+function importFile(taskContext: TaskContext, file: File, parentNote: BNote) {
+    if (typeof file.buffer !== "string") {
+        throw new Error("Invalid file content for text.");
+    }
     const originalName = file.originalname;
 
     const {note} = noteService.createNewNote({
@@ -63,8 +75,8 @@ function importFile(taskContext: TaskContext, file, parentNote: BNote) {
     return note;
 }
 
-function importCodeNote(taskContext: TaskContext, file, parentNote: BNote) {
-    const title = utils.getNoteTitle(file.originalname, taskContext.data.replaceUnderscoresWithSpaces);
+function importCodeNote(taskContext: TaskContext, file: File, parentNote: BNote) {
+    const title = utils.getNoteTitle(file.originalname, !!taskContext.data?.replaceUnderscoresWithSpaces);
     const content = file.buffer.toString("utf-8");
     const detectedMime = mimeService.getMime(file.originalname) || file.mimetype;
     const mime = mimeService.normalizeMimeType(detectedMime);
@@ -83,8 +95,8 @@ function importCodeNote(taskContext: TaskContext, file, parentNote: BNote) {
     return note;
 }
 
-function importPlainText(taskContext: TaskContext, file, parentNote) {
-    const title = utils.getNoteTitle(file.originalname, taskContext.data.replaceUnderscoresWithSpaces);
+function importPlainText(taskContext: TaskContext, file: File, parentNote: BNote) {
+    const title = utils.getNoteTitle(file.originalname, !!taskContext.data?.replaceUnderscoresWithSpaces);
     const plainTextContent = file.buffer.toString("utf-8");
     const htmlContent = convertTextToHtml(plainTextContent);
 
@@ -120,8 +132,8 @@ function convertTextToHtml(text: string) {
     return text;
 }
 
-function importMarkdown(taskContext: TaskContext, file, parentNote: BNote) {
-    const title = utils.getNoteTitle(file.originalname, taskContext.data.replaceUnderscoresWithSpaces);
+function importMarkdown(taskContext: TaskContext, file: File, parentNote: BNote) {
+    const title = utils.getNoteTitle(file.originalname, !!taskContext.data?.replaceUnderscoresWithSpaces);
 
     const markdownContent = file.buffer.toString("utf-8");
     let htmlContent = markdownService.renderToHtml(markdownContent, title);
@@ -144,8 +156,8 @@ function importMarkdown(taskContext: TaskContext, file, parentNote: BNote) {
     return note;
 }
 
-function importHtml(taskContext: TaskContext, file, parentNote: BNote) {
-    const title = utils.getNoteTitle(file.originalname, taskContext.data.replaceUnderscoresWithSpaces);
+function importHtml(taskContext: TaskContext, file: File, parentNote: BNote) {
+    const title = utils.getNoteTitle(file.originalname, !!taskContext.data?.replaceUnderscoresWithSpaces);
     let content = file.buffer.toString("utf-8");
 
     if (taskContext?.data?.safeImport) {
@@ -168,10 +180,10 @@ function importHtml(taskContext: TaskContext, file, parentNote: BNote) {
     return note;
 }
 
-function importAttachment(taskContext: TaskContext, file, parentNote: BNote) {
+function importAttachment(taskContext: TaskContext, file: File, parentNote: BNote) {
     const mime = mimeService.getMime(file.originalname) || file.mimetype;
 
-    if (mime.startsWith("image/")) {
+    if (mime.startsWith("image/") && typeof file.buffer !== "string") {
         imageService.saveImageToAttachment(parentNote.noteId, file.buffer, file.originalname, taskContext.data?.shrinkImages);
 
         taskContext.increaseProgressCount();
diff --git a/src/services/task_context.ts b/src/services/task_context.ts
index 23408f0dd..53cf92121 100644
--- a/src/services/task_context.ts
+++ b/src/services/task_context.ts
@@ -10,6 +10,7 @@ interface TaskData {
     textImportedAsText?: boolean;
     codeImportedAsCode?: boolean;
     shrinkImages?: boolean;
+    replaceUnderscoresWithSpaces?: boolean;
 }
 
 class TaskContext {
diff --git a/src/services/utils.ts b/src/services/utils.ts
index 947dfac9c..25f2e6be8 100644
--- a/src/services/utils.ts
+++ b/src/services/utils.ts
@@ -226,7 +226,7 @@ function removeTextFileExtension(filePath: string) {
     }
 }
 
-function getNoteTitle(filePath: string, replaceUnderscoresWithSpaces: boolean, noteMeta: { title: string }) {
+function getNoteTitle(filePath: string, replaceUnderscoresWithSpaces: boolean, noteMeta?: { title: string }) {
     if (noteMeta) {
         return noteMeta.title;
     } else {