Desktop: Add support for OneNote importer

.eslintignore

@@ -83,6 +83,7 @@ plugin_types/
 readme/
 packages/react-native-vosk/lib/
 packages/lib/countable/Countable.js
+packages/onenote-converter/pkg/onenote_converter.js
 
 # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD
 packages/app-cli/app/LinkSelector.js
@@ -966,6 +967,7 @@ packages/lib/services/interop/InteropService_Importer_Md.test.js
 packages/lib/services/interop/InteropService_Importer_Md.js
 packages/lib/services/interop/InteropService_Importer_Md_frontmatter.test.js
 packages/lib/services/interop/InteropService_Importer_Md_frontmatter.js
+packages/lib/services/interop/InteropService_Importer_OneNote.js
 packages/lib/services/interop/InteropService_Importer_Raw.test.js
 packages/lib/services/interop/InteropService_Importer_Raw.js
 packages/lib/services/interop/Module.test.js

.gitignore

@@ -946,6 +946,7 @@ packages/lib/services/interop/InteropService_Importer_Md.test.js
 packages/lib/services/interop/InteropService_Importer_Md.js
 packages/lib/services/interop/InteropService_Importer_Md_frontmatter.test.js
 packages/lib/services/interop/InteropService_Importer_Md_frontmatter.js
+packages/lib/services/interop/InteropService_Importer_OneNote.js
 packages/lib/services/interop/InteropService_Importer_Raw.test.js
 packages/lib/services/interop/InteropService_Importer_Raw.js
 packages/lib/services/interop/Module.test.js

Dockerfile.server

@@ -6,9 +6,15 @@ FROM node:18-bullseye AS builder
 
 RUN apt-get update \
     && apt-get install -y \
+    curl \
     python tini \
     && rm -rf /var/lib/apt/lists/*
 
+# The recommended way of installing Rust
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+
+ENV PATH="/root/.cargo/bin:${PATH}"
+
 # Enables Yarn
 RUN corepack enable
 
@@ -33,6 +39,7 @@ COPY packages/renderer ./packages/renderer
 COPY packages/tools ./packages/tools
 COPY packages/utils ./packages/utils
 COPY packages/lib ./packages/lib
+COPY packages/onenote-converter ./packages/onenote-converter
 COPY packages/server ./packages/server
 
 # For some reason there's both a .yarn/cache and .yarn/berry/cache that are

packages/lib/package.json

@@ -17,6 +17,7 @@
   },
   "devDependencies": {
     "@testing-library/react-hooks": "8.0.1",
+    "@types/adm-zip": "0.5.5",
     "@types/fs-extra": "11.0.4",
     "@types/jest": "29.5.8",
     "@types/js-yaml": "4.0.9",
@@ -44,11 +45,13 @@
     "@joplin/fork-sax": "^1.2.55",
     "@joplin/fork-uslug": "^1.0.16",
     "@joplin/htmlpack": "~3.0",
+    "@joplin/onenote-converter": "0.0.1",
     "@joplin/renderer": "~3.0",
     "@joplin/turndown": "^4.0.73",
     "@joplin/turndown-plugin-gfm": "^1.0.55",
     "@joplin/utils": "~3.0",
     "@types/nanoid": "3.0.0",
+    "adm-zip": "0.5.12",
     "async-mutex": "0.4.1",
     "base-64": "1.0.0",
     "base64-stream": "1.0.0",

packages/lib/services/interop/InteropService.ts

@@ -19,6 +19,7 @@ import InteropService_Exporter_Md_frontmatter from './InteropService_Exporter_Md
 import InteropService_Importer_Base from './InteropService_Importer_Base';
 import InteropService_Exporter_Base from './InteropService_Exporter_Base';
 import Module, { dynamicRequireModuleFactory, makeExportModule, makeImportModule } from './Module';
+import InteropService_Importer_OneNote from './InteropService_Importer_OneNote';
 const { sprintf } = require('sprintf-js');
 const { fileExtension } = require('../../path-utils');
 const EventEmitter = require('events');
@@ -133,6 +134,14 @@ export default class InteropService {
 					isNoteArchive: false, // Tells whether the file can contain multiple notes (eg. Enex or Jex format)
 					description: _('Text document'),
 				}, () => new InteropService_Importer_Md()),
+
+				makeImportModule({
+					format: 'zip',
+					fileExtensions: ['zip'],
+					sources: [FileSystemItem.File],
+					isNoteArchive: false, // Tells whether the file can contain multiple notes (eg. Enex or Jex format)
+					description: _('OneNote Notebook'),
+				}, () => new InteropService_Importer_OneNote()),
 			];
 
 			const exportModules = [

packages/lib/services/interop/InteropService_Importer_OneNote.ts

@@ -0,0 +1,43 @@
+import { ImportExportResult, ImportModuleOutputFormat } from './types';
+
+import InteropService_Importer_Base from './InteropService_Importer_Base';
+import { NoteEntity } from '../database/types';
+import { rtrimSlashes } from '../../path-utils';
+import { oneNoteConverter } from '@joplin/onenote-converter';
+import InteropService_Importer_Md from './InteropService_Importer_Md';
+import * as AdmZip from 'adm-zip';
+
+export default class InteropService_Importer_OneNote extends InteropService_Importer_Base {
+	protected importedNotes: Record<string, NoteEntity> = {};
+
+	public async exec(result: ImportExportResult) {
+
+		const sourcePath = rtrimSlashes(this.sourcePath_);
+		const unzipTempDirectory = await this.temporaryDirectory_(true);
+		const zip = new AdmZip(sourcePath);
+		zip.extractAllTo(unzipTempDirectory, false);
+
+		// files that don't have a name seems to be local only and shouldn't be processed
+		const notebookFiles = zip.getEntries()
+			.filter(e => e.entryName.endsWith('.onetoc2') && e.name !== '.onetoc2');
+
+		const outputDirectory = await this.temporaryDirectory_(true);
+		for (const notebookFile of notebookFiles) {
+			const notebookFilePath = `${unzipTempDirectory}/${notebookFile.entryName}`;
+			await oneNoteConverter(notebookFilePath, outputDirectory);
+		}
+
+		const importer = new InteropService_Importer_Md();
+		importer.setMetadata({ fileExtensions: ['html'] });
+		await importer.init(outputDirectory, {
+			...this.options_,
+			format: 'html',
+			outputFormat: ImportModuleOutputFormat.Markdown,
+
+		});
+		result = await importer.exec(result);
+
+		// remover temp directories?
+		return result;
+	}
+}

packages/onenote-converter/.gitignore

@@ -0,0 +1,5 @@
+/target
+/output
+
+/.idea
+*.iml

packages/onenote-converter/.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "rust-analyzer.linkedProjects": [
+        "./Cargo.toml"
+    ]
+}