tried to update to read older saves && fixed error messages

Author: knoxfighter

src/mods_handler.go

@@ -575,15 +575,15 @@ func LoadModsFromSaveHandler(w http.ResponseWriter, r *http.Request) {
 	resp.Data, err = factorioSave.ReadHeader(SaveFileComplete)
 
 	if err == factorioSave.ErrorIncompatible {
-		w.WriteHeader(500)
-		resp.Data = fmt.Sprintf("%s", err)
+		w.WriteHeader(http.StatusInternalServerError)
+		resp.Data = fmt.Sprintf("%s<br>Only can read 0.16.x save files", err)
 		if err := json.NewEncoder(w).Encode(resp); err != nil {
 			log.Printf("Error in loadModsFromSave: %s", err)
 		}
 		return
 	}
 	if err != nil {
-		w.WriteHeader(500)
+		w.WriteHeader(http.StatusInternalServerError)
 		resp.Data = fmt.Sprintf("Error in searchModPortal: %s", err)
 		if err := json.NewEncoder(w).Encode(resp); err != nil {
 			log.Printf("Error in loadModsFromSave: %s", err)

src/vendor/factorioSave/factorioSave.go

@@ -49,10 +49,9 @@ type singleMod struct {
 }
 
 var ErrorIncompatible = errors.New("incompatible save")
-
+var data Header
 
 func ReadHeader(filePath string) (Header, error) {
-	var data Header
 	var err error
 
 	datFile, err := openSave(filePath)
@@ -140,11 +139,19 @@ func ReadHeader(filePath string) (Header, error) {
 		return data, err
 	}
 
-	data.AllowNonAdminDebugOptions, err = readBool(datFile)
+	Constraint, _ = semver.NewConstraint(">= 0.16.0")
+	Used, err := data.FactorioVersion.CheckCompatibility(Constraint)
 	if err != nil {
-		log.Printf("Couldn't read allow_non_admin_debug_options: %s", err)
+		log.Printf("Error checking if used: %s", err)
 		return data, err
 	}
+	if Used {
+		data.AllowNonAdminDebugOptions, err = readBool(datFile)
+		if err != nil {
+			log.Printf("Couldn't read allow_non_admin_debug_options: %s", err)
+			return data, err
+		}
+	}
 
 	data.LoadedFrom, err = readVersionShort8(datFile)
 	if err != nil {
@@ -180,6 +187,7 @@ func ReadHeader(filePath string) (Header, error) {
 		data.Mods = append(data.Mods, SingleMod)
 	}
 
+	log.Println(data)
 	return data, nil
 }
 
@@ -343,11 +351,19 @@ func readSingleMod(file io.ReadCloser) (singleMod, error) {
 		return Mod, err
 	}
 
-	Mod.CRC, err = readUint32(file)
+	Constraint, _ := semver.NewConstraint("> 0.15.0")
+	Used, err := data.FactorioVersion.CheckCompatibility(Constraint)
 	if err != nil {
-		log.Printf("error loading CRC: %s", err)
+		log.Printf("Error checking used of CRC: %s", err)
 		return Mod, err
 	}
+	if Used {
+		Mod.CRC, err = readUint32(file)
+		if err != nil {
+			log.Printf("error loading CRC: %s", err)
+			return Mod, err
+		}
+	}
 
 	return Mod, err
 }

ui/App/components/Mods/ModLoadSave.jsx

@@ -80,10 +80,9 @@ class ModLoadSave extends React.Component {
                 }, this.loadModsSwalHandler);
             },
             error: (jqXHR) => {
-                let json_data = JSON.parse(jqXHR.responseJSON.data);
-
                 swal({
-                    title: json_data.detail,
+                    title: jqXHR.responseJSON.data,
+                    html: true,
                     type: "error",
                 });
             }