@fiduswriter/books-document 0.1.4 → 0.1.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/exporter/bits/index.d.ts +3 -1
- package/dist/exporter/bits/index.d.ts.map +1 -1
- package/dist/exporter/bits/index.js +16 -6
- package/dist/exporter/bits/index.js.map +1 -1
- package/dist/exporter/docx/index.d.ts +3 -1
- package/dist/exporter/docx/index.d.ts.map +1 -1
- package/dist/exporter/docx/index.js +16 -7
- package/dist/exporter/docx/index.js.map +1 -1
- package/dist/exporter/epub/index.d.ts +3 -1
- package/dist/exporter/epub/index.d.ts.map +1 -1
- package/dist/exporter/epub/index.js +13 -5
- package/dist/exporter/epub/index.js.map +1 -1
- package/dist/exporter/html/index.d.ts +3 -1
- package/dist/exporter/html/index.d.ts.map +1 -1
- package/dist/exporter/html/index.js +15 -6
- package/dist/exporter/html/index.js.map +1 -1
- package/dist/exporter/latex/index.d.ts +3 -1
- package/dist/exporter/latex/index.d.ts.map +1 -1
- package/dist/exporter/latex/index.js +11 -2
- package/dist/exporter/latex/index.js.map +1 -1
- package/dist/exporter/native/index.d.ts +4 -2
- package/dist/exporter/native/index.d.ts.map +1 -1
- package/dist/exporter/native/index.js +17 -7
- package/dist/exporter/native/index.js.map +1 -1
- package/dist/exporter/odt/index.d.ts +3 -1
- package/dist/exporter/odt/index.d.ts.map +1 -1
- package/dist/exporter/odt/index.js +16 -7
- package/dist/exporter/odt/index.js.map +1 -1
- package/dist/exporter/tools.d.ts +2 -0
- package/dist/exporter/tools.d.ts.map +1 -1
- package/dist/exporter/tools.js +8 -10
- package/dist/exporter/tools.js.map +1 -1
- package/package.json +2 -2
- package/src/exporter/bits/index.ts +20 -9
- package/src/exporter/docx/index.ts +23 -8
- package/src/exporter/epub/index.ts +18 -6
- package/src/exporter/html/index.ts +21 -8
- package/src/exporter/latex/index.ts +15 -2
- package/src/exporter/native/index.ts +33 -13
- package/src/exporter/odt/index.ts +23 -8
- package/src/exporter/tools.ts +17 -17
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/exporter/latex/index.ts"],"names":[],"mappings":"AAAA;;GAEG;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/exporter/latex/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
import type { Schema } from "prosemirror-model";
|
|
5
5
|
import { FIDUSBOOK_VERSION } from "../../schema/index.js";
|
|
6
6
|
import type { Book, DocumentListEntry, User } from "../../types.js";
|
|
7
|
+
import type { ProgressCallback } from "@fiduswriter/document/exporter/native/shrink";
|
|
7
8
|
export { FIDUSBOOK_VERSION };
|
|
8
9
|
export declare class NativeBookExporter {
|
|
9
10
|
schema: Schema;
|
|
@@ -11,8 +12,9 @@ export declare class NativeBookExporter {
|
|
|
11
12
|
user: User;
|
|
12
13
|
documentList: DocumentListEntry[];
|
|
13
14
|
updated: any;
|
|
14
|
-
|
|
15
|
-
|
|
15
|
+
progressCallback?: ProgressCallback;
|
|
16
|
+
constructor(schema: Schema, book: Book, user: User, documentList: DocumentListEntry[], updated: any, progressCallback?: ProgressCallback);
|
|
17
|
+
init(progressCallback?: ProgressCallback): Promise<Blob>;
|
|
16
18
|
exportContents(): Promise<Blob>;
|
|
17
19
|
download(blob: Blob): Blob;
|
|
18
20
|
get defaultFilename(): string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/exporter/native/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,mBAAmB,CAAA;AAM7C,OAAO,EAAC,iBAAiB,EAAC,MAAM,uBAAuB,CAAA;AACvD,OAAO,KAAK,EAAC,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAC,MAAM,gBAAgB,CAAA;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/exporter/native/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,mBAAmB,CAAA;AAM7C,OAAO,EAAC,iBAAiB,EAAC,MAAM,uBAAuB,CAAA;AACvD,OAAO,KAAK,EAAC,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAC,MAAM,gBAAgB,CAAA;AAEjE,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,8CAA8C,CAAA;AAYlF,OAAO,EAAC,iBAAiB,EAAC,CAAA;AAE1B,qBAAa,kBAAkB;IAC3B,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,EAAE,IAAI,CAAA;IACV,IAAI,EAAE,IAAI,CAAA;IACV,YAAY,EAAE,iBAAiB,EAAE,CAAA;IACjC,OAAO,EAAE,GAAG,CAAA;IAEZ,gBAAgB,CAAC,EAAE,gBAAgB,CAAA;gBAG/B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,iBAAiB,EAAE,EACjC,OAAO,EAAE,GAAG,EACZ,gBAAgB,CAAC,EAAE,gBAAgB;IAUvC,IAAI,CAAC,gBAAgB,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAmCxD,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IA8G/B,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IAM1B,IAAI,eAAe,IAAI,MAAM,CAE5B;CACJ"}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
import { ShrinkFidus } from "@fiduswriter/document/exporter/native/shrink";
|
|
5
5
|
import { createSlug } from "@fiduswriter/document/exporter/tools/file";
|
|
6
6
|
import { ZipFileCreator } from "@fiduswriter/document/exporter/tools/zip";
|
|
7
|
-
import {
|
|
7
|
+
import { gettext } from "fwtoolkit";
|
|
8
8
|
import { FIDUSBOOK_VERSION } from "../../schema/index.js";
|
|
9
9
|
import { getMissingChapterData } from "../tools.js";
|
|
10
10
|
export { FIDUSBOOK_VERSION };
|
|
@@ -14,23 +14,32 @@ export class NativeBookExporter {
|
|
|
14
14
|
user;
|
|
15
15
|
documentList;
|
|
16
16
|
updated;
|
|
17
|
-
|
|
17
|
+
progressCallback;
|
|
18
|
+
constructor(schema, book, user, documentList, updated, progressCallback) {
|
|
18
19
|
this.schema = schema;
|
|
19
20
|
this.book = book;
|
|
20
21
|
this.user = user;
|
|
21
22
|
this.documentList = documentList;
|
|
22
23
|
this.updated = updated;
|
|
24
|
+
this.progressCallback = progressCallback;
|
|
23
25
|
}
|
|
24
|
-
init() {
|
|
26
|
+
init(progressCallback) {
|
|
27
|
+
if (progressCallback) {
|
|
28
|
+
this.progressCallback = progressCallback;
|
|
29
|
+
}
|
|
25
30
|
if (this.book.chapters.length === 0) {
|
|
26
|
-
|
|
31
|
+
this.progressCallback?.(gettext("Book cannot be exported due to lack of chapters."), 100);
|
|
27
32
|
return Promise.resolve(new Blob([]));
|
|
28
33
|
}
|
|
29
|
-
|
|
34
|
+
this.progressCallback?.(`${this.book.title}: ${gettext("Fidusbook export has been initiated.")}`, 0);
|
|
30
35
|
return getMissingChapterData(this.book, this.documentList, this.schema)
|
|
31
36
|
.then(() => this.exportContents())
|
|
37
|
+
.then(blob => {
|
|
38
|
+
this.progressCallback?.(`${this.book.title}: ${gettext("Fidusbook export complete.")}`, 100);
|
|
39
|
+
return blob;
|
|
40
|
+
})
|
|
32
41
|
.catch(error => {
|
|
33
|
-
|
|
42
|
+
this.progressCallback?.(`${this.book.title}: ${gettext("Fidusbook export failed.")}`, 100);
|
|
34
43
|
throw error;
|
|
35
44
|
});
|
|
36
45
|
}
|
|
@@ -70,7 +79,8 @@ export class NativeBookExporter {
|
|
|
70
79
|
if (!doc) {
|
|
71
80
|
return processChapter(index + 1);
|
|
72
81
|
}
|
|
73
|
-
|
|
82
|
+
this.progressCallback?.(gettext("Exporting chapter %s of %s..."), Math.round((index / sortedChapters.length) * 90));
|
|
83
|
+
const shrinker = new ShrinkFidus(doc, { db: doc.images || {} }, { db: doc.bibliography || {} }, this.progressCallback);
|
|
74
84
|
return shrinker
|
|
75
85
|
.init()
|
|
76
86
|
.then(({ doc: shrunkDoc, shrunkImageDB, shrunkBibDB, httpIncludes }) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/exporter/native/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAC,WAAW,EAAC,MAAM,8CAA8C,CAAA;AACxE,OAAO,EAAC,UAAU,EAAC,MAAM,2CAA2C,CAAA;AACpE,OAAO,EAAC,cAAc,EAAC,MAAM,0CAA0C,CAAA;AACvE,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/exporter/native/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
import type { Schema } from "prosemirror-model";
|
|
5
5
|
import type { CSL, User } from "@fiduswriter/document";
|
|
6
|
+
import type { ProgressCallback } from "@fiduswriter/document/exporter/tools/progress";
|
|
6
7
|
import type { Book, DocumentListEntry } from "../../types.js";
|
|
7
8
|
import { ODTBookExporterRender } from "./render.js";
|
|
8
9
|
export declare class ODTBookExporter {
|
|
@@ -16,8 +17,9 @@ export declare class ODTBookExporter {
|
|
|
16
17
|
textFiles: Array<Record<string, unknown>>;
|
|
17
18
|
httpFiles: Array<Record<string, unknown>>;
|
|
18
19
|
mimeType: string;
|
|
20
|
+
progressCallback?: ProgressCallback;
|
|
19
21
|
constructor(schema: Schema, csl: CSL, book: Book, user: User, docList: DocumentListEntry[], updated: any);
|
|
20
|
-
init(): Promise<Blob> | false;
|
|
22
|
+
init(progressCallback?: ProgressCallback): Promise<Blob> | false;
|
|
21
23
|
export(): Promise<Blob>;
|
|
22
24
|
exportChapters(xml: any, render: ODTBookExporterRender, styles: any, math: any, tracks: any): Promise<void>;
|
|
23
25
|
getBaseMetadata(): Record<string, unknown>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/exporter/odt/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,mBAAmB,CAAA;AAC7C,OAAO,KAAK,EAAC,GAAG,EAAE,IAAI,EAAC,MAAM,uBAAuB,CAAA;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/exporter/odt/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,mBAAmB,CAAA;AAC7C,OAAO,KAAK,EAAC,GAAG,EAAE,IAAI,EAAC,MAAM,uBAAuB,CAAA;AACpD,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,+CAA+C,CAAA;AAkBnF,OAAO,KAAK,EAAC,IAAI,EAAE,iBAAiB,EAAC,MAAM,gBAAgB,CAAA;AAE3D,OAAO,EAAC,qBAAqB,EAAC,MAAM,aAAa,CAAA;AAEjD,qBAAa,eAAe;IACxB,MAAM,EAAE,MAAM,CAAA;IACd,GAAG,EAAE,GAAG,CAAA;IACR,IAAI,EAAE,IAAI,CAAA;IACV,IAAI,EAAE,IAAI,CAAA;IACV,OAAO,EAAE,iBAAiB,EAAE,CAAA;IAC5B,WAAW,EAAE,MAAM,CAAA;IACnB,OAAO,EAAE,GAAG,CAAA;IACZ,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;IACzC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;IACzC,QAAQ,EAAE,MAAM,CAAA;IAChB,gBAAgB,CAAC,EAAE,gBAAgB,CAAA;gBAG/B,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,iBAAiB,EAAE,EAC5B,OAAO,EAAE,GAAG;IAehB,IAAI,CAAC,gBAAgB,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,KAAK;IAmBhE,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAmCvB,cAAc,CACV,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,qBAAqB,EAC7B,MAAM,EAAE,GAAG,EACX,IAAI,EAAE,GAAG,EACT,MAAM,EAAE,GAAG,GACZ,OAAO,CAAC,IAAI,CAAC;IA+EhB,eAAe,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAiB1C,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IAI1B,IAAI,eAAe,IAAI,MAAM,CAE5B;CACJ"}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
import { fixTables, removeHidden } from "@fiduswriter/document/exporter/tools/doc_content";
|
|
5
5
|
import { createSlug } from "@fiduswriter/document/exporter/tools/file";
|
|
6
6
|
import { XmlZip } from "@fiduswriter/document/exporter/tools/xml_zip";
|
|
7
|
-
import {
|
|
7
|
+
import { gettext } from "fwtoolkit";
|
|
8
8
|
import { ODTExporterCitations } from "@fiduswriter/document/exporter/odt/citations";
|
|
9
9
|
import { ODTExporterImages } from "@fiduswriter/document/exporter/odt/images";
|
|
10
10
|
import { ODTExporterFootnotes } from "@fiduswriter/document/exporter/odt/footnotes";
|
|
@@ -26,6 +26,7 @@ export class ODTBookExporter {
|
|
|
26
26
|
textFiles;
|
|
27
27
|
httpFiles;
|
|
28
28
|
mimeType;
|
|
29
|
+
progressCallback;
|
|
29
30
|
constructor(schema, csl, book, user, docList, updated) {
|
|
30
31
|
this.schema = schema;
|
|
31
32
|
this.csl = csl;
|
|
@@ -38,14 +39,16 @@ export class ODTBookExporter {
|
|
|
38
39
|
this.httpFiles = [];
|
|
39
40
|
this.mimeType = "application/vnd.oasis.opendocument.text";
|
|
40
41
|
}
|
|
41
|
-
init() {
|
|
42
|
+
init(progressCallback) {
|
|
43
|
+
this.progressCallback = progressCallback;
|
|
44
|
+
this.progressCallback?.(gettext("ODT book export has been initiated."), 0);
|
|
42
45
|
if (this.book.chapters.length === 0) {
|
|
43
|
-
|
|
44
|
-
return false;
|
|
46
|
+
throw new Error(gettext("Book cannot be exported due to lack of chapters."));
|
|
45
47
|
}
|
|
46
|
-
return getMissingChapterData(this.book, this.docList, this.schema, { rawContent: true }).then(() => this.export());
|
|
48
|
+
return getMissingChapterData(this.book, this.docList, this.schema, { rawContent: true, progressCallback: this.progressCallback }).then(() => this.export());
|
|
47
49
|
}
|
|
48
50
|
export() {
|
|
51
|
+
this.progressCallback?.(gettext("Preparing ODT book..."), 10);
|
|
49
52
|
this.book.chapters.sort((a, b) => (a.number > b.number ? 1 : -1));
|
|
50
53
|
const xml = new XmlZip(this.templateUrl, this.mimeType);
|
|
51
54
|
const styles = new ODTExporterStyles(xml);
|
|
@@ -61,8 +64,14 @@ export class ODTBookExporter {
|
|
|
61
64
|
.then(() => metadata.init())
|
|
62
65
|
.then(() => math.init())
|
|
63
66
|
.then(() => this.exportChapters(xml, render, styles, math, tracks))
|
|
64
|
-
.then(() =>
|
|
65
|
-
.
|
|
67
|
+
.then(() => {
|
|
68
|
+
this.progressCallback?.(gettext("Finalizing ODT book..."), 90);
|
|
69
|
+
return xml.prepareBlob();
|
|
70
|
+
})
|
|
71
|
+
.then(blob => {
|
|
72
|
+
this.progressCallback?.(gettext("ODT book export complete."), 100);
|
|
73
|
+
return this.download(blob);
|
|
74
|
+
});
|
|
66
75
|
}
|
|
67
76
|
exportChapters(xml, render, styles, math, tracks) {
|
|
68
77
|
return this.book.chapters
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/exporter/odt/index.ts"],"names":[],"mappings":"AAAA;;GAEG;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/exporter/odt/index.ts"],"names":[],"mappings":"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"}
|
package/dist/exporter/tools.d.ts
CHANGED
|
@@ -7,6 +7,7 @@
|
|
|
7
7
|
* decrypt end-to-end encrypted chapters.
|
|
8
8
|
*/
|
|
9
9
|
import type { Schema } from "prosemirror-model";
|
|
10
|
+
import type { ProgressCallback } from "@fiduswriter/document/exporter/tools/progress";
|
|
10
11
|
import type { ChapterLoader, DocumentListEntry, E2EEStrategy, Book } from "../types.js";
|
|
11
12
|
/** Default no-op chapter loader. */
|
|
12
13
|
export declare const noopChapterLoader: ChapterLoader;
|
|
@@ -25,5 +26,6 @@ export declare function getMissingChapterData(book: Book, documentList: Document
|
|
|
25
26
|
rawContent?: boolean;
|
|
26
27
|
loader?: ChapterLoader;
|
|
27
28
|
e2ee?: E2EEStrategy;
|
|
29
|
+
progressCallback?: ProgressCallback;
|
|
28
30
|
}): Promise<void>;
|
|
29
31
|
//# sourceMappingURL=tools.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../src/exporter/tools.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../src/exporter/tools.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,mBAAmB,CAAA;AAI7C,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,+CAA+C,CAAA;AAEnF,OAAO,KAAK,EACR,aAAa,EACb,iBAAiB,EACjB,YAAY,EACZ,IAAI,EACP,MAAM,aAAa,CAAA;AAEpB,oCAAoC;AACpC,eAAO,MAAM,iBAAiB,EAAE,aAI/B,CAAA;AAED,mCAAmC;AACnC,eAAO,MAAM,gBAAgB,EAAE,YAY9B,CAAA;AAED;;;;;;;;GAQG;AACH,wBAAsB,qBAAqB,CACvC,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,iBAAiB,EAAE,EACjC,MAAM,EAAE,MAAM,EACd,OAAO,GAAE;IACL,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,MAAM,CAAC,EAAE,aAAa,CAAA;IACtB,IAAI,CAAC,EAAE,YAAY,CAAA;IACnB,gBAAgB,CAAC,EAAE,gBAAgB,CAAA;CACjC,GACP,OAAO,CAAC,IAAI,CAAC,CA2Bf"}
|
package/dist/exporter/tools.js
CHANGED
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
*/
|
|
9
9
|
import { getSettings } from "@fiduswriter/document/schema/convert";
|
|
10
10
|
import { acceptAllNoInsertions } from "@fiduswriter/document/transform";
|
|
11
|
-
import {
|
|
11
|
+
import { gettext } from "fwtoolkit";
|
|
12
12
|
/** Default no-op chapter loader. */
|
|
13
13
|
export const noopChapterLoader = {
|
|
14
14
|
loadChapters: async () => {
|
|
@@ -39,15 +39,16 @@ export const noopE2EEStrategy = {
|
|
|
39
39
|
* @returns Promise that resolves when data is ready.
|
|
40
40
|
*/
|
|
41
41
|
export async function getMissingChapterData(book, documentList, schema, options = {}) {
|
|
42
|
-
const { rawContent = false, loader = noopChapterLoader, e2ee = noopE2EEStrategy } = options;
|
|
42
|
+
const { rawContent = false, loader = noopChapterLoader, e2ee = noopE2EEStrategy, progressCallback } = options;
|
|
43
|
+
progressCallback?.(gettext("Loading chapter data..."), 0);
|
|
43
44
|
const bookDocuments = book.chapters.map(chapter => documentList.find(doc => doc.id === chapter.text));
|
|
44
45
|
if (bookDocuments.some(doc => doc === undefined)) {
|
|
45
|
-
|
|
46
|
-
throw new Error("Cannot produce book as you lack access rights to its chapters.");
|
|
46
|
+
throw new Error(gettext("Cannot produce book as you lack access rights to its chapters."));
|
|
47
47
|
}
|
|
48
48
|
const docIds = book.chapters.map(chapter => chapter.text);
|
|
49
49
|
await loader.loadChapters(docIds, documentList, schema, rawContent);
|
|
50
50
|
await decryptE2EEChapters(book, documentList, schema, rawContent, e2ee);
|
|
51
|
+
progressCallback?.(gettext("Chapter data loaded."), 50);
|
|
51
52
|
}
|
|
52
53
|
/**
|
|
53
54
|
* Decrypt all E2EE chapters in the book whose content is still an encrypted
|
|
@@ -63,8 +64,7 @@ async function decryptE2EEChapters(book, documentList, schema, rawContent, e2ee)
|
|
|
63
64
|
}
|
|
64
65
|
const unlocked = await e2ee.ensurePassphraseUnlocked();
|
|
65
66
|
if (!unlocked) {
|
|
66
|
-
|
|
67
|
-
throw new Error("Passphrase required for encrypted chapters");
|
|
67
|
+
throw new Error(gettext("A personal passphrase is required to work with books that contain encrypted chapters. Please set up or unlock your personal passphrase in your profile settings."));
|
|
68
68
|
}
|
|
69
69
|
await Promise.all(e2eeChapters.map(async (chapter) => {
|
|
70
70
|
const doc = documentList.find(d => d.id === chapter.text);
|
|
@@ -76,8 +76,7 @@ async function decryptE2EEChapters(book, documentList, schema, rawContent, e2ee)
|
|
|
76
76
|
: gettext("Untitled");
|
|
77
77
|
const password = await e2ee.getDocumentPassword(Number(doc.id));
|
|
78
78
|
if (!password) {
|
|
79
|
-
|
|
80
|
-
throw new Error(`No encryption key for document ${String(doc.id)}`);
|
|
79
|
+
throw new Error(`${gettext("No encryption key found for chapter:")} ${chapterLabel}. ${gettext("The key may not have been shared with you.")}`);
|
|
81
80
|
}
|
|
82
81
|
if (!doc.e2ee_salt) {
|
|
83
82
|
// No salt means the document has no encrypted snapshot yet.
|
|
@@ -135,8 +134,7 @@ async function decryptE2EEChapters(book, documentList, schema, rawContent, e2ee)
|
|
|
135
134
|
err.message.startsWith("No encryption key")) {
|
|
136
135
|
throw err;
|
|
137
136
|
}
|
|
138
|
-
|
|
139
|
-
throw err;
|
|
137
|
+
throw new Error(`${gettext("Could not decrypt chapter:")} ${chapterLabel}. ${gettext("The document may have been re-encrypted with a different password.")}`);
|
|
140
138
|
}
|
|
141
139
|
}));
|
|
142
140
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/exporter/tools.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,EAAC,WAAW,EAAC,MAAM,sCAAsC,CAAA;AAChE,OAAO,EAAC,qBAAqB,EAAC,MAAM,iCAAiC,CAAA;AACrE,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/exporter/tools.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fiduswriter/books-document",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.5",
|
|
4
4
|
"description": "Fidus Writer book importers and exporters",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -86,7 +86,7 @@
|
|
|
86
86
|
"format:check": "prettier --check ."
|
|
87
87
|
},
|
|
88
88
|
"dependencies": {
|
|
89
|
-
"@fiduswriter/document": "^0.2.
|
|
89
|
+
"@fiduswriter/document": "^0.2.15",
|
|
90
90
|
"@vivliostyle/print": "^2.42.0",
|
|
91
91
|
"biblatex-csl-converter": "^3.0.0",
|
|
92
92
|
"downloadjs": "^1.4.7",
|
|
@@ -6,9 +6,10 @@ import type {Schema} from "prosemirror-model"
|
|
|
6
6
|
import pretty from "pretty"
|
|
7
7
|
import {JATSExporterConverter} from "@fiduswriter/document/exporter/jats/convert"
|
|
8
8
|
import {darManifest} from "@fiduswriter/document/exporter/jats/templates"
|
|
9
|
+
import type {ProgressCallback} from "@fiduswriter/document/exporter/tools/progress"
|
|
9
10
|
import {createSlug} from "@fiduswriter/document/exporter/tools/file"
|
|
10
11
|
import {ZipFileCreator} from "@fiduswriter/document/exporter/tools/zip"
|
|
11
|
-
import {
|
|
12
|
+
import {gettext} from "fwtoolkit"
|
|
12
13
|
|
|
13
14
|
import type {Book, CSL, DocumentListEntry, User} from "../../types.js"
|
|
14
15
|
import {getMissingChapterData} from "../tools.js"
|
|
@@ -36,6 +37,7 @@ export class BITSBookExporter {
|
|
|
36
37
|
textFiles: TextFile[]
|
|
37
38
|
httpFiles: HttpFile[]
|
|
38
39
|
zipFileName: string
|
|
40
|
+
progressCallback?: ProgressCallback
|
|
39
41
|
|
|
40
42
|
constructor(
|
|
41
43
|
schema: Schema,
|
|
@@ -57,20 +59,24 @@ export class BITSBookExporter {
|
|
|
57
59
|
this.zipFileName = ""
|
|
58
60
|
}
|
|
59
61
|
|
|
60
|
-
init(): Promise<Blob> | false {
|
|
62
|
+
init(progressCallback?: ProgressCallback): Promise<Blob> | false {
|
|
63
|
+
this.progressCallback = progressCallback
|
|
64
|
+
this.progressCallback?.(
|
|
65
|
+
gettext("BITS book export has been initiated."),
|
|
66
|
+
0
|
|
67
|
+
)
|
|
61
68
|
if (this.book.chapters.length === 0) {
|
|
62
|
-
|
|
63
|
-
"error",
|
|
69
|
+
throw new Error(
|
|
64
70
|
gettext("Book cannot be exported due to lack of chapters.")
|
|
65
71
|
)
|
|
66
|
-
return false
|
|
67
72
|
}
|
|
68
|
-
return getMissingChapterData(this.book, this.docList, this.schema
|
|
69
|
-
|
|
70
|
-
)
|
|
73
|
+
return getMissingChapterData(this.book, this.docList, this.schema, {
|
|
74
|
+
progressCallback: this.progressCallback
|
|
75
|
+
}).then(() => this.export())
|
|
71
76
|
}
|
|
72
77
|
|
|
73
78
|
export(): Promise<Blob> {
|
|
79
|
+
this.progressCallback?.(gettext("Preparing BITS book..."), 10)
|
|
74
80
|
this.book.chapters.sort((a, b) => (a.number > b.number ? 1 : -1))
|
|
75
81
|
|
|
76
82
|
const imageDict: Record<string, {image: string; title?: string}> = {}
|
|
@@ -105,6 +111,7 @@ export class BITSBookExporter {
|
|
|
105
111
|
chapters: Array<{front: string; body: string; back: string}>,
|
|
106
112
|
imageDict: Record<string, {image: string; title?: string}>
|
|
107
113
|
): Promise<Blob> {
|
|
114
|
+
this.progressCallback?.(gettext("Assembling BITS book..."), 80)
|
|
108
115
|
const images = Object.values(imageDict).map(image => ({
|
|
109
116
|
filename: image.image.split("/").pop()?.split("?")[0] || "",
|
|
110
117
|
url: image.image.split("?")[0],
|
|
@@ -143,6 +150,7 @@ export class BITSBookExporter {
|
|
|
143
150
|
}
|
|
144
151
|
|
|
145
152
|
createZip(): Promise<Blob> {
|
|
153
|
+
this.progressCallback?.(gettext("Finalizing BITS book..."), 90)
|
|
146
154
|
const zipper = new ZipFileCreator(
|
|
147
155
|
this.textFiles,
|
|
148
156
|
this.httpFiles,
|
|
@@ -150,7 +158,10 @@ export class BITSBookExporter {
|
|
|
150
158
|
undefined,
|
|
151
159
|
this.updated
|
|
152
160
|
)
|
|
153
|
-
return zipper.init().then(blob =>
|
|
161
|
+
return zipper.init().then(blob => {
|
|
162
|
+
this.progressCallback?.(gettext("BITS book export complete."), 100)
|
|
163
|
+
return this.download(blob)
|
|
164
|
+
})
|
|
154
165
|
}
|
|
155
166
|
|
|
156
167
|
download(blob: Blob): Blob {
|
|
@@ -4,13 +4,14 @@
|
|
|
4
4
|
|
|
5
5
|
import type {Schema} from "prosemirror-model"
|
|
6
6
|
import type {CSL, User} from "@fiduswriter/document"
|
|
7
|
+
import type {ProgressCallback} from "@fiduswriter/document/exporter/tools/progress"
|
|
7
8
|
import {
|
|
8
9
|
fixTables,
|
|
9
10
|
removeHidden
|
|
10
11
|
} from "@fiduswriter/document/exporter/tools/doc_content"
|
|
11
12
|
import {createSlug} from "@fiduswriter/document/exporter/tools/file"
|
|
12
13
|
import {XmlZip} from "@fiduswriter/document/exporter/tools/xml_zip"
|
|
13
|
-
import {
|
|
14
|
+
import {gettext} from "fwtoolkit"
|
|
14
15
|
|
|
15
16
|
import {DOCXExporterCitations} from "@fiduswriter/document/exporter/docx/citations"
|
|
16
17
|
import {DOCXExporterComments} from "@fiduswriter/document/exporter/docx/comments"
|
|
@@ -39,6 +40,7 @@ export class DOCXBookExporter {
|
|
|
39
40
|
textFiles: Array<Record<string, unknown>>
|
|
40
41
|
httpFiles: Array<Record<string, unknown>>
|
|
41
42
|
mimeType: string
|
|
43
|
+
progressCallback?: ProgressCallback
|
|
42
44
|
|
|
43
45
|
constructor(
|
|
44
46
|
schema: Schema,
|
|
@@ -62,23 +64,27 @@ export class DOCXBookExporter {
|
|
|
62
64
|
"application/vnd.openxmlformats-officedocument.wordprocessingml.document"
|
|
63
65
|
}
|
|
64
66
|
|
|
65
|
-
init(): Promise<Blob> | false {
|
|
67
|
+
init(progressCallback?: ProgressCallback): Promise<Blob> | false {
|
|
68
|
+
this.progressCallback = progressCallback
|
|
69
|
+
this.progressCallback?.(
|
|
70
|
+
gettext("DOCX book export has been initiated."),
|
|
71
|
+
0
|
|
72
|
+
)
|
|
66
73
|
if (this.book.chapters.length === 0) {
|
|
67
|
-
|
|
68
|
-
"error",
|
|
74
|
+
throw new Error(
|
|
69
75
|
gettext("Book cannot be exported due to lack of chapters.")
|
|
70
76
|
)
|
|
71
|
-
return false
|
|
72
77
|
}
|
|
73
78
|
return getMissingChapterData(
|
|
74
79
|
this.book,
|
|
75
80
|
this.docList,
|
|
76
81
|
this.schema,
|
|
77
|
-
{rawContent: true}
|
|
82
|
+
{rawContent: true, progressCallback: this.progressCallback}
|
|
78
83
|
).then(() => this.export())
|
|
79
84
|
}
|
|
80
85
|
|
|
81
86
|
export(): Promise<Blob> {
|
|
87
|
+
this.progressCallback?.(gettext("Preparing DOCX book..."), 10)
|
|
82
88
|
this.book.chapters.sort((a, b) => (a.number > b.number ? 1 : -1))
|
|
83
89
|
const xml = new XmlZip(this.templateUrl, this.mimeType)
|
|
84
90
|
|
|
@@ -99,8 +105,17 @@ export class DOCXBookExporter {
|
|
|
99
105
|
.then(() => render.init())
|
|
100
106
|
.then(() => rels.init())
|
|
101
107
|
.then(() => this.exportChapters(xml as any, render, rels, math, tables))
|
|
102
|
-
.then(() =>
|
|
103
|
-
|
|
108
|
+
.then(() => {
|
|
109
|
+
this.progressCallback?.(gettext("Finalizing DOCX book..."), 90)
|
|
110
|
+
return xml.prepareBlob()
|
|
111
|
+
})
|
|
112
|
+
.then(blob => {
|
|
113
|
+
this.progressCallback?.(
|
|
114
|
+
gettext("DOCX book export complete."),
|
|
115
|
+
100
|
|
116
|
+
)
|
|
117
|
+
return this.download(blob)
|
|
118
|
+
})
|
|
104
119
|
}
|
|
105
120
|
|
|
106
121
|
exportChapters(
|
|
@@ -5,10 +5,11 @@
|
|
|
5
5
|
import type {Schema} from "prosemirror-model"
|
|
6
6
|
import {HTMLExporterConvert} from "@fiduswriter/document/exporter/html/convert"
|
|
7
7
|
import {htmlExportTemplate} from "@fiduswriter/document/exporter/html/templates"
|
|
8
|
+
import type {ProgressCallback} from "@fiduswriter/document/exporter/tools/progress"
|
|
8
9
|
import {removeHidden} from "@fiduswriter/document/exporter/tools/doc_content"
|
|
9
10
|
import {createSlug} from "@fiduswriter/document/exporter/tools/file"
|
|
10
11
|
import {ZipFileCreator} from "@fiduswriter/document/exporter/tools/zip"
|
|
11
|
-
import {
|
|
12
|
+
import {gettext, get, staticUrl} from "fwtoolkit"
|
|
12
13
|
import pretty from "pretty"
|
|
13
14
|
|
|
14
15
|
import type {Book, BookStyles, CSL, DocumentListEntry, User} from "../../types.js"
|
|
@@ -83,6 +84,7 @@ export class EpubBookExporter {
|
|
|
83
84
|
contentItems: Array<Record<string, unknown>>
|
|
84
85
|
includeZips: IncludeZip[]
|
|
85
86
|
math: boolean
|
|
87
|
+
progressCallback?: ProgressCallback
|
|
86
88
|
|
|
87
89
|
constructor(
|
|
88
90
|
schema: Schema,
|
|
@@ -111,16 +113,21 @@ export class EpubBookExporter {
|
|
|
111
113
|
this.math = false
|
|
112
114
|
}
|
|
113
115
|
|
|
114
|
-
async init(): Promise<Blob | false> {
|
|
116
|
+
async init(progressCallback?: ProgressCallback): Promise<Blob | false> {
|
|
117
|
+
this.progressCallback = progressCallback
|
|
118
|
+
this.progressCallback?.(
|
|
119
|
+
gettext("Epub book export has been initiated."),
|
|
120
|
+
0
|
|
121
|
+
)
|
|
115
122
|
if (this.book.chapters.length === 0) {
|
|
116
|
-
|
|
117
|
-
"error",
|
|
123
|
+
throw new Error(
|
|
118
124
|
gettext("Book cannot be exported due to lack of chapters.")
|
|
119
125
|
)
|
|
120
|
-
return false
|
|
121
126
|
}
|
|
122
127
|
|
|
123
|
-
await getMissingChapterData(this.book, this.docList, this.schema
|
|
128
|
+
await getMissingChapterData(this.book, this.docList, this.schema, {
|
|
129
|
+
progressCallback: this.progressCallback
|
|
130
|
+
})
|
|
124
131
|
|
|
125
132
|
this.addBookStyle()
|
|
126
133
|
return this.exportContents()
|
|
@@ -153,6 +160,7 @@ export class EpubBookExporter {
|
|
|
153
160
|
}
|
|
154
161
|
|
|
155
162
|
async exportContents(): Promise<Blob> {
|
|
163
|
+
this.progressCallback?.(gettext("Preparing Epub book..."), 10)
|
|
156
164
|
await Promise.all(
|
|
157
165
|
this.styleSheets.map(async sheet => this.loadStyle(sheet))
|
|
158
166
|
)
|
|
@@ -263,6 +271,8 @@ export class EpubBookExporter {
|
|
|
263
271
|
)
|
|
264
272
|
).filter((chapter): chapter is ChapterOutput => chapter !== false)
|
|
265
273
|
|
|
274
|
+
this.progressCallback?.(gettext("Assembling Epub book..."), 80)
|
|
275
|
+
|
|
266
276
|
this.textFiles.push({
|
|
267
277
|
filename: "copyright.xhtml",
|
|
268
278
|
contents: pretty(
|
|
@@ -405,6 +415,7 @@ export class EpubBookExporter {
|
|
|
405
415
|
}
|
|
406
416
|
|
|
407
417
|
async createZip(): Promise<Blob> {
|
|
418
|
+
this.progressCallback?.(gettext("Finalizing Epub book..."), 90)
|
|
408
419
|
const zipper = new ZipFileCreator(
|
|
409
420
|
this.textFiles,
|
|
410
421
|
this.httpFiles,
|
|
@@ -413,6 +424,7 @@ export class EpubBookExporter {
|
|
|
413
424
|
new Date(this.updated * 1000)
|
|
414
425
|
)
|
|
415
426
|
const blob = await zipper.init()
|
|
427
|
+
this.progressCallback?.(gettext("Epub book export complete."), 100)
|
|
416
428
|
return this.download(blob)
|
|
417
429
|
}
|
|
418
430
|
|