Skip to content

Clean up save to json, improve JSONWriter #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cjquines merged 2 commits into from
Mar 16, 2021
Merged

Clean up save to json, improve JSONWriter #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e61d33
Move file downloading procedure from Pages > safeFile() to JSONWriter
pihart Dec 14, 2020
cfabbdd
Also cache blob and url in JSONWriter
pihart Dec 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 36 additions & 10 deletions src/lib/files.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ import { HistoryCommand } from "./history";
import Pages, { PageJSON } from "./pages";
import { Cursor } from "./page";

const defaults = <T>(value: T, getDefaultValue: () => T) =>
value === undefined ? getDefaultValue() : value;

export class AsyncReader {
static readAsText = (file: File): Promise<string | ArrayBuffer> =>
new Promise((resolve, reject) => {
Expand Down Expand Up @@ -47,7 +50,9 @@ export class JSONWriter {
"qboard-version": number;
pages: PageJSON[];
};
private stringified: string;
private asString: string;
private asBlob: Blob;
private asUrl: string;

constructor(pagesJSON: PageJSON[]) {
this.sourceJSON = {
Expand All @@ -56,19 +61,40 @@ export class JSONWriter {
};
}

toString = (): string => {
if (this.stringified !== undefined) return this.stringified;
this.stringified = JSON.stringify(this.sourceJSON);
return this.stringified;
};
toString = (): string =>
(this.asString = defaults(this.asString, () =>
JSON.stringify(this.sourceJSON)
));

toBlob = (): Blob =>
new Blob([this.toString()], { type: "application/json" });
(this.asBlob = defaults(
this.asBlob,
() => new Blob([this.toString()], { type: "application/json" })
));

toURL = (): [string, () => void] => {
const url = window.URL.createObjectURL(this.toBlob());
const revoke = () => window.URL.revokeObjectURL(url);
return [url, revoke];
this.asUrl = defaults(this.asUrl, () =>
window.URL.createObjectURL(this.toBlob())
);
const revoke = () => {
window.URL.revokeObjectURL(this.asUrl);
this.asUrl = undefined;
};
return [this.asUrl, revoke];
};

download = (filename = "qboard-file") => {
const [fileURL, revokeURL] = this.toURL();

const elt = document.createElement("a");
elt.style.display = "none";
elt.href = fileURL;
elt.download = filename;
document.body.appendChild(elt);
elt.click();
elt.remove();

revokeURL();
};
}

Expand Down
12 changes: 1 addition & 11 deletions src/lib/pages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,17 +101,7 @@ export default class Pages {

saveFile = (): void => {
this.savePage();
const [fileURL, revokeURL] = new JSONWriter(this.pagesJSON).toURL();

const elt = document.createElement("a");
elt.style.display = "none";
elt.href = fileURL;
elt.download = `qboard-${timeString()}.json`;
document.body.appendChild(elt);
elt.click();
elt.parentElement.removeChild(elt);

revokeURL();
new JSONWriter(this.pagesJSON).download(`qboard-${timeString()}.json`);
this.canvas.modified = false;
};

Expand Down