fs: Use mimedb now.

pkg/fs/fs-multipart.go

@@ -38,8 +38,8 @@ import (
 	"github.com/minio/minio-xl/pkg/crypto/sha256"
 	"github.com/minio/minio-xl/pkg/crypto/sha512"
 	"github.com/minio/minio-xl/pkg/probe"
-	"github.com/minio/minio/pkg/contentdb"
 	"github.com/minio/minio/pkg/disk"
+	"github.com/minio/minio/pkg/mimedb"
 )
 
 // isValidUploadID - is upload id.
@@ -507,7 +507,10 @@ func (fs Filesystem) CompleteMultipartUpload(bucket, object, uploadID string, da
 	}
 	contentType := "application/octet-stream"
 	if objectExt := filepath.Ext(objectPath); objectExt != "" {
-		contentType = contentdb.MustLookup(strings.ToLower(strings.TrimPrefix(objectExt, ".")))
+		content, ok := mimedb.DB[strings.ToLower(strings.TrimPrefix(objectExt, "."))]
+		if ok {
+			contentType = content.ContentType
+		}
 	}
 	newObject := ObjectMetadata{
 		Bucket:      bucket,

pkg/fs/fs-object.go

@@ -31,9 +31,9 @@ import (
 	"github.com/minio/minio-xl/pkg/atomic"
 	"github.com/minio/minio-xl/pkg/crypto/sha256"
 	"github.com/minio/minio-xl/pkg/probe"
-	"github.com/minio/minio/pkg/contentdb"
 	"github.com/minio/minio/pkg/disk"
 	"github.com/minio/minio/pkg/ioutils"
+	"github.com/minio/minio/pkg/mimedb"
 )
 
 /// Object Operations
@@ -155,8 +155,12 @@ func getMetadata(rootPath, bucket, object string) (ObjectMetadata, *probe.Error)
 	if runtime.GOOS == "windows" {
 		object = sanitizeWindowsPath(object)
 	}
+
 	if objectExt := filepath.Ext(object); objectExt != "" {
-		contentType = contentdb.MustLookup(strings.ToLower(strings.TrimPrefix(objectExt, ".")))
+		content, ok := mimedb.DB[strings.ToLower(strings.TrimPrefix(objectExt, "."))]
+		if ok {
+			contentType = content.ContentType
+		}
 	}
 	metadata := ObjectMetadata{
 		Bucket:      bucket,
@@ -293,7 +297,10 @@ func (fs Filesystem) CreateObject(bucket, object, expectedMD5Sum string, size in
 	}
 	contentType := "application/octet-stream"
 	if objectExt := filepath.Ext(objectPath); objectExt != "" {
-		contentType = contentdb.MustLookup(strings.ToLower(strings.TrimPrefix(objectExt, ".")))
+		content, ok := mimedb.DB[strings.ToLower(strings.TrimPrefix(objectExt, "."))]
+		if ok {
+			contentType = content.ContentType
+		}
 	}
 	newObject := ObjectMetadata{
 		Bucket:      bucket,

pkg/fs/fs.go

@@ -23,7 +23,6 @@ import (
 	"time"
 
 	"github.com/minio/minio-xl/pkg/probe"
-	"github.com/minio/minio/pkg/contentdb"
 )
 
 // Filesystem - local variables
@@ -81,11 +80,6 @@ func New(rootPath string, minFreeDisk int64, maxBuckets int) (Filesystem, *probe
 		}
 	}
 
-	// Initialize contentdb.
-	if e := contentdb.Init(); e != nil {
-		return Filesystem{}, probe.NewError(e)
-	}
-
 	var buckets *Buckets
 	buckets, err = loadBucketsMetadata()
 	if err != nil {