1 files changed, 26 insertions, 24 deletions
diff --git a/src/server/ApiManagers/UploadManager.ts b/src/server/ApiManagers/UploadManager.ts
index 06f4f1a9d..8a2fe1389 100644
--- a/src/server/ApiManagers/UploadManager.ts
+++ b/src/server/ApiManagers/UploadManager.ts
@@ -14,8 +14,8 @@ import { SolrManager } from './SearchManager';
 import * as uuid from 'uuid';
 import { DashVersion } from '../../fields/DocSymbols';
 import * as AdmZip from 'adm-zip';
-const imageDataUri = require('image-data-uri');
-const fs = require('fs');
+import * as imageDataUri from 'image-data-uri';
+import * as fs from 'fs';
 
 export enum Directory {
     parsed_files = 'parsed_files',
@@ -265,7 +265,7 @@ export default class UploadManager extends ApiManager {
                                     try {
                                         zip.extractEntryTo(entry.entryName, publicDirectory, true, false);
                                         createReadStream(pathname).pipe(createWriteStream(targetname));
-                                        Jimp.read(pathname).then((img:any) => {
+                                        Jimp.read(pathname).then(img => {
                                             DashUploadUtils.imageResampleSizes(extension).forEach(({ width, suffix }) => {
                                                 const outputPath = InjectSize(targetname, suffix);
                                                 if (!width) createReadStream(pathname).pipe(createWriteStream(outputPath));
@@ -278,26 +278,28 @@ export default class UploadManager extends ApiManager {
                                     }
                                 });
                                 const json = zip.getEntry('docs.json');
-                                try {
-                                    const data = JSON.parse(json.getData().toString('utf8'), retrocycle());
-                                    const { docs, links } = data;
-                                    id = getId(data.id);
-                                    const rdocs = Object.keys(docs).map(key => docs[key]);
-                                    const ldocs = Object.keys(links).map(key => links[key]);
-                                    [...rdocs, ...ldocs].forEach(mapFn);
-                                    docids = rdocs.map(doc => doc.id);
-                                    linkids = ldocs.map(link => link.id);
-                                    await Promise.all(
-                                        [...rdocs, ...ldocs].map(
-                                            doc =>
-                                                new Promise<void>(res => {
-                                                    // overwrite mongo doc with json doc contents
-                                                    Database.Instance.replace(doc.id, doc, (err, r) => res(err && console.log(err)), true);
-                                                })
-                                        )
-                                    );
-                                } catch (e) {
-                                    console.log(e);
+                                if (json) {
+                                    try {
+                                        const data = JSON.parse(json.getData().toString('utf8'), retrocycle());
+                                        const { docs, links } = data;
+                                        id = getId(data.id);
+                                        const rdocs = Object.keys(docs).map(key => docs[key]);
+                                        const ldocs = Object.keys(links).map(key => links[key]);
+                                        [...rdocs, ...ldocs].forEach(mapFn);
+                                        docids = rdocs.map(doc => doc.id);
+                                        linkids = ldocs.map(link => link.id);
+                                        await Promise.all(
+                                            [...rdocs, ...ldocs].map(
+                                                doc =>
+                                                    new Promise<void>(res => {
+                                                        // overwrite mongo doc with json doc contents
+                                                        Database.Instance.replace(doc.id, doc, (err, r) => res(err && console.log(err)), true);
+                                                    })
+                                            )
+                                        );
+                                    } catch (e) {
+                                        console.log(e);
+                                    }
                                 }
                                 unlink(path_2.filepath, () => {});
                             }
@@ -346,7 +348,7 @@ export default class UploadManager extends ApiManager {
                 return imageDataUri.outputFile(uri, serverPathToFile(Directory.images, InjectSize(filename, origSuffix))).then((savedName: string) => {
                     const ext = path.extname(savedName).toLowerCase();
                     if (AcceptableMedia.imageFormats.includes(ext)) {
-                        Jimp.read(savedName).then((img:any) =>
+                        Jimp.read(savedName).then(img =>
                             (!origSuffix ? [{ width: 400, suffix: SizeSuffix.Medium }] : Object.values(DashUploadUtils.Sizes)) //
                                 .forEach(({ width, suffix }) => {
                                     const outputPath = serverPathToFile(Directory.images, InjectSize(filename, suffix) + ext);