From a1a2584825487b18c16a5becd5debb18902c7d58 Mon Sep 17 00:00:00 2001 From: nolash Date: Wed, 5 Apr 2017 19:50:11 +0200 Subject: [PATCH] cmd/swarm, swarm/api: Fix broken up cmd due to #3742 Added mimetype hint input to new uploadfile function --- swarm/api/client/client.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/swarm/api/client/client.go b/swarm/api/client/client.go index b3991529be..ef5335be36 100644 --- a/swarm/api/client/client.go +++ b/swarm/api/client/client.go @@ -94,13 +94,13 @@ func (c *Client) UploadFile(file string, fi os.FileInfo, mimetype_hint string) ( hash, err := c.uploadFileContent(file, fi) if mimetype_hint != "" { mimetype = mimetype_hint - log.Info("Mime type set by override", "mime", mimetype) + log.Info("Mime type set by override", "mime", mimetype) } else { ext := filepath.Ext(file) - log.Info("Ext" , "ext", ext, "file", file) - if ext != "" { + log.Info("Ext", "ext", ext, "file", file) + if ext != "" { mimetype = mime.TypeByExtension(filepath.Ext(fi.Name())) - log.Info("Mime type set by fileextension", "mime", mimetype, "ext", filepath.Ext(file)) + log.Info("Mime type set by fileextension", "mime", mimetype, "ext", filepath.Ext(file)) } else { f, err := os.Open(file) if err == nil { @@ -108,12 +108,12 @@ func (c *Client) UploadFile(file string, fi os.FileInfo, mimetype_hint string) ( fread, _ := f.ReadAt(first512, 0) if fread > 0 { mimetype = http.DetectContentType(first512[:fread]) - log.Info("Mime type set by autodetection", "mime", mimetype) + log.Info("Mime type set by autodetection", "mime", mimetype) } } f.Close() } - + } m := ManifestEntry{ Hash: hash,