SSS-376 SSS-379

Author: dtheiler

adapter/adapter.rest/adapter.rest.v2/nb-configuration.xml

@@ -17,5 +17,6 @@ Any value defined here will override the pom.xml file value but is only applicab
         <org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>ide</org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>
         <netbeans.hint.jdkPlatform>JDK_1.8</netbeans.hint.jdkPlatform>
         <netbeans.compile.on.save>none</netbeans.compile.on.save>
+        <org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server>Tomcat</org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server>
     </properties>
 </project-shared-configuration>

serv/serv.util/src/main/java/at/tugraz/sss/serv/SSFileExtE.java

@@ -129,6 +129,10 @@ public static boolean isAudioOrVideoFileExt(final SSFileExtE fileExt){
     return false;
   }
 
+  public static boolean isImageFileExt(final SSFileExtE fileExt){
+      return SSStrU.contains(imageFileExts, fileExt);
+  }
+  
   public static SSFileExtE ext(final String fileName) throws Exception {
 
     try{

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

@@ -48,7 +48,9 @@
 import at.kc.tugraz.ss.service.userevent.datatypes.pars.SSUEAddPar;
 import at.kc.tugraz.ss.service.userevent.datatypes.pars.SSUEsGetPar;
 import at.tugraz.sss.serv.SSEntity;
+import at.tugraz.sss.serv.SSFileExtE;
 import at.tugraz.sss.serv.SSLogU;
+import at.tugraz.sss.serv.SSMimeTypeE;
 import at.tugraz.sss.serv.SSServErrReg;
 import at.tugraz.sss.serv.SSServReg;
 import com.evernote.edam.type.LinkedNotebook;
@@ -670,30 +672,31 @@ private void handleResources() throws Exception{
 
       resourceWithContent = SSServCaller.evernoteResourceGet                  (evernoteInfo.noteStore, resource.getGuid(), false);
 
-//      if(resourceWithContent.getAttributes().isSetSourceURL()){
-//        SSLogU.info(resourceWithContent.getAttributes().getSourceURL());
-//        continue;
-//      }
-//      
-//      if(
-//        !resourceWithContent.isSetHeight() ||
-//        !resourceWithContent.isSetWidth()){
-//        
-//        SSLogU.info("evernote resource height or width not set");
-//        continue;
-//      }
-      
-      if(
-        resourceWithContent.isSetHeight() &&
-        resourceWithContent.isSetWidth()){
-        
-        if(
-          resourceWithContent.getWidth()  <= 250||
-          resourceWithContent.getHeight() <= 250){
-          
-          SSLogU.info("evernote resource height or width < 250");
-          continue;
-        }
+      try{
+          if(SSFileExtE.isImageFileExt(SSMimeTypeE.fileExtForMimeType1(resourceWithContent.getMime()))){
+              
+              if(resourceWithContent.getAttributes().isSetSourceURL()){
+                  SSLogU.info("evernote image with source url ignored: " + resourceWithContent.getAttributes().getSourceURL());
+                  continue;
+              }
+              
+              if(
+                      !resourceWithContent.isSetHeight() ||
+                      !resourceWithContent.isSetWidth()){
+                  
+                  SSLogU.info("evernote image resource height or width not set");
+                  continue;
+              }
+              
+              if(
+                      resourceWithContent.getWidth()  <= 250||
+                      resourceWithContent.getHeight() <= 250){
+                  
+                  SSLogU.info("evernote image resource height or width < 250");
+                  continue;
+              }
+          }
+      }catch(Exception error){
       }
 
       resourceWithContent = SSServCaller.evernoteResourceGet                  (evernoteInfo.noteStore, resource.getGuid(), true);
@@ -909,11 +912,6 @@ private Boolean addCurrentlyRunEvernoteImport(
 
     try{
 
-      if(currentlyRunEvernoteImportsLock.isWriteLocked()){
-        SSLogU.warn("attempted to start B&P evernote import concurrently for " + authEmail);
-        return false;
-      }
-      
       if(!currentlyRunEvernoteImportsLock.isWriteLockedByCurrentThread()){
         currentlyRunEvernoteImportsLock.writeLock().lock();
       }