LL-1151

Author: dtheiler

servs/dataimport/dataimport.impl/src/main/java/at/kc/tugraz/ss/serv/dataimport/impl/SSDataImportImpl.java

@@ -80,8 +80,10 @@
 
 public class SSDataImportImpl extends SSServImplWithDBA implements SSDataImportClientI, SSDataImportServerI{
 
-  private static final ReentrantReadWriteLock  bitsAndPiecesImportsLock  = new ReentrantReadWriteLock();
-  private static final Map<Thread, String>     bitsAndPiecesImports      = new HashMap<>();
+  public  static final Integer                 bitsAndPiecesImageMinWidth  = 250;
+  public  static final Integer                 bitsAndPiecesImageMinHeight = 250;
+  private static final ReentrantReadWriteLock  bitsAndPiecesImportsLock    = new ReentrantReadWriteLock();
+  private static final Map<Thread, String>     bitsAndPiecesImports        = new HashMap<>();
 
   private final SSDataImportSQLFct sqlFct;
 

servs/dataimport/dataimport.impl/src/main/java/at/kc/tugraz/ss/serv/dataimport/impl/bitsandpieces/SSDataImportBitsAndPiecesEvernoteImporter.java

@@ -30,6 +30,7 @@
 import at.tugraz.sss.serv.SSSpaceE;
 import at.tugraz.sss.serv.SSToolContextE;
 import at.kc.tugraz.ss.serv.dataimport.datatypes.pars.SSDataImportBitsAndPiecesPar;
+import at.kc.tugraz.ss.serv.dataimport.impl.SSDataImportImpl;
 import at.kc.tugraz.ss.serv.dataimport.impl.evernote.SSDataImportEvernoteNoteContentHandler;
 import at.kc.tugraz.ss.serv.datatypes.entity.api.SSEntityServerI;
 import at.kc.tugraz.ss.serv.jobs.evernote.api.SSEvernoteServerI;
@@ -411,6 +412,7 @@ private void handleResources() throws Exception{
       resourceWithContent = SSServCaller.evernoteResourceGet                  (evernoteInfo.noteStore, resource.getGuid(), false);
 
       try{
+        
         if(SSFileExtE.isImageFileExt(SSMimeTypeE.fileExtForMimeType1(resourceWithContent.getMime()))){
 
           if(resourceWithContent.getAttributes().isSetSourceURL()){
@@ -427,10 +429,10 @@ private void handleResources() throws Exception{
           }
 
           if(
-            resourceWithContent.getWidth()  <= 250||
-            resourceWithContent.getHeight() <= 250){
+            resourceWithContent.getWidth()  <= SSDataImportImpl.bitsAndPiecesImageMinWidth ||
+            resourceWithContent.getHeight() <= SSDataImportImpl.bitsAndPiecesImageMinHeight){
 
-            SSLogU.info("evernote image resource height or width < 250");
+            SSLogU.info("evernote image resource height or width < " + SSDataImportImpl.bitsAndPiecesImageMinWidth);
             continue;
           }
         }

servs/dataimport/dataimport.impl/src/main/java/at/kc/tugraz/ss/serv/dataimport/impl/bitsandpieces/SSDataImportBitsAndPiecesMailImporter.java

@@ -21,6 +21,7 @@
 package at.kc.tugraz.ss.serv.dataimport.impl.bitsandpieces;
 
 import at.kc.tugraz.ss.serv.dataimport.datatypes.pars.SSDataImportBitsAndPiecesPar;
+import at.kc.tugraz.ss.serv.dataimport.impl.SSDataImportImpl;
 import at.kc.tugraz.ss.serv.datatypes.entity.api.SSEntityServerI;
 import at.kc.tugraz.ss.serv.voc.conf.SSVocConf;
 import at.kc.tugraz.ss.service.filerepo.api.SSFileRepoServerI;
@@ -34,13 +35,17 @@
 import at.tugraz.sss.serv.SSLogU;
 import at.tugraz.sss.serv.SSServErrReg;
 import at.tugraz.sss.serv.SSServReg;
+import at.tugraz.sss.serv.SSStrU;
 import at.tugraz.sss.serv.SSUri;
 import at.tugraz.sss.serv.caller.SSServCaller;
 import at.tugraz.sss.servs.entity.datatypes.par.SSEntityGetPar;
 import at.tugraz.sss.servs.file.datatype.par.SSEntityFileAddPar;
 import at.tugraz.sss.servs.mail.SSMailServerI;
 import at.tugraz.sss.servs.mail.datatype.SSMail;
 import at.tugraz.sss.servs.mail.datatype.par.SSMailsReceivePar;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import javax.imageio.ImageIO;
 import sss.serv.eval.api.SSEvalServerI;
 
 public class SSDataImportBitsAndPiecesMailImporter {
@@ -232,6 +237,10 @@ private void handleMailContentMultimedia(
 
       for(SSEntity attachment : mail.contentMultimedia){
 
+        if(!areResourceDimensionsOk(attachment.id)){
+          continue;
+        }
+          
         resourceUri = SSServCaller.vocURICreate();
 
         miscFct.addResource(
@@ -276,6 +285,10 @@ private void handleMailAttachments(
 
       for(SSEntity attachment : mail.attachments){
 
+        if(!areResourceDimensionsOk(attachment.id)){
+          continue;
+        }
+        
         resourceUri = SSServCaller.vocURICreate();
 
         miscFct.addResource(
@@ -309,4 +322,30 @@ private void handleMailAttachments(
       SSServErrReg.regErrThrow(error);
     }
   }
+
+  private Boolean areResourceDimensionsOk(final SSUri resource) throws Exception{
+    
+    try{
+
+      if(!SSFileExtE.isImageFileExt(SSFileExtE.getFromStrToFormat(SSStrU.toStr(resource)))){
+        return true;
+      }
+              
+      final BufferedImage image = ImageIO.read(new File(localWorkPath + SSVocConf.fileIDFromSSSURI(resource)));
+      
+      if(
+        image.getWidth()  <= SSDataImportImpl.bitsAndPiecesImageMinWidth ||
+        image.getHeight() <= SSDataImportImpl.bitsAndPiecesImageMinHeight){
+        
+        SSLogU.info("mail attachment height or width < " + SSDataImportImpl.bitsAndPiecesImageMinWidth);
+        return false;
+      }
+      
+      return true;
+      
+    }catch(Exception error){
+      SSServErrReg.regErrThrow(error);
+      return false;
+    }
+  }
 }