From 96d4f72889f4dad0aa4b9effb70bb8c4ed0e8253 Mon Sep 17 00:00:00 2001
From: Johannes Zillmann <jz@datameer.com>
Date: Wed, 29 Mar 2017 08:11:14 +0200
Subject: [PATCH] Fix loading when PDF has non-resolvable fonts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Sometimes pdf.js gave fontId like Helvetica & Times instead of g_d0_f1, etc…, but those never got resolved through the callback. Now we simply ignore those.
* Also fixed that no fonts could be parsed
---
 src/javascript/components/LoadingView.jsx | 39 +++++++++++++++--------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/src/javascript/components/LoadingView.jsx b/src/javascript/components/LoadingView.jsx
index 6de289c..e0f6e3d 100644
--- a/src/javascript/components/LoadingView.jsx
+++ b/src/javascript/components/LoadingView.jsx
@@ -23,7 +23,7 @@ export default class LoadingView extends React.Component {
             stages: [
                 new ProgressStage('Parsing Metadata', 2),
                 new ProgressStage('Parsing Pages'),
-                new ProgressStage('Parsing Fonts')
+                new ProgressStage('Parsing Fonts', 0)
             ]
         });
         Progress.prototype.metadataStage = () => {
@@ -78,18 +78,6 @@ export default class LoadingView extends React.Component {
 
     pageParsed(index, textItems) {
         const pageStage = this.state.progress.pageStage();
-        const fontStage = this.state.progress.fontStage();
-        const self = this;
-        textItems.forEach(item => {
-            const fontId = item.font;
-            if (!this.state.fontIds.has(fontId)) {
-                this.state.document.transport.commonObjs.get(fontId, function(font) {
-                    self.fontParsed(fontId, font);
-                });
-                this.state.fontIds.add(fontId);
-                fontStage.steps = this.state.fontIds.size;
-            }
-        });
 
         pageStage.stepsDone = pageStage.stepsDone + 1;
         this.state.pages[index].items = textItems; // eslint-disable-line react/no-direct-mutation-state
@@ -111,6 +99,8 @@ export default class LoadingView extends React.Component {
 
     componentWillMount() {
         const self = this;
+        const fontStage = this.state.progress.fontStage();
+
         PDFJS.getDocument(this.props.fileBuffer).then(function(pdfDocument) { // eslint-disable-line no-undef
             // console.debug(pdfDocument);
             pdfDocument.getMetadata().then(function(metadata) {
@@ -127,6 +117,16 @@ export default class LoadingView extends React.Component {
                     page.getTextContent().then(function(textContent) {
                         // console.debug(textContent);
                         const textItems = textContent.items.map(function(item) {
+                            //trigger resolving of fonts
+                            const fontId = item.fontName;
+                            if (!self.state.fontIds.has(fontId) && fontId.startsWith('g_d0')) {
+                                self.state.document.transport.commonObjs.get(fontId, function(font) {
+                                    self.fontParsed(fontId, font);
+                                });
+                                self.state.fontIds.add(fontId);
+                                fontStage.steps = self.state.fontIds.size;
+                            }
+
                             const tx = PDFJS.Util.transform( // eslint-disable-line no-undef
                                 viewport.transform,
                                 item.transform
@@ -179,6 +179,12 @@ export default class LoadingView extends React.Component {
               <div>
                 { stageItems }
               </div>
+              <br/>
+              <br/>
+              <br/>
+              <br/>
+              <br/>
+              <br/>
             </div>);
     }
 }
@@ -231,9 +237,14 @@ class ProgressStage {
     }
 
     percentDone() {
-        if (!this.steps) {
+        if (typeof this.steps === 'undefined') {
+            // if (!this.steps) {
             return 0;
         }
+        if (this.steps == 0) {
+            return 100;
+        }
+
         return this.stepsDone / this.steps * 100;
     }
 }