mirror of
https://github.com/TriliumNext/Notes.git
synced 2025-07-30 11:42:26 +08:00
refactor(routes/api/import): get rid of "any" type in catch blocks
This commit is contained in:
parent
07fd5327b1
commit
b56ff558a4
@ -68,11 +68,12 @@ async function importNotesToBranch(req: Request) {
|
|||||||
} else {
|
} else {
|
||||||
note = await singleImportService.importSingleFile(taskContext, file, parentNote);
|
note = await singleImportService.importSingleFile(taskContext, file, parentNote);
|
||||||
}
|
}
|
||||||
} catch (e: any) {
|
} catch (e: unknown) {
|
||||||
const message = `Import failed with following error: '${e.message}'. More details might be in the logs.`;
|
const [errMessage, errStack] = e instanceof Error ? [e.message, e.stack] : ["Unknown Error", undefined];
|
||||||
|
const message = `Import failed with following error: '${errMessage}'. More details might be in the logs.`;
|
||||||
taskContext.reportError(message);
|
taskContext.reportError(message);
|
||||||
|
|
||||||
log.error(message + e.stack);
|
log.error(message + errStack);
|
||||||
|
|
||||||
return [500, message];
|
return [500, message];
|
||||||
}
|
}
|
||||||
@ -120,11 +121,13 @@ async function importAttachmentsToNote(req: Request) {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
await singleImportService.importAttachment(taskContext, file, parentNote);
|
await singleImportService.importAttachment(taskContext, file, parentNote);
|
||||||
} catch (e: any) {
|
} catch (e: unknown) {
|
||||||
const message = `Import failed with following error: '${e.message}'. More details might be in the logs.`;
|
const [errMessage, errStack] = e instanceof Error ? [e.message, e.stack] : ["Unknown Error", undefined];
|
||||||
|
|
||||||
|
const message = `Import failed with following error: '${errMessage}'. More details might be in the logs.`;
|
||||||
taskContext.reportError(message);
|
taskContext.reportError(message);
|
||||||
|
|
||||||
log.error(message + e.stack);
|
log.error(message + errStack);
|
||||||
|
|
||||||
return [500, message];
|
return [500, message];
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user