fix(fsi): Cleanup error handling and some if statements

qri-io · Aug 15, 2019 · 2feb0ab · 2feb0ab
1 parent 29606ea
commit 2feb0ab
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 32 deletions.
diff --git a/api/datasets.go b/api/datasets.go
@@ -306,11 +306,11 @@ func (h *DatasetHandlers) getHandler(w http.ResponseWriter, r *http.Request) {
 	}
 	res := lib.GetResult{}
 	err := h.Get(&p, &res)
-	if err == repo.ErrNoHistory {
-		NoHistoryErrResponse(w)
-		return
-	}
 	if err != nil {
+		if err == repo.ErrNoHistory {
+			NoHistoryErrResponse(w)
+			return
+		}
 		util.WriteErrResponse(w, http.StatusInternalServerError, err)
 		return
 	}
@@ -619,12 +619,11 @@ func (h DatasetHandlers) bodyHandler(w http.ResponseWriter, r *http.Request) {
 	}
 
 	result := &lib.GetResult{}
-	err = h.Get(p, result)
-	if err == repo.ErrNoHistory {
-		NoHistoryErrResponse(w)
-		return
-	}
-	if err != nil {
+	if err := h.Get(p, result); err != nil {
+		if err == repo.ErrNoHistory {
+			NoHistoryErrResponse(w)
+			return
+		}
 		util.WriteErrResponse(w, http.StatusInternalServerError, err)
 		return
 	}

diff --git a/api/fsi.go b/api/fsi.go
@@ -56,27 +56,28 @@ func (h *FSIHandlers) statusHandler(routePrefix string) http.HandlerFunc {
 		}
 
 		res := []lib.StatusItem{}
-		if !useFSI {
-			refStr := ref.String()
-			err = h.StatusAtVersion(&refStr, &res)
-			if err == repo.ErrNoHistory {
-				NoHistoryErrResponse(w)
-				return
-			}
-			if err != nil {
-				util.WriteErrResponse(w, http.StatusInternalServerError, fmt.Errorf("error getting status: %s", err.Error()))
-				return
-			}
-		} else {
+		if useFSI {
 			alias := ref.AliasString()
 			err := h.StatusForAlias(&alias, &res)
 			// Won't return ErrNoHistory.
 			if err != nil {
 				util.WriteErrResponse(w, http.StatusInternalServerError, fmt.Errorf("error getting status: %s", err.Error()))
 				return
 			}
+			util.WriteResponse(w, res)
+			return
 		}
 
+		refStr := ref.String()
+		err = h.StatusAtVersion(&refStr, &res)
+		if err != nil {
+			if err == repo.ErrNoHistory {
+				NoHistoryErrResponse(w)
+				return
+			}
+			util.WriteErrResponse(w, http.StatusInternalServerError, fmt.Errorf("error getting status: %s", err.Error()))
+			return
+		}
 		util.WriteResponse(w, res)
 	}
 }

diff --git a/api/log.go b/api/log.go
@@ -55,12 +55,11 @@ func (h *LogHandlers) logHandler(w http.ResponseWriter, r *http.Request) {
 	}
 
 	res := []repo.DatasetRef{}
-	err = h.Log(params, &res)
-	if err == repo.ErrNoHistory {
-		NoHistoryErrResponse(w)
-		return
-	}
-	if err != nil {
+	if err := h.Log(params, &res); err != nil {
+		if err == repo.ErrNoHistory {
+			NoHistoryErrResponse(w)
+			return
+		}
 		util.WriteErrResponse(w, http.StatusInternalServerError, err)
 		return
 	}

diff --git a/api/root.go b/api/root.go
@@ -56,11 +56,11 @@ func (mh *RootHandler) Handler(w http.ResponseWriter, r *http.Request) {
 	}
 	res := lib.GetResult{}
 	err := mh.dsh.Get(&p, &res)
-	if err == repo.ErrNotFound {
-		util.NotFoundHandler(w, r)
-		return
-	}
 	if err != nil {
+		if err == repo.ErrNotFound {
+			util.NotFoundHandler(w, r)
+			return
+		}
 		util.WriteErrResponse(w, http.StatusInternalServerError, err)
 		return
 	}