Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-07 22:05:44 +01:00
Code Issues Packages Projects Releases Activity

feat(export/share): export without inner subdirectory

Browse Source
This commit is contained in:
Elian Doran
2025-11-03 15:49:31 +02:00
parent 056c07591e
commit e3e5109270
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/server/src/services/export/zip.ts
View File

@@ -371,10 +371,12 @@ async function exportToZip(taskContext: TaskContext<"export">, branch: BBranch,
} }
if (noteMeta.children?.length || 0 > 0) { if (noteMeta.children?.length || 0 > 0) {
const directoryPath = filePathPrefix + noteMeta.dirFileName; const directoryPath = filePathPrefix !== "" || format !== "share" ? filePathPrefix + noteMeta.dirFileName : "";
// create directory // create directory
archive.append("", { name: `${directoryPath}/`, date: dateUtils.parseDateTime(note.utcDateModified) }); if (directoryPath) {
archive.append("", { name: `${directoryPath}/`, date: dateUtils.parseDateTime(note.utcDateModified) });
}
for (const childMeta of noteMeta.children || []) { for (const childMeta of noteMeta.children || []) {
saveNote(childMeta, `${directoryPath}/`); saveNote(childMeta, `${directoryPath}/`);

2
apps/server/src/services/export/zip/share_theme.ts
View File

@@ -58,7 +58,7 @@ export default class ShareThemeExportProvider extends ZipExportProvider {
if (!noteMeta?.notePath?.length) { if (!noteMeta?.notePath?.length) {
throw new Error("Missing note path."); throw new Error("Missing note path.");
} }
const basePath = "../".repeat(noteMeta.notePath.length - 1); const basePath = "../".repeat(Math.max(0, noteMeta.notePath.length - 2));
let searchContent = ""; let searchContent = "";
if (note) { if (note) {