ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Glitch] Fix tesseract.js being part of the common chunk 

Port dfe6059889 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
rebase/4.0.0rc2
Eugen Rochko 2019-08-15 17:24:45 +02:00 committed by Thibaut Girka
parent 41c7fec796
commit 5c35c9c409
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/javascript/flavours/glitch/features/ui/components/focal_point_modal.js
View File

@ -10,11 +10,11 @@ import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
import IconButton from 'flavours/glitch/components/icon_button'; import IconButton from 'flavours/glitch/components/icon_button';
import Button from 'flavours/glitch/components/button'; import Button from 'flavours/glitch/components/button';
import Video from 'flavours/glitch/features/video'; import Video from 'flavours/glitch/features/video';
import { TesseractWorker } from 'tesseract.js';
import Textarea from 'react-textarea-autosize'; import Textarea from 'react-textarea-autosize';
import UploadProgress from 'flavours/glitch/features/compose/components/upload_progress'; import UploadProgress from 'flavours/glitch/features/compose/components/upload_progress';
import CharacterCounter from 'flavours/glitch/features/compose/components/character_counter'; import CharacterCounter from 'flavours/glitch/features/compose/components/character_counter';
import { length } from 'stringz'; import { length } from 'stringz';
import { Tesseract as fetchTesseract } from 'flavours/glitch/util/async-components';
const messages = defineMessages({ const messages = defineMessages({
close: { id: 'lightbox.close', defaultMessage: 'Close' }, close: { id: 'lightbox.close', defaultMessage: 'Close' },
@ -148,19 +148,21 @@ class FocalPointModal extends ImmutablePureComponent {
handleTextDetection = () => { handleTextDetection = () => {
const { media } = this.props; const { media } = this.props;
const worker = new TesseractWorker({
workerPath: `${assetHost}/packs/ocr/worker.min.js`,
corePath: `${assetHost}/packs/ocr/tesseract-core.wasm.js`,
langPath: `${assetHost}/ocr/lang-data`,
});
this.setState({ detecting: true }); this.setState({ detecting: true });
worker.recognize(media.get('url')) fetchTesseract().then(({ TesseractWorker }) => {
.progress(({ progress }) => this.setState({ progress })) const worker = new TesseractWorker({
.finally(() => worker.terminate()) workerPath: `${assetHost}/packs/ocr/worker.min.js`,
.then(({ text }) => this.setState({ description: removeExtraLineBreaks(text), dirty: true, detecting: false })) corePath: `${assetHost}/packs/ocr/tesseract-core.wasm.js`,
.catch(() => this.setState({ detecting: false })); langPath: `${assetHost}/ocr/lang-data`,
});
worker.recognize(media.get('url'))
.progress(({ progress }) => this.setState({ progress }))
.finally(() => worker.terminate())
.then(({ text }) => this.setState({ description: removeExtraLineBreaks(text), dirty: true, detecting: false }))
.catch(() => this.setState({ detecting: false }));
}).catch(() => this.setState({ detecting: false }));
} }
render () { render () {

4
app/javascript/flavours/glitch/util/async-components.js
View File

@ -153,3 +153,7 @@ export function ListAdder () {
export function Search () { export function Search () {
return import(/*webpackChunkName: "features/glitch/async/search" */'flavours/glitch/features/search'); return import(/*webpackChunkName: "features/glitch/async/search" */'flavours/glitch/features/search');
} }
export function Tesseract () {
return import(/*webpackChunkName: "tesseract" */'tesseract.js');
}