Merge pull request #207 from OpenFactorioServerManager/fix-Compatibility

Update dependency compatibility check

Author: knoxfighter

src/factorio/mod_modInfo.go

@@ -110,11 +110,10 @@ func (modInfoList *ModInfoList) listInstalledMods() error {
 
 			server := GetFactorioServer()
 
-			if !base.Equals(NilVersion) {
+			// check both the factorio-version and the base mod dependency
+			modInfo.Compatibility = server.Version.GreaterC(modInfo.FactorioVersion)
+			if modInfo.Compatibility && !base.Equals(NilVersion) {
 				modInfo.Compatibility = server.Version.Compatible(base, op)
-			} else {
-				log.Println("error finding basemodDependency. Using FactorioVersion...")
-				modInfo.Compatibility = server.Version.GreaterC(modInfo.FactorioVersion)
 			}
 
 			modInfoList.Mods = append(modInfoList.Mods, modInfo)

src/factorio/version.go

@@ -73,9 +73,8 @@ func (v *Version) GreaterC(b Version) bool {
 	return (v[0] == b[0] && v[1] == b[1] && (v[2] > b[2] || (v[2] == b[2] && v[3] > b[3]))) || (v[0] == 1 && b[0] == 0 && v[1] == 0 && b[1] == 18)
 }
 
-func (v Version) ge(b Version) bool  { return v.Equals(b) || v.Greater(b) }
-func (v Version) geC(b Version) bool { return v.Equals(b) || v.GreaterC(b) }
-func (v Version) le(b Version) bool  { return v.Equals(b) || v.Less(b) }
+func (v Version) ge(b Version) bool { return v.Equals(b) || v.Greater(b) }
+func (v Version) le(b Version) bool { return v.Equals(b) || v.Less(b) }
 
 // Compatible returns true if the comparison between the two version operands is valid.
 // Supported ops are: ==, !=, >, <, >=, <=
@@ -86,11 +85,11 @@ func (v Version) Compatible(b Version, op string) bool {
 	case "!=":
 		return !v.Equals(b)
 	case ">":
-		return v.GreaterC(b)
+		return v.Greater(b)
 	case "<":
 		return v.Less(b)
 	case ">=":
-		return v.geC(b)
+		return v.ge(b)
 	case "<=":
 		return v.le(b)
 	default: