better error msg if kffDb not defined

sepinf-inc · Dec 28, 2019 · 58093e7 · 58093e7
1 parent cf52d97
commit 58093e7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/iped-app/.gitignore b/iped-app/.gitignore
@@ -2,3 +2,4 @@
 /.settings/
 /.classpath
 /.project
+/bin/
diff --git a/iped-app/src/main/java/dpf/sp/gpinf/indexer/IndexFiles.java b/iped-app/src/main/java/dpf/sp/gpinf/indexer/IndexFiles.java
@@ -182,6 +182,9 @@ void importKFF(File kffPath) {
             KFFTask kff = new KFFTask();
             kff.init(Configuration.getInstance().properties, null, true);
             kff.importKFF(kffPath);
+        } catch (IPEDException e) {
+        	System.out.println(e.toString());
+
         } catch (Exception e) {
             e.printStackTrace();
         }

diff --git a/iped-engine/src/main/java/dpf/sp/gpinf/indexer/process/task/KFFTask.java b/iped-engine/src/main/java/dpf/sp/gpinf/indexer/process/task/KFFTask.java
@@ -94,11 +94,16 @@ public void init(Properties confParams, File confDir) throws Exception {
         excludeKffIgnorable = Boolean.valueOf(confParams.getProperty("excludeKffIgnorable").trim()); //$NON-NLS-1$
 
         String kffDbPath = confParams.getProperty("kffDb"); //$NON-NLS-1$
-        if (taskEnabled && kffDbPath == null) {
-            String msg = "Configure hash database path on " + Configuration.LOCAL_CONFIG; //$NON-NLS-1$
-            LOGGER.error(msg);
-            taskEnabled = false;
-            return;
+        if (kffDbPath == null) {
+            String msg = "Configure hash database path (kffDb) on " + Configuration.LOCAL_CONFIG; //$NON-NLS-1$
+            if(importing) {
+            	throw new IPEDException(msg);
+            }
+            if(taskEnabled) {
+            	LOGGER.error(msg);
+                taskEnabled = false;
+                return;
+            }
         }
 
         // backwards compatibility