Skip to content

Commit 48a2050

Browse files
committed
explicit param to keep or convert local date for enex import
1 parent a3bd15e commit 48a2050

File tree

1 file changed

+13
-7
lines changed
  • apps/server/src/services/import

1 file changed

+13
-7
lines changed

apps/server/src/services/import/enex.ts

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -237,8 +237,8 @@ function importEnex(taskContext: TaskContext<"importNotes">, file: File, parentN
237237

238238
function updateDates(note: BNote, utcDateCreated?: string, utcDateModified?: string) {
239239
// it's difficult to force custom dateCreated and dateModified to Note entity, so we do it post-creation with SQL
240-
const dateCreated = formatDateTimeToLocalDbFormat(utcDateCreated);
241-
const dateModified = formatDateTimeToLocalDbFormat(utcDateModified);
240+
const dateCreated = formatDateTimeToLocalDbFormat(utcDateCreated, false);
241+
const dateModified = formatDateTimeToLocalDbFormat(utcDateModified, false);
242242
sql.execute(
243243
`
244244
UPDATE notes
@@ -411,17 +411,23 @@ function importEnex(taskContext: TaskContext<"importNotes">, file: File, parentN
411411
});
412412
}
413413

414-
function formatDateTimeToLocalDbFormat(date: Date | string | null | undefined) {
415-
if (!date) {
414+
function formatDateTimeToLocalDbFormat(
415+
utcDateFromEnex: Date | string | null | undefined,
416+
keepUtc: boolean) {
417+
418+
if (!utcDateFromEnex) {
416419
return undefined;
417420
}
418421

419-
const d = dayjs(date);
420-
if (!d.isValid()) {
422+
let date = dayjs(utcDateFromEnex);
423+
if (keepUtc) {
424+
date = date.utc();
425+
}
426+
if (!date.isValid()) {
421427
return undefined;
422428
}
423429

424-
return d.format(date_utils.LOCAL_DATETIME_FORMAT);
430+
return date.format(date_utils.LOCAL_DATETIME_FORMAT);
425431
}
426432

427433
export default { importEnex };

0 commit comments

Comments
 (0)