mirror of
https://github.com/laurent22/joplin.git
synced 2025-01-11 18:24:43 +02:00
Plugins: Fixes #4308: Fixed "exportFolders" command when exporting JEX file
This commit is contained in:
parent
c9f40ea23f
commit
0bf3531f51
@ -738,6 +738,7 @@ class Application extends BaseApplication {
|
||||
revisionService: RevisionService.instance(),
|
||||
migrationService: MigrationService.instance(),
|
||||
decryptionWorker: DecryptionWorker.instance(),
|
||||
commandService: CommandService.instance(),
|
||||
bridge: bridge(),
|
||||
};
|
||||
};
|
||||
|
@ -1,6 +1,7 @@
|
||||
import { CommandRuntime, CommandDeclaration } from '@joplin/lib/services/CommandService';
|
||||
import InteropService from '@joplin/lib/services/interop/InteropService';
|
||||
import { ExportOptions, FileSystemItem } from '@joplin/lib/services/interop/types';
|
||||
import shim from '@joplin/lib/shim';
|
||||
|
||||
export const declaration: CommandDeclaration = {
|
||||
name: 'exportFolders',
|
||||
@ -8,14 +9,27 @@ export const declaration: CommandDeclaration = {
|
||||
|
||||
export const runtime = (): CommandRuntime => {
|
||||
return {
|
||||
execute: async (_context: any, folderIds: string[], format: string, targetDirectoryPath: string) => {
|
||||
// "targetPath" should be a file for JEX export (because the format can
|
||||
// contain multiple folders) or a directory otherwise.
|
||||
execute: async (_context: any, folderIds: string[], format: string, targetPath: string) => {
|
||||
const exportOptions: ExportOptions = {
|
||||
sourceFolderIds: folderIds,
|
||||
path: targetDirectoryPath,
|
||||
path: targetPath,
|
||||
format: format,
|
||||
target: FileSystemItem.Directory,
|
||||
};
|
||||
|
||||
const targetMustBeFile = format === 'jex';
|
||||
const targetIsDir = await shim.fsDriver().isDirectory(targetPath);
|
||||
|
||||
if (targetMustBeFile && targetIsDir) {
|
||||
throw new Error(`Format "${format}" can only be exported to a file`);
|
||||
}
|
||||
|
||||
if (format === 'jex' || !targetIsDir) {
|
||||
exportOptions.target = FileSystemItem.File;
|
||||
}
|
||||
|
||||
return InteropService.instance().export(exportOptions);
|
||||
},
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user