coreapi unixfs: gw handler cleanup

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>

core/coreapi/coreapi.go

@@ -91,4 +91,4 @@ func (api *CoreAPI) PubSub() coreiface.PubSubAPI {
 func (api *CoreAPI) getSession(ctx context.Context) *CoreAPI {
 	ng := dag.NewReadOnlyDagService(dag.NewSession(ctx, api.dag))
 	return &CoreAPI{api.node, ng}
-}
\ No newline at end of file
+}

core/corehttp/gateway_handler.go

@@ -179,18 +179,16 @@ func (i *gatewayHandler) getOrHeadHandler(ctx context.Context, w http.ResponseWr
 	}
 
 	dr, err := i.api.Unixfs().Get(ctx, resolvedPath)
-	dir := false
-	switch {
-	case err == nil:
-		dir = dr.IsDirectory()
-		if !dir {
-			defer dr.Close()
-		}
-	default:
+	if err != nil {
 		webError(w, "ipfs cat "+escapedURLPath, err, http.StatusNotFound)
 		return
 	}
 
+	dir := dr.IsDirectory()
+	if !dir {
+		defer dr.Close()
+	}
+
 	// Check etag send back to us
 	etag := "\"" + resolvedPath.Cid().String() + "\""
 	if r.Header.Get("If-None-Match") == etag || r.Header.Get("If-None-Match") == "W/"+etag {