[chronojump] Version comparison much better in new Version31 class

[Xavier de Blas <xaviblas src gnome org>]

commit 07de65337e474986915c2c40d216ab6d375579ab
Author: Xavier de Blas <xaviblas gmail com>
Date:   Thu Mar 15 21:57:56 2018 +0100

    Version comparison much better in new Version31 class

 src/Makefile.am       |    1 +
 src/constants.cs      |    3 +
 src/gui/chronojump.cs |    1 +
 src/json.cs           |   10 +--
 src/version31.cs      |  174 +++++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 183 insertions(+), 6 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index baa8a73..50163f6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -209,6 +209,7 @@ SOURCES = \
        chronopicRegister.cs\
        chronojumpImporter.cs\
        executeProcess.cs\
+       version31.cs\
        oldCodeNeedToDBConvert/person.cs\
        oldCodeNeedToDBConvert/personSession.cs\
        oldCodeNeedToDBConvert/sqlite/person.cs\
diff --git a/src/constants.cs b/src/constants.cs
index 3b654ac..b675140 100644
--- a/src/constants.cs
+++ b/src/constants.cs
@@ -248,6 +248,9 @@ public class Constants
        public static string TakeOffName = "TakeOff"; //translate (take off?)
        public static string TakeOffWeightName = "TakeOffWeight"; //translate (take off?)
 
+       public static string SoftwareUpdated = Catalog.GetString("Your software is updated!");
+       public static string SoftwareNeedUpdate = Catalog.GetString("Update software at ") + 
"www.chronojump.org";
+       public static string SoftwareNewerThanPublised = "Your software is more updated than last published 
version.\n\nPlease, don't Update!";
 
        public static string GetSpreadsheetString(string CSVExportDecimalSeparator)
        {
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index e7250f8..033e320 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -739,6 +739,7 @@ public partial class ChronoJumpWindow
                ls.Test();
                LogB.Information(string.Format("coef = {0} {1} {2}", ls.Coef[0], ls.Coef[1], ls.Coef[2]));
                */
+               //new VersionCompareTests();
        }
 
 
diff --git a/src/json.cs b/src/json.cs
index 39ca89a..f2c1b4a 100644
--- a/src/json.cs
+++ b/src/json.cs
@@ -187,13 +187,11 @@ public class Json
                string str =
                        Catalog.GetString("Installed version is: ") + currentVersion + "\n" + 
                        Catalog.GetString("Last version published: ") + lastVersionPublished;
-                       // + updateStr;
-                       //TODO: add updateStr again when resolved that a experimental 1.7.0-xxx is more 
advanced than a stable 1.7.0
 
-               if(currentVersion == lastVersionPublished)
-                       str += "\n\n" + Catalog.GetString("Your software is updated!");
-               else
-                       str += "\n\n" + Catalog.GetString("Update software at ") + "www.chronojump.org";
+               VersionCompare vCompare = new VersionCompare(
+                               new Version31(currentVersion),
+                               new Version31(lastVersionPublished));
+               str += "\n\n" + vCompare.ResultStr;
 
                this.ResultMessage = str;
                
diff --git a/src/version31.cs b/src/version31.cs
new file mode 100644
index 0000000..c3e215e
--- /dev/null
+++ b/src/version31.cs
@@ -0,0 +1,174 @@
+/*
+ * This file is part of ChronoJump
+ *
+ * ChronoJump is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or   
+ *    (at your option) any later version.
+ *    
+ * ChronoJump is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ *    GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Copyright (C) 2018 Xavier de Blas
+ */
+
+using System;
+using System.Text;
+
+
+//Version 31 format with 3 values and possible a commit num like:
+//1.8.0-70-kfjsdfjsl
+public class Version31
+{
+       public int Major;
+       public int Medium;
+       public int Minor;
+       public int Commit;
+       private string versionStr;
+
+       public Version31 (string versionStr)
+       {
+               this.versionStr = versionStr;
+
+               Major = -1;
+               Medium = -1;
+               Minor = -1;
+               Commit = -1;
+
+               parseVersionString();
+       }
+
+       public override string ToString()
+       {
+               return string.Format("Major: {0}, Medium: {1}, Minor: {2}, Commit: {3}",
+                               Major, Medium, Minor, Commit);
+       }
+
+       private void parseVersionString()
+       {
+               string [] vFull = versionStr.Split(new char[] {'-'});
+               if(vFull.Length > 1)
+               {
+                       Commit = assignIfIsNumber(vFull[1]);
+                       parseVersionNumbers(vFull[0]);
+               } else
+                       parseVersionNumbers(versionStr);
+       }
+
+       private void parseVersionNumbers(string versionNumStr)
+       {
+               string [] vFull = versionNumStr.Split(new char[] {'.'});
+               if(vFull.Length == 3)
+               {
+                       Major = assignIfIsNumber(vFull[0]);
+                       Medium = assignIfIsNumber(vFull[1]);
+                       Minor = assignIfIsNumber(vFull[2]);
+               }
+       }
+
+       private int assignIfIsNumber(string str)
+       {
+               if(Util.IsNumber(str, false))
+                       return Convert.ToInt32(str);
+
+               return -1;
+       }
+
+}
+
+public class VersionCompare
+{
+       public enum ResultType { EQUAL, LOWER, GREATER }
+       public ResultType Result;
+
+       public VersionCompare(Version31 ver1, Version31 ver2)
+       {
+               Result = comparer(ver1, ver2);
+       }
+
+       private ResultType comparer(Version31 ver1, Version31 ver2)
+       {
+               ResultType rType;
+
+               rType = compare2(ver1.Major, ver2.Major);
+               if(rType != ResultType.EQUAL)
+                       return rType;
+
+               rType = compare2(ver1.Medium, ver2.Medium);
+               if(rType != ResultType.EQUAL)
+                       return rType;
+
+               rType = compare2(ver1.Minor, ver2.Minor);
+               if(rType != ResultType.EQUAL)
+                       return rType;
+
+               rType = compare2(ver1.Commit, ver2.Commit);
+               if(rType != ResultType.EQUAL)
+                       return rType;
+
+               return ResultType.EQUAL;
+       }
+
+       private ResultType compare2(int val1, int val2)
+       {
+               if(val1 > val2)
+                       return ResultType.GREATER;
+               else if(val1 < val2)
+                       return ResultType.LOWER;
+               else
+                       return ResultType.EQUAL;
+       }
+
+       public string ResultStr {
+               get
+               {
+                       if(Result == ResultType.EQUAL)
+                               return Constants.SoftwareUpdated;
+                       else if(Result == ResultType.LOWER)
+                               return Constants.SoftwareNeedUpdate;
+                       else
+                               return Constants.SoftwareNewerThanPublised;
+               }
+       }
+}
+
+public class VersionCompareTests
+{
+       public VersionCompareTests()
+       {
+               LogB.Information("Starting version compare tests:");
+
+               versionCompareTest("1.5.0",     "1.5.1",                VersionCompare.ResultType.LOWER);
+               versionCompareTest("1.5.0",     "1.5.21",               VersionCompare.ResultType.LOWER);
+               versionCompareTest("1.5.11",    "1.5.21",               VersionCompare.ResultType.LOWER);
+               versionCompareTest("1.5.11",    "1.5.2",                VersionCompare.ResultType.GREATER);
+               versionCompareTest("1.5.11",    "1.5.11-20-hell",       VersionCompare.ResultType.LOWER);
+               versionCompareTest("1.5.12",    "1.5.11-20-hell",       VersionCompare.ResultType.GREATER);
+               versionCompareTest("2.0.0",     "1.0.0",                VersionCompare.ResultType.GREATER);
+               versionCompareTest("1.5.3-20-a","1.5.3-20-bbc",         VersionCompare.ResultType.EQUAL);
+               versionCompareTest("hello",     "good morning",         VersionCompare.ResultType.EQUAL);
+       }
+
+       private bool versionCompareTest(string v1Str, string v2Str, VersionCompare.ResultType rTypeExpected)
+       {
+               Version31 v1 = new Version31(v1Str);
+               Version31 v2 = new Version31(v2Str);
+               VersionCompare.ResultType rTypeFound = new VersionCompare(v1, v2).Result;
+
+               if(rTypeFound == rTypeExpected)
+               {
+                       LogB.Information(string.Format("Success compare of {0} with {1}", v1Str, v2Str));
+                       return true;
+               }
+
+               LogB.Information(string.Format("Failed compare of {0} with {1}, expecting: {2}, found: {3}",
+                                       v1Str, v2Str, rTypeExpected.ToString(), rTypeFound.ToString() ));
+               return false;
+       }
+}