forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-27 07:06:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cmd/swarm, swarm/api: Fix broken up cmd due to #3742

Browse source 
Added mimetype hint input to new uploadfile function
This commit is contained in:
nolash 2017-04-05 19:50:11 +02:00
parent 4cfa5127ae
commit a1a2584825
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
swarm/api/client/client.go
View file

@ -94,13 +94,13 @@ func (c *Client) UploadFile(file string, fi os.FileInfo, mimetype_hint string) (
hash, err := c.uploadFileContent(file, fi) hash, err := c.uploadFileContent(file, fi)
if mimetype_hint != "" { if mimetype_hint != "" {
mimetype = mimetype_hint mimetype = mimetype_hint
log.Info("Mime type set by override", "mime", mimetype) log.Info("Mime type set by override", "mime", mimetype)
} else { } else {
ext := filepath.Ext(file) ext := filepath.Ext(file)
log.Info("Ext" , "ext", ext, "file", file) log.Info("Ext", "ext", ext, "file", file)
if ext != "" { if ext != "" {
mimetype = mime.TypeByExtension(filepath.Ext(fi.Name())) 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 { } else {
f, err := os.Open(file) f, err := os.Open(file)
if err == nil { if err == nil {
@ -108,12 +108,12 @@ func (c *Client) UploadFile(file string, fi os.FileInfo, mimetype_hint string) (
fread, _ := f.ReadAt(first512, 0) fread, _ := f.ReadAt(first512, 0)
if fread > 0 { if fread > 0 {
mimetype = http.DetectContentType(first512[:fread]) 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() f.Close()
} }
} }
m := ManifestEntry{ m := ManifestEntry{
Hash: hash, Hash: hash,