Merge pull request #127 from BenB196/staging

Fixed issue where file.mime_type could be duplicate values
BenB196 · Feb 6, 2021 · 8e35fb3 · 8e35fb3
2 parents a5472d5 + 0b59108
commit 8e35fb3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.5.2
+0.5.3
diff --git a/ffsEvent/ffsFetcher.go b/ffsEvent/ffsFetcher.go
@@ -232,6 +232,13 @@ func queryFetcher(query config.FFSQuery, inProgressQueries *[]eventOutput.InProg
 						fileType = "symlink"
 					}
 
+					var mimeType []string
+					if ffsEvent.MimeTypeByBytes != ffsEvent.MimeTypeByExtension {
+						mimeType = []string{ffsEvent.MimeTypeByBytes, ffsEvent.MimeTypeByExtension}
+					} else {
+						mimeType = []string{ffsEvent.MimeTypeByBytes}
+					}
+
 					file := &eventOutput.File{
 						Path:      ffsEvent.FilePath,
 						Name:      ffsEvent.FileName,
@@ -243,7 +250,7 @@ func queryFetcher(query config.FFSQuery, inProgressQueries *[]eventOutput.InProg
 						Created:   createTimestamp,
 						Mtime:     modifyTimestamp,
 						Directory: ffsEvent.DirectoryId,
-						MimeType:  []string{ffsEvent.MimeTypeByBytes, ffsEvent.MimeTypeByExtension},
+						MimeType:  mimeType,
 					}
 
 					//user fields