Added functionality to parse HFS+ dates.

unsound · Nov 4, 2006 · 79af432 · 79af432
1 parent ba58dec
commit 79af432
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 12 deletions.
diff --git a/src/FileSystemBrowserWindow.java b/src/FileSystemBrowserWindow.java
@@ -444,15 +444,15 @@ public void populateTable(HFSPlusCatalogLeafRecord[] contents) {
 		currentRow.add(new RecordContainer(rec));
 		currentRow.add(catFile.getDataFork().getLogicalSize() + " B");
 		currentRow.add("File");
-		currentRow.add("" + catFile.getContentModDate());
+		currentRow.add("" + catFile.getContentModDateAsDate());
 	    }
 	    else if(recData.getRecordType() == HFSPlusCatalogLeafRecordData.RECORD_TYPE_FOLDER &&
 		    recData instanceof HFSPlusCatalogFolder) {
 		HFSPlusCatalogFolder catFolder = (HFSPlusCatalogFolder)recData;
 		currentRow.add(new RecordContainer(rec));
 		currentRow.add("");
 		currentRow.add("Folder");
-		currentRow.add("" + catFolder.getContentModDate());
+		currentRow.add("" + catFolder.getContentModDateAsDate());
 	    }
 	    else if(recData.getRecordType() == HFSPlusCatalogLeafRecordData.RECORD_TYPE_FOLDER_THREAD &&
 		    recData instanceof HFSPlusCatalogThread) {

diff --git a/src/HFSPlusCatalogFile.java b/src/HFSPlusCatalogFile.java
@@ -1,4 +1,5 @@
 import java.io.PrintStream;
+import java.util.Date;
 
 /** This class was generated by CStructToJavaClass. */
 public class HFSPlusCatalogFile extends HFSPlusCatalogLeafRecordData {
@@ -82,17 +83,23 @@ public HFSPlusCatalogFile(byte[] data, int offset) {
     public HFSPlusForkData getDataFork() { return dataFork; }
     public HFSPlusForkData getResourceFork() { return resourceFork; }
 
+    public Date getCreateDateAsDate() { return HFSPlusDate.toDate(getCreateDate()); }
+    public Date getContentModDateAsDate() { return HFSPlusDate.toDate(getContentModDate()); }
+    public Date getAttributeModDateAsDate() { return HFSPlusDate.toDate(getAttributeModDate()); }
+    public Date getAccessDateAsDate() { return HFSPlusDate.toDate(getAccessDate()); }
+    public Date getBackupDateAsDate() { return HFSPlusDate.toDate(getBackupDate()); }
+
     public void printFields(PrintStream ps, String prefix) {
 	ps.println(prefix + " recordType: " + getRecordType());
 	ps.println(prefix + " flags: " + getFlags());
 	ps.println(prefix + " reserved1: " + getReserved1());
 	ps.println(prefix + " fileID: ");
 	getFileID().print(ps, prefix+"  ");
-	ps.println(prefix + " createDate: " + getCreateDate());
-	ps.println(prefix + " contentModDate: " + getContentModDate());
-	ps.println(prefix + " attributeModDate: " + getAttributeModDate());
-	ps.println(prefix + " accessDate: " + getAccessDate());
-	ps.println(prefix + " backupDate: " + getBackupDate());
+	ps.println(prefix + " createDate: " + getCreateDateAsDate());
+	ps.println(prefix + " contentModDate: " + getContentModDateAsDate());
+	ps.println(prefix + " attributeModDate: " + getAttributeModDateAsDate());
+	ps.println(prefix + " accessDate: " + getAccessDateAsDate());
+	ps.println(prefix + " backupDate: " + getBackupDateAsDate());
 	ps.println(prefix + " permissions: ");
 	getPermissions().print(ps, prefix+"  ");
 	ps.println(prefix + " userInfo: ");

diff --git a/src/HFSPlusCatalogFolder.java b/src/HFSPlusCatalogFolder.java
@@ -1,4 +1,5 @@
 import java.io.PrintStream;
+import java.util.Date;
 
 /** This class was generated by CStructToJavaClass. */
 public class HFSPlusCatalogFolder extends HFSPlusCatalogLeafRecordData {
@@ -74,17 +75,23 @@ public HFSPlusCatalogFolder(byte[] data, int offset) {
     public int getTextEncoding() { return Util.readIntBE(textEncoding); }
     public int getReserved() { return Util.readIntBE(reserved); }
 
+    public Date getCreateDateAsDate() { return HFSPlusDate.toDate(getCreateDate()); }
+    public Date getContentModDateAsDate() { return HFSPlusDate.toDate(getContentModDate()); }
+    public Date getAttributeModDateAsDate() { return HFSPlusDate.toDate(getAttributeModDate()); }
+    public Date getAccessDateAsDate() { return HFSPlusDate.toDate(getAccessDate()); }
+    public Date getBackupDateAsDate() { return HFSPlusDate.toDate(getBackupDate()); }
+
     public void printFields(PrintStream ps, String prefix) {
 	ps.println(prefix + " recordType: " + getRecordType());
 	ps.println(prefix + " flags: " + getFlags());
 	ps.println(prefix + " valence: " + getValence());
 	ps.println(prefix + " folderID: ");
 	getFolderID().print(ps, prefix+"  ");
-	ps.println(prefix + " createDate: " + getCreateDate());
-	ps.println(prefix + " contentModDate: " + getContentModDate());
-	ps.println(prefix + " attributeModDate: " + getAttributeModDate());
-	ps.println(prefix + " accessDate: " + getAccessDate());
-	ps.println(prefix + " backupDate: " + getBackupDate());
+	ps.println(prefix + " createDate: " + getCreateDateAsDate());
+	ps.println(prefix + " contentModDate: " + getContentModDateAsDate());
+	ps.println(prefix + " attributeModDate: " + getAttributeModDateAsDate());
+	ps.println(prefix + " accessDate: " + getAccessDateAsDate());
+	ps.println(prefix + " backupDate: " + getBackupDateAsDate());
 	ps.println(prefix + " permissions: ");
 	getPermissions().print(ps, prefix+"  ");
 	ps.println(prefix + " userInfo: ");

diff --git a/src/HFSPlusDate.java b/src/HFSPlusDate.java
@@ -0,0 +1,16 @@
+import java.util.Date;
+
+/** In the future, this should wrap a 32 bit HFS+ date. */
+
+public class HFSPlusDate {
+    /** 
+     * Pre-calculated. This is the amount of milliseconds between 01-01-1904 00:00:00.0000
+     * (HFS+ starting date) and 01-01-1970 00:00:00.0000 (the start of the java "epoch").
+     */
+    public static final long DIFF_TO_JAVA_DATE_IN_MILLIS = 2082844800000L;
+
+    /** Converts a HFS+ date to a Java Date. */
+    public static Date toDate(int hfsPlusTimestamp) {
+	return new Date(Util2.unsign(hfsPlusTimestamp)*1000 - DIFF_TO_JAVA_DATE_IN_MILLIS);
+    }
+}