Merge pull request #5 from BenB196/staging

Merge in stage and update to v0.0.4
BenB196 · Sep 14, 2019 · 339966e · 339966e
2 parents b2d3de1 + bf7c53e
commit 339966e
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -100,8 +100,8 @@ Returns:
 FileEvent
     EventId                     string	
     EventType                   string	
-    EventTimestamp              time.Time       (potentially empty)
-    InsertionTimestamp          time.Time       (potentially empty)
+    EventTimestamp              *time.Time      (potentially empty)
+    InsertionTimestamp          *time.Time      (potentially empty)
     FilePath                    string          (potentially empty)
     FileName                    string
     FileType                    string          (potentially empty)
@@ -110,8 +110,8 @@ FileEvent
     FileOwner                   []string        (potentially empty)
     Md5Checksum                 string	        (potentially empty)
     Sha256Checksum              string	        (potentially empty)
-    CreatedTimestamp            time.Time       (potentially empty)
-    ModifyTimestamp             time.Time       (potentially empty)
+    CreatedTimestamp            *time.Time      (potentially empty)
+    ModifyTimestamp             *time.Time      (potentially empty)
     DeviceUsername              string          (potentially empty)
     DeviceUid                   string          (potentially empty)
     UserUid                     string          (potentially empty)

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.0.3
+0.0.4
diff --git a/ffs.go b/ffs.go
@@ -19,8 +19,8 @@ import (
 type FileEvent struct {
 	EventId						string			`json:"eventId"`
 	EventType					string			`json:"eventType"`
-	EventTimestamp				time.Time		`json:"eventTimestamp,omitempty"`
-	InsertionTimestamp			time.Time		`json:"insertionTimestamp,omitempty"`
+	EventTimestamp				*time.Time		`json:"eventTimestamp,omitempty"`
+	InsertionTimestamp			*time.Time		`json:"insertionTimestamp,omitempty"`
 	FilePath					string			`json:"filePath,omitempty"`
 	FileName					string			`json:"fileName"`
 	FileType					string			`json:"fileType,omitempty"`
@@ -29,8 +29,8 @@ type FileEvent struct {
 	FileOwner					[]string		`json:"fileOwner,omitempty"`  //Array of owners
 	Md5Checksum					string			`json:"md5Checksum,omitempty"`
 	Sha256Checksum				string			`json:"sha256Checksum,omitempty"`
-	CreatedTimestamp			time.Time		`json:"createdTimestamp,omitempty"`
-	ModifyTimestamp				time.Time		`json:"modifyTimestamp,omitempty"`
+	CreatedTimestamp			*time.Time		`json:"createdTimestamp,omitempty"`
+	ModifyTimestamp				*time.Time		`json:"modifyTimestamp,omitempty"`
 	DeviceUsername				string			`json:"deviceUsername,omitempty"`
 	DeviceUid					string			`json:"deviceUid,omitempty"`
 	UserUid						string			`json:"userUid,omitempty"`
@@ -327,8 +327,8 @@ func csvLineToFileEvent(csvLine []string) FileEvent {
 	fileEvent = FileEvent{
 		EventId:                    eventId,
 		EventType:                  eventType,
-		EventTimestamp:             eventTimeStamp,
-		InsertionTimestamp:         insertionTimestamp,
+		EventTimestamp:             &eventTimeStamp,
+		InsertionTimestamp:         &insertionTimestamp,
 		FilePath:                   filePath,
 		FileName:                   fileName,
 		FileType:                   fileType,
@@ -337,8 +337,8 @@ func csvLineToFileEvent(csvLine []string) FileEvent {
 		FileOwner:                  fileOwner,
 		Md5Checksum:                md5Checksum,
 		Sha256Checksum:             sha256Checksum,
-		CreatedTimestamp:           createdTimestamp,
-		ModifyTimestamp:            modifyTimestamp,
+		CreatedTimestamp:           &createdTimestamp,
+		ModifyTimestamp:            &modifyTimestamp,
 		DeviceUsername:             deviceUserName,
 		DeviceUid:                  deviceUid,
 		UserUid:                    userUid,
@@ -366,6 +366,22 @@ func csvLineToFileEvent(csvLine []string) FileEvent {
 		RemovableMediaBusType:      removableMediaBusType,
 		SyncDestination:            syncDestination,
 	}
+
+	if eventTimestampString == "" {
+		fileEvent.EventTimestamp = nil
+	}
+
+	if insertionTimestampString == "" {
+		fileEvent.InsertionTimestamp = nil
+	}
+
+	if createdTimestampString == "" {
+		fileEvent.CreatedTimestamp = nil
+	}
+
+	if modifyTimestampString == "" {
+		fileEvent.ModifyTimestamp = nil
+	}
 
 	return fileEvent
 }