add hotfix to convert in v1.0.19

cfi2017 · May 9, 2020 · 7786406 · 7786406
1 parent 218340f
commit 7786406
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/internal/server/convert.go b/internal/server/convert.go
@@ -29,13 +29,6 @@ func convertItem(c *gin.Context) {
 	}
 	request.Base64 = strings.TrimSpace(request.Base64)
 	bs, err := base64.StdEncoding.DecodeString(request.Base64)
-	if err != nil {
-		log.Println(err)
-		c.AbortWithStatusJSON(500, err)
-		return
-	}
-	var dmi item.DigitalMarineItem
-	err = json.Unmarshal(bs, &dmi)
 	if err != nil {
 		// try extracting bl3 codes
 		codes, err := extractBL3Codes(request.Base64)
@@ -64,6 +57,13 @@ func convertItem(c *gin.Context) {
 		c.JSON(200, &items)
 		return
 	}
+	var dmi item.DigitalMarineItem
+	err = json.Unmarshal(bs, &dmi)
+	if err != nil {
+		log.Println(err)
+		c.AbortWithStatusJSON(500, err)
+		return
+	}
 	i := item.DmToGibbed(dmi)
 	bs, err = item.Serialize(i, 0) // encrypt with 0 seed
 	if err != nil {