Merge pull request #74 from WildMeOrg/issue_68_73

fix error/death during gm.identify() on bad file

Author: TanyaStere42

app.js

@@ -339,7 +339,7 @@ init();
 
 
   }
-  if(ext == 'jpg'){
+  if ((ext == 'jpg') || (ext == 'jpeg')) {
     // move to tmp directory, adding small .jpg extension, get full path of new file
     tempPath = settingsObject.tmpDirectory+'unprocessedImages/'+filename+'.jpg';
     await fs.promises.copyFile(ingestionDir+'/'+randomElement,tempPath);
@@ -1346,6 +1346,7 @@ const convertToJpg = async (path,filename) => {
     return new Promise((resolve, reject) => {
        gm(path).write(newPath, (err) => {
          if(err){
+           console.log(`Conversion error: ${err}`);
            reject(err);
          } else {
            resolve(newPath)
@@ -1392,7 +1393,8 @@ const parseExif = async (path) => {
   return new Promise((resolve, reject) => {
      gm(path).identify( async (err,data) => {
        if(err){
-         reject(err);
+         console.log(`Identify error: ${err}`);
+         return resolve({});
        } else {
 
          possibleTimestamps = [];