#43: ignore categories with no plugin results

Author: aberenguel

iped-engine/src/main/java/iped/engine/core/QueuesProcessingOrder.java

@@ -118,7 +118,7 @@ private static Map<MediaType, Integer> installTypesToPostProcess() {
         mediaTypes.put(RFC822Parser.RFC822_PARTIAL1_MIME, 2);
 
         mediaTypes.put(AleappTask.ALEAPP_CASE_MEDIATYPE, 5);
-        mediaTypes.put(AleappTask.ALEAPP_PLUGIN_RESULTS_MEDIATYPE, 5);
+        mediaTypes.put(AleappTask.ALEAPP_CATEGORY_MEDIATYPE, 6);
         mediaTypes.put(AleappTask.ALEAPP_DEVICE_INFO_MEDIATYPE, 6);
 
         return mediaTypes;

iped-engine/src/main/java/iped/engine/task/aleapp/AleappTask.java

@@ -59,6 +59,8 @@ public class AleappTask extends AbstractTask {
     public static final MediaType ALEAPP_ACTIVITY_MEDIATYPE = MediaType.application(ALEAPP_APPLICATION_PREFIX + "activity");
     public static final MediaType ALEAPP_DEVICE_INFO_MEDIATYPE = MediaType.application(ALEAPP_APPLICATION_PREFIX + "deviceinfo");
 
+    public static final String ALEAPP_PLUGIN_CATEGORY_KEY = "aleapp_category";
+
     private static final String DEVICE_INFO_HTML = "DeviceInfo.html";
 
     private static final String CASE_EVIDENCE_NAME = "ALEAPP_Results";
@@ -245,6 +247,8 @@ public void process(IItem item) throws Exception {
             processExtractionRoot(item);
         } else if (isCaseEvidence(item)) {
             processCaseEvidence(item);
+        } else if (isCategoryEvidence(item)) {
+            processCategoryEvidence(item);
         } else if (isPluginEvidence(item)) {
             processPluginEvidence(item);
         } else if (isDeviceInfoEvidence(item)) {
@@ -274,6 +278,10 @@ private boolean isCaseEvidence(IItem evidence) {
         return ALEAPP_CASE_MEDIATYPE.equals(evidence.getMediaType());
     }
 
+    private boolean isCategoryEvidence(IItem evidence) {
+        return ALEAPP_CATEGORY_MEDIATYPE.equals(evidence.getMediaType());
+    }
+
     private boolean isPluginEvidence(IItem evidence) {
         return ALEAPP_PLUGIN_RESULTS_MEDIATYPE.equals(evidence.getMediaType());
     }
@@ -349,7 +357,6 @@ private void processCaseEvidence(IItem caseEvidence) throws Exception {
                     categoryEvidence.setPath(caseEvidence.getPath() + "/" + name);
                     categoryEvidence.setIdInDataSource("");
                     categoryEvidence.setExtraAttribute(ExtraProperties.DECODED_DATA, true);
-                    categoryEvidence.setHasChildren(true);
 
                     worker.processNewItem(categoryEvidence, ProcessTime.LATER);
 
@@ -358,6 +365,7 @@ private void processCaseEvidence(IItem caseEvidence) throws Exception {
 
                 Item pluginEvidence = (Item) categoryItem.createChildItem();
                 pluginEvidence.setMediaType(ALEAPP_PLUGIN_RESULTS_MEDIATYPE);
+                pluginEvidence.setTempAttribute(ALEAPP_PLUGIN_CATEGORY_KEY, categoryItem);
 
                 String name = StringUtils.firstNonBlank((String) plugin.getArtifactInfo().get("name"), plugin.getName());
                 pluginEvidence.setName(name);
@@ -386,7 +394,13 @@ private void processCaseEvidence(IItem caseEvidence) throws Exception {
         deviceInfoEvidence.setPath(caseEvidence.getPath() + "/" + DEVICE_INFO_HTML);
         deviceInfoEvidence.setIdInDataSource("");
         worker.processNewItem(deviceInfoEvidence, ProcessTime.LATER);
+    }
 
+    private void processCategoryEvidence(IItem categoryEvidence) throws Exception {
+        if (!categoryEvidence.hasChildren()) {
+            logger.info("Ignoring Aleapp category {}: no children", categoryEvidence.getName());
+            categoryEvidence.setToIgnore(true);
+        }
     }
 
     private void processPluginEvidence(IItem pluginEvidence) throws Exception {

iped-engine/src/main/java/iped/engine/task/aleapp/interceptors/IlapfuncsTsvInterceptor.java

@@ -15,6 +15,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import iped.data.IItem;
 import iped.data.IItemReader;
 import iped.engine.core.Worker.ProcessTime;
 import iped.engine.data.Item;
@@ -55,7 +56,10 @@ public Object call(Object[] args, Map<String, Object> kwargs) throws Exception {
         State state = AleappTask.getState();
 
         // set hasChildren, so plugin will not be ignored in AleappTask.processPluginEvidence()
+        // and category will not be ignored in AleappTask.processCategoryEvidence()
         state.getPluginItem().setHasChildren(true);
+        IItem categoryItem = (IItem) state.getPluginItem().getTempAttribute(AleappTask.ALEAPP_PLUGIN_CATEGORY_KEY);
+        categoryItem.setHasChildren(true);
 
         // linkedItems
         Set<String> globalIds = new HashSet<>();