Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2026-05-06 18:17:42 +02:00
Code Issues Packages Projects Releases Activity

refactor(core): move zip provider out of import

Browse Source
This commit is contained in:
Elian Doran
2026-03-27 23:23:26 +02:00
parent 1d050e8784
commit aee005b624
7 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/client-standalone/src/lightweight/zip_provider.ts
View File

@@ -1,4 +1,4 @@
import type { FileStream, ZipArchive, ZipEntry, ZipProvider } from "@triliumnext/core/src/services/import/zip_provider.js";
import type { FileStream, ZipArchive, ZipEntry, ZipProvider } from "@triliumnext/core/src/services/zip_provider.js";
import { strToU8, unzip, zipSync } from "fflate";
type ZipOutput = {

2
apps/server/src/zip_provider.ts
View File

@@ -1,4 +1,4 @@
import type { FileStream, ZipArchive, ZipEntry, ZipProvider } from "@triliumnext/core/src/services/import/zip_provider.js";
import type { FileStream, ZipArchive, ZipEntry, ZipProvider } from "@triliumnext/core/src/services/zip_provider.js";
import archiver, { type Archiver } from "archiver";
import fs from "fs";
import type { Stream } from "stream";

4
packages/trilium-core/src/index.ts
View File

@@ -9,7 +9,7 @@ import { initTranslations, TranslationProvider } from "./services/i18n";
import { initSchema, initDemoArchive } from "./services/sql_init";
import appInfo from "./services/app_info";
import { type PlatformProvider, initPlatform } from "./services/platform";
import { type ZipProvider, initZipProvider } from "./services/import/zip_provider";
import { type ZipProvider, initZipProvider } from "./services/zip_provider";
import markdown from "./services/import/markdown";
export { getLog } from "./services/log";
@@ -101,7 +101,7 @@ export type { RequestProvider, ExecOpts, CookieJar } from "./services/request";
export type * from "./meta";
export * as routeHelpers from "./routes/helpers";
export { getZipProvider, type ZipArchive, type ZipProvider } from "./services/import/zip_provider";
export { getZipProvider, type ZipArchive, type ZipProvider } from "./services/zip_provider";
export { default as zipImportService } from "./services/import/zip";
export { default as zipExportService } from "./services/export/zip";
export { type AdvancedExportOptions } from "./services/export/zip/abstract_provider";

2
packages/trilium-core/src/services/export/zip.ts
View File

@@ -9,7 +9,7 @@ import dateUtils from "../utils/date.js";
import { getLog } from "../log.js";
import protectedSessionService from "../protected_session.js";
import TaskContext from "../task_context.js";
import { getZipProvider, type ZipArchive } from "../import/zip_provider.js";
import { getZipProvider } from "../zip_provider.js";
import { getContentDisposition } from "../utils/index"
import { AdvancedExportOptions, ZipExportProvider, ZipExportProviderData } from "./zip/abstract_provider.js";
import HtmlExportProvider from "./zip/html.js";

2
packages/trilium-core/src/services/export/zip/abstract_provider.ts
View File

@@ -4,7 +4,7 @@ import mimeTypes from "mime-types";
import type BBranch from "../../../becca/entities/bbranch.js";
import type BNote from "../../../becca/entities/bnote.js";
import { ExportFormat, NoteMeta, NoteMetaFile } from "../../../meta.js";
import type { ZipArchive } from "../../import/zip_provider.js";
import type { ZipArchive } from "../../zip_provider.js";
type RewriteLinksFn = (content: string, noteMeta: NoteMeta) => string;

2
packages/trilium-core/src/services/import/zip.ts
View File

@@ -1,6 +1,6 @@
import { ALLOWED_NOTE_TYPES, type NoteType } from "@triliumnext/commons";
import { basename, dirname } from "../utils/path.js";
import { getZipProvider } from "./zip_provider.js";
import { getZipProvider } from "../zip_provider.js";
import becca from "../../becca/becca.js";
import BAttachment from "../../becca/entities/battachment.js";

0
packages/trilium-core/src/services/import/zip_provider.ts → packages/trilium-core/src/services/zip_provider.ts
View File