X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2FVersion.java;h=269edb6fc1e6914d4233bc01d6410337c115fe00;hb=50df0f093afbc78a1d120bbc7c1233fa704688b1;hp=94387373e980daf30b3ca4de01cfa72e490a0307;hpb=c108bc7d77819d071717115614d7b2e0c8bcef25;p=fanfix.git diff --git a/src/be/nikiroo/utils/Version.java b/src/be/nikiroo/utils/Version.java index 9438737..269edb6 100644 --- a/src/be/nikiroo/utils/Version.java +++ b/src/be/nikiroo/utils/Version.java @@ -14,6 +14,8 @@ public class Version implements Comparable { private int major; private int minor; private int patch; + private String tag; + private int tagVersion; /** * Create a new, empty {@link Version}. @@ -33,30 +35,104 @@ public class Version implements Comparable { * the patch version */ public Version(int major, int minor, int patch) { + this(major, minor, patch, null, -1); + } + + /** + * Create a new {@link Version} with the given values. + * + * @param major + * the major version + * @param minor + * the minor version + * @param patch + * the patch version + * @param tag + * a tag name for this version + */ + public Version(int major, int minor, int patch, String tag) { + this(major, minor, patch, tag, -1); + } + + /** + * Create a new {@link Version} with the given values. + * + * @param major + * the major version + * @param minor + * the minor version + * @param patch + * the patch version the patch version + * @param tag + * a tag name for this version + * @param tagVersion + * the version of the tagged version + */ + public Version(int major, int minor, int patch, String tag, int tagVersion) { + if (tagVersion >= 0 && tag == null) { + throw new java.lang.IllegalArgumentException( + "A tag version cannot be used without a tag"); + } + this.major = major; this.minor = minor; this.patch = patch; - this.version = String.format("%d.%d.%d", major, minor, patch); + this.tag = tag; + this.tagVersion = tagVersion; + + this.version = generateVersion(); } /** * Create a new {@link Version} with the given value, which must be in the - * form MAJOR.MINOR.PATCH. + * form MAJOR.MINOR.PATCH(-TAG(TAG_VERSION)). * * @param version - * the version (MAJOR.MINOR.PATCH) + * the version (MAJOR.MINOR.PATCH, + * MAJOR.MINOR.PATCH-TAG or + * MAJOR.MINOR.PATCH-TAGVERSIONTAG) */ public Version(String version) { try { String[] tab = version.split("\\."); - this.major = Integer.parseInt(tab[0]); - this.minor = Integer.parseInt(tab[1]); - this.patch = Integer.parseInt(tab[2]); - this.version = version; + this.major = Integer.parseInt(tab[0].trim()); + this.minor = Integer.parseInt(tab[1].trim()); + if (tab[2].contains("-")) { + int posInVersion = version.indexOf('.'); + posInVersion = version.indexOf('.', posInVersion + 1); + String rest = version.substring(posInVersion + 1); + + int posInRest = rest.indexOf('-'); + this.patch = Integer.parseInt(rest.substring(0, posInRest) + .trim()); + + posInVersion = version.indexOf('-'); + this.tag = version.substring(posInVersion + 1).trim(); + this.tagVersion = -1; + + StringBuilder str = new StringBuilder(); + while (!tag.isEmpty() && tag.charAt(tag.length() - 1) >= '0' + && tag.charAt(tag.length() - 1) <= '9') { + str.insert(0, tag.charAt(tag.length() - 1)); + tag = tag.substring(0, tag.length() - 1); + } + + if (str.length() > 0) { + this.tagVersion = Integer.parseInt(str.toString()); + } + } else { + this.patch = Integer.parseInt(tab[2].trim()); + this.tag = null; + this.tagVersion = -1; + } + + this.version = generateVersion(); } catch (Exception e) { this.major = 0; this.minor = 0; this.patch = 0; + this.tag = null; + this.tagVersion = -1; this.version = null; } } @@ -97,26 +173,53 @@ public class Version implements Comparable { return patch; } + /** + * A tag name for this version. + * + * @return the tag + */ + public String getTag() { + return tag; + } + + /** + * The version of the tag, or -1 for no version. + * + * @return the tag version + */ + public int getTagVersion() { + return tagVersion; + } + /** * Check if this {@link Version} is "empty" (i.e., the version was not * parse-able or not given). - *

- * An empty {@link Version} is always 0.0.0. * * @return TRUE if it is empty */ public boolean isEmpty() { - return major == 0 && minor == 0 && patch == 0; + return version == null; } /** * Check if we are more recent than the given {@link Version}. + *

+ * Note that a tagged version is considered newer than a non-tagged version, + * but two tagged versions with different tags are not comparable. + *

+ * Also, an empty version is always considered older. * * @param o * the other {@link Version} * @return TRUE if this {@link Version} is more recent than the given one */ public boolean isNewerThan(Version o) { + if (isEmpty()) { + return false; + } else if (o.isEmpty()) { + return true; + } + if (major > o.major) { return true; } @@ -129,17 +232,50 @@ public class Version implements Comparable { return true; } + // a tagged version is considered newer than a non-tagged one + if (major == o.major && minor == o.minor && patch == o.patch + && tag != null && o.tag == null) { + return true; + } + + // 2 <> tagged versions are not comparable + boolean sameTag = (tag == null && o.tag == null) + || (tag != null && tag.equals(o.tag)); + if (major == o.major && minor == o.minor && patch == o.patch && sameTag + && tagVersion > o.tagVersion) { + return true; + } + return false; } /** * Check if we are older than the given {@link Version}. + *

+ * Note that a tagged version is considered newer than a non-tagged version, + * but two tagged versions with different tags are not comparable. + *

+ * Also, an empty version is always considered older. * * @param o * the other {@link Version} * @return TRUE if this {@link Version} is older than the given one */ public boolean isOlderThan(Version o) { + if (o.isEmpty()) { + return false; + } else if (isEmpty()) { + return true; + } + + // 2 <> tagged versions are not comparable + boolean sameTag = (tag == null && o.tag == null) + || (tag != null && tag.equals(o.tag)); + if (major == o.major && minor == o.minor && patch == o.patch + && !sameTag) { + return false; + } + return !equals(o) && !isNewerThan(o); } @@ -172,6 +308,7 @@ public class Version implements Comparable { return new Version(version); } + @Override public int compareTo(Version o) { if (equals(o)) { return 0; @@ -186,7 +323,14 @@ public class Version implements Comparable { public boolean equals(Object obj) { if (obj instanceof Version) { Version o = (Version) obj; - return o.major == major && o.minor == minor && o.patch == patch; + if (isEmpty()) { + return o.isEmpty(); + } + + boolean sameTag = (tag == null && o.tag == null) + || (tag != null && tag.equals(o.tag)); + return o.major == major && o.minor == minor && o.patch == patch + && sameTag && o.tagVersion == tagVersion; } return false; @@ -204,4 +348,19 @@ public class Version implements Comparable { public String toString() { return version == null ? "[unknown]" : version; } + + /** + * Generate the clean version {@link String} from the current values. + * + * @return the clean version string + */ + private String generateVersion() { + String tagSuffix = ""; + if (tag != null) { + tagSuffix = "-" + tag + + (tagVersion >= 0 ? Integer.toString(tagVersion) : ""); + } + + return String.format("%d.%d.%d%s", major, minor, patch, tagSuffix); + } }