alex/yomichan
1
Fork 0
Code Releases Activity

Use common function for data URL mediatype/data extraction (#792)

Browse Source
This commit is contained in:
toasted-nutbread 2020-09-09 13:10:51 -04:00 committed by GitHub
parent e3a7678769
commit c0a6849f98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ext/bg/js/anki-note-builder.js
View File

@ -138,9 +138,12 @@ class AnkiNoteBuilder {
const {windowId, tabId, ownerFrameId, format, quality} = screenshot; const {windowId, tabId, ownerFrameId, format, quality} = screenshot;
const dataUrl = await this._getScreenshot(windowId, tabId, ownerFrameId, format, quality); const dataUrl = await this._getScreenshot(windowId, tabId, ownerFrameId, format, quality);
let fileName = `yomichan_browser_screenshot_${reading}_${this._dateToString(now)}.${format}`; const {mediaType, data} = this._getDataUrlInfo(dataUrl);
const extension = this._getImageExtensionFromMediaType(mediaType);
if (extension === null) { return; }
let fileName = `yomichan_browser_screenshot_${reading}_${this._dateToString(now)}.${extension}`;
fileName = AnkiNoteBuilder.replaceInvalidFileNameCharacters(fileName); fileName = AnkiNoteBuilder.replaceInvalidFileNameCharacters(fileName);
const data = dataUrl.replace(/^data:[\w\W]*?,/, '');
await this._anki.storeMediaFile(fileName, data); await this._anki.storeMediaFile(fileName, data);
@ -160,12 +163,12 @@ class AnkiNoteBuilder {
const dataUrl = await this._getClipboardImage(); const dataUrl = await this._getClipboardImage();
if (dataUrl === null) { return; } if (dataUrl === null) { return; }
const extension = this._getImageExtensionFromDataUrl(dataUrl); const {mediaType, data} = this._getDataUrlInfo(dataUrl);
const extension = this._getImageExtensionFromMediaType(mediaType);
if (extension === null) { return; } if (extension === null) { return; }
let fileName = `yomichan_clipboard_image_${reading}_${this._dateToString(now)}.${extension}`; let fileName = `yomichan_clipboard_image_${reading}_${this._dateToString(now)}.${extension}`;
fileName = AnkiNoteBuilder.replaceInvalidFileNameCharacters(fileName); fileName = AnkiNoteBuilder.replaceInvalidFileNameCharacters(fileName);
const data = dataUrl.replace(/^data:[\w\W]*?,/, '');
await this._anki.storeMediaFile(fileName, data); await this._anki.storeMediaFile(fileName, data);
@ -207,10 +210,23 @@ class AnkiNoteBuilder {
return false; return false;
} }
_getImageExtensionFromDataUrl(dataUrl) { _getDataUrlInfo(dataUrl) {
const match = /^data:([^;]*);/.exec(dataUrl); const match = /^data:([^,]*?)(;base64)?,/.exec(dataUrl);
if (match === null) { return null; } if (match === null) {
switch (match[1].toLowerCase()) { throw new Error('Invalid data URL');
}
let mediaType = match[1];
if (mediaType.length === 0) { mediaType = 'text/plain'; }
let data = dataUrl.substring(match[0].length);
if (typeof match[2] === 'undefined') { data = btoa(data); }
return {mediaType, data};
}
_getImageExtensionFromMediaType(mediaType) {
switch (mediaType.toLowerCase()) {
case 'image/png': return 'png'; case 'image/png': return 'png';
case 'image/jpeg': return 'jpeg'; case 'image/jpeg': return 'jpeg';
default: return null; default: return null;