From 279b268dda50776e95ab66f29d0f40a80fd94fed Mon Sep 17 00:00:00 2001
From: Tim McIver <mciver@basistech.com>
Date: Mon, 10 Dec 2012 14:22:12 -0500
Subject: [PATCH] Updates to code that were required as a result of changes to
 DataModel that were in support of AUT-669.

---
 .../DataContentViewerMedia.java               |  4 +-
 .../datamodel/AbstractFsContentNode.java      | 14 +++----
 .../autopsy/datamodel/DirectoryNode.java      |  4 +-
 .../sleuthkit/autopsy/datamodel/FileNode.java |  4 +-
 .../datamodel/VirtualDirectoryNode.java       | 41 +++++++++++++++----
 .../autopsy/ingest/IngestScheduler.java       |  9 ++--
 .../autopsy/report/ReportBodyFile.java        |  6 ++-
 7 files changed, 54 insertions(+), 28 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerMedia.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerMedia.java
index 0b8e584edc..6afbc66aae 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerMedia.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerMedia.java
@@ -40,7 +40,7 @@ import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataContentViewer;
 import org.sleuthkit.autopsy.datamodel.ContentUtils;
 import org.sleuthkit.datamodel.File;
-import org.sleuthkit.datamodel.TskData;
+import org.sleuthkit.datamodel.TskData.TSK_FS_NAME_FLAG_ENUM;
 
 /**
  *
@@ -332,7 +332,7 @@ public class DataContentViewerMedia extends javax.swing.JPanel implements DataCo
             return false;
         }
 
-        if (File.dirFlagToValue(file.getDirFlags()).equals(TskData.TSK_FS_NAME_FLAG_ENUM.TSK_FS_NAME_FLAG_UNALLOC.toString())) {
+        if (file.getDirFlag() == TSK_FS_NAME_FLAG_ENUM.UNALLOC) {
             return false;
         }
 
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/AbstractFsContentNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/AbstractFsContentNode.java
index b9c7062f98..73233bfe91 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/AbstractFsContentNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/AbstractFsContentNode.java
@@ -18,11 +18,11 @@
  */
 package org.sleuthkit.autopsy.datamodel;
 
-import java.text.SimpleDateFormat;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import org.openide.nodes.Sheet;
 import org.sleuthkit.datamodel.FsContent;
+import org.sleuthkit.datamodel.TskData.TSK_FS_META_MODE_ENUM;
 
 /**
  * Abstract class that implements the commonality between File and Directory
@@ -236,15 +236,15 @@ public abstract class AbstractFsContentNode<T extends FsContent> extends Abstrac
         map.put(FsContentPropertyType.ACCESS_TIME.toString(), ContentUtils.getStringTime(content.getAtime(), content));
         map.put(FsContentPropertyType.CREATED_TIME.toString(), ContentUtils.getStringTime(content.getCrtime(), content));
         map.put(FsContentPropertyType.SIZE.toString(), content.getSize());
-        map.put(FsContentPropertyType.FLAGS_DIR.toString(), content.getDirFlagsAsString());
-        map.put(FsContentPropertyType.FLAGS_META.toString(), content.getMetaFlagsAsString());
-        map.put(FsContentPropertyType.MODE.toString(), content.getModeAsString());
+        map.put(FsContentPropertyType.FLAGS_DIR.toString(), content.getDirFlag().toString());
+        map.put(FsContentPropertyType.FLAGS_META.toString(), Integer.toString(content.getMetaFlagsInt()));
+        map.put(FsContentPropertyType.MODE.toString(), TSK_FS_META_MODE_ENUM.toString(content.getModes(), content.getMetaType()));
         map.put(FsContentPropertyType.USER_ID.toString(), content.getUid());
         map.put(FsContentPropertyType.GROUP_ID.toString(), content.getGid());
         map.put(FsContentPropertyType.META_ADDR.toString(), content.getMetaAddr());
-        map.put(FsContentPropertyType.ATTR_ADDR.toString(), Long.toString(content.getAttrType()) + "-" + Long.toString(content.getAttrId()));
-        map.put(FsContentPropertyType.TYPE_DIR.toString(), content.getDirTypeAsString());
-        map.put(FsContentPropertyType.TYPE_META.toString(), content.getMetaTypeAsString());
+        map.put(FsContentPropertyType.ATTR_ADDR.toString(), Long.toString(content.getAttrType().getValue()) + "-" + Long.toString(content.getAttrId()));
+        map.put(FsContentPropertyType.TYPE_DIR.toString(), content.getDirType().getLabel());
+        map.put(FsContentPropertyType.TYPE_META.toString(), content.getMetaType().toString());
         map.put(FsContentPropertyType.KNOWN.toString(), content.getKnown().getName());
         map.put(FsContentPropertyType.MD5HASH.toString(), content.getMd5Hash() == null ? "" : content.getMd5Hash());
     }
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/DirectoryNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/DirectoryNode.java
index ef9e2adcec..d52d477176 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/DirectoryNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/DirectoryNode.java
@@ -20,7 +20,7 @@ package org.sleuthkit.autopsy.datamodel;
 
 import javax.swing.Action;
 import org.sleuthkit.datamodel.Directory;
-import org.sleuthkit.datamodel.TskData;
+import org.sleuthkit.datamodel.TskData.TSK_FS_NAME_FLAG_ENUM;
 
 /**
  * This class is used to represent the "Node" for the directory.
@@ -39,7 +39,7 @@ public class DirectoryNode extends AbstractFsContentNode<Directory> {
         super(dir, directoryBrowseMode);
 
         // set name, display name, and icon
-        if (Directory.dirFlagToValue(dir.getDirFlags()).equals(TskData.TSK_FS_NAME_FLAG_ENUM.TSK_FS_NAME_FLAG_UNALLOC.toString())) {
+        if (dir.getDirFlag() == TSK_FS_NAME_FLAG_ENUM.UNALLOC) {
             this.setIconBaseWithExtension("org/sleuthkit/autopsy/images/folder-icon-deleted.png");
         } else {
             this.setIconBaseWithExtension("org/sleuthkit/autopsy/images/Folder-icon.png");
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/FileNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/FileNode.java
index efa01982fb..7ba667cb99 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/FileNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/FileNode.java
@@ -20,7 +20,7 @@ package org.sleuthkit.autopsy.datamodel;
 
 import javax.swing.Action;
 import org.sleuthkit.datamodel.File;
-import org.sleuthkit.datamodel.TskData;
+import org.sleuthkit.datamodel.TskData.TSK_FS_NAME_FLAG_ENUM;
 
 /**
  * This class is used to represent the "Node" for the file. It has no children.
@@ -39,7 +39,7 @@ public class FileNode extends AbstractFsContentNode<File> {
         super(file, directoryBrowseMode);
 
         // set name, display name, and icon
-        if (file.getDirFlags() == (TskData.TSK_FS_NAME_FLAG_ENUM.TSK_FS_NAME_FLAG_UNALLOC.getDirFlag())) {
+        if (file.getDirFlag() == TSK_FS_NAME_FLAG_ENUM.UNALLOC) {
             this.setIconBaseWithExtension("org/sleuthkit/autopsy/images/file-icon-deleted.png");
         } else {
             this.setIconBaseWithExtension(getIconForFileType(file));
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/VirtualDirectoryNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/VirtualDirectoryNode.java
index 0cc76646ed..5e9ab5dc8c 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/VirtualDirectoryNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/VirtualDirectoryNode.java
@@ -23,7 +23,7 @@ import java.util.Map;
 import org.openide.nodes.Sheet;
 import org.sleuthkit.autopsy.datamodel.LayoutFileNode.LayoutContentPropertyType;
 import org.sleuthkit.datamodel.VirtualDirectory;
-import org.sleuthkit.datamodel.LayoutFile;
+import org.sleuthkit.datamodel.TskData;
 
 /**
  * Node for layout dir
@@ -83,8 +83,6 @@ public class VirtualDirectoryNode extends AbstractAbstractFileNode<VirtualDirect
     public boolean isLeafTypeNode() {
         return true;
     }
-    
-    
 
     //TODO consider extend AbstractFsContent node and use that
     //first need methods such as getDirType() to be pushed to AbstractFile class
@@ -97,9 +95,38 @@ public class VirtualDirectoryNode extends AbstractAbstractFileNode<VirtualDirect
         map.put(AbstractFsContentNode.FsContentPropertyType.CHANGED_TIME.toString(), ContentUtils.getStringTime(0, content));
         map.put(AbstractFsContentNode.FsContentPropertyType.ACCESS_TIME.toString(), ContentUtils.getStringTime(0, content));
         map.put(AbstractFsContentNode.FsContentPropertyType.CREATED_TIME.toString(), ContentUtils.getStringTime(0, content));
-        map.put(AbstractFsContentNode.FsContentPropertyType.FLAGS_DIR.toString(), content.getDirFlagsAsString());
-        map.put(AbstractFsContentNode.FsContentPropertyType.FLAGS_META.toString(), content.getMetaFlagsAsString());
-        map.put(AbstractFsContentNode.FsContentPropertyType.TYPE_DIR.toString(), content.getDirTypeAsString());
-        map.put(AbstractFsContentNode.FsContentPropertyType.TYPE_META.toString(), content.getMetaTypeAsString());
+        map.put(AbstractFsContentNode.FsContentPropertyType.FLAGS_DIR.toString(), content.getDirFlags().toString());
+        map.put(AbstractFsContentNode.FsContentPropertyType.FLAGS_META.toString(), metaFlagToString(content.getMetaFlags()));
+        map.put(AbstractFsContentNode.FsContentPropertyType.TYPE_DIR.toString(), content.getDirType().toString());
+        map.put(AbstractFsContentNode.FsContentPropertyType.TYPE_META.toString(), content.getMetaType().toString());
+    }
+    
+    /**
+     * Convert meta flag long to user-readable string / label
+     *
+     * @param metaFlag to convert
+     * @return string formatted meta flag representation
+     */
+    public static String metaFlagToString(short metaFlag) {
+
+        String result = "";
+
+        short allocFlag = TskData.TSK_FS_META_FLAG_ENUM.ALLOC.getValue();
+        short unallocFlag = TskData.TSK_FS_META_FLAG_ENUM.UNALLOC.getValue();
+
+        // some variables that might be needed in the future
+        //long usedFlag = TskData.TSK_FS_META_FLAG_ENUM.USED.getMetaFlag();
+        //long unusedFlag = TskData.TSK_FS_META_FLAG_ENUM.UNUSED.getMetaFlag();
+        //long compFlag = TskData.TSK_FS_META_FLAG_ENUM.COMP.getMetaFlag();
+        //long orphanFlag = TskData.TSK_FS_META_FLAG_ENUM.ORPHAN.getMetaFlag();
+
+        if ((metaFlag & allocFlag) == allocFlag) {
+            result = TskData.TSK_FS_META_FLAG_ENUM.ALLOC.toString();
+        }
+        if ((metaFlag & unallocFlag) == unallocFlag) {
+            result = TskData.TSK_FS_META_FLAG_ENUM.UNALLOC.toString();
+        }
+
+        return result;
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestScheduler.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestScheduler.java
index dffce2aa5d..482fdd9762 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestScheduler.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestScheduler.java
@@ -22,7 +22,6 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -42,15 +41,13 @@ import org.sleuthkit.datamodel.ContentVisitor;
 import org.sleuthkit.datamodel.Directory;
 import org.sleuthkit.datamodel.File;
 import org.sleuthkit.datamodel.FileSystem;
-import org.sleuthkit.datamodel.FsContent;
 import org.sleuthkit.datamodel.Image;
 import org.sleuthkit.datamodel.VirtualDirectory;
 import org.sleuthkit.datamodel.LayoutFile;
 import org.sleuthkit.datamodel.SleuthkitCase;
 import org.sleuthkit.datamodel.TskCoreException;
 import org.sleuthkit.datamodel.TskData;
-import org.sleuthkit.datamodel.Volume;
-import org.sleuthkit.datamodel.VolumeSystem;
+import org.sleuthkit.datamodel.TskData.TSK_FS_META_TYPE_ENUM;
 
 /**
  * Schedules images and files with their associated modules for ingest, and
@@ -745,8 +742,8 @@ class IngestScheduler {
                 queryB.append("SELECT COUNT(*) FROM tsk_files WHERE ( (fs_obj_id = ").append(fs.getId());
                 //queryB.append(") OR (fs_obj_id = NULL) )");
                 queryB.append(") )");
-                queryB.append(" AND ( (meta_type = ").append(TskData.TSK_FS_META_TYPE_ENUM.TSK_FS_META_TYPE_REG.getMetaType());
-                queryB.append(") OR (meta_type = ").append(TskData.TSK_FS_META_TYPE_ENUM.TSK_FS_META_TYPE_DIR.getMetaType());
+                queryB.append(" AND ( (meta_type = ").append(TSK_FS_META_TYPE_ENUM.TSK_FS_META_TYPE_REG.getValue());
+                queryB.append(") OR (meta_type = ").append(TSK_FS_META_TYPE_ENUM.TSK_FS_META_TYPE_DIR.getValue());
                 queryB.append(" AND (name != '.') AND (name != '..')");
                 queryB.append(") )");
 
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportBodyFile.java b/Core/src/org/sleuthkit/autopsy/report/ReportBodyFile.java
index 9d341d631b..ef29e36d7d 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportBodyFile.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportBodyFile.java
@@ -42,6 +42,7 @@ import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.ingest.IngestManager;
 import org.sleuthkit.datamodel.*;
+import org.sleuthkit.datamodel.TskData.TSK_FS_META_MODE_ENUM;
 
 /**
  * ReportBodyFile generates a report in the body file format specified on
@@ -122,8 +123,9 @@ public class ReportBodyFile implements ReportModule {
                     out.write("|");
                     out.write(Long.toString(file.getMetaAddr()));
                     out.write("|");
-                    if(file.getModeAsString()!=null) {
-                        out.write(file.getModeAsString());
+                    String modeString = TSK_FS_META_MODE_ENUM.toString(file.getModes(), file.getMetaType());
+                    if(modeString != null) {
+                        out.write(modeString);
                     }
                     out.write("|");
                     out.write(Long.toString(file.getUid()));