Merge pull request #1582 from tresf/master

ProjectVersion: Expose major/minor/release/build info

include/ProjectVersion.h

@@ -2,6 +2,7 @@
  * ProjectVersion.h - version compared in import upgrades
  *
  * Copyright (c) 2007 Javier Serrano Polo <jasp00/at/users.sourceforge.net>
+ * Copyright (c) 2015 Tres Finocchiaro <tres.finocchiaro/at/gmail.com>
  *
  * This file is part of LMMS - http://lmms.io
  *
@@ -28,29 +29,107 @@
 
 #include <QtCore/QString>
 
-
-class ProjectVersion : public QString
-{
-public:
-	ProjectVersion( const QString & _s ) :
-		QString( _s )
-	{
-	}
-
-	static int compare( const ProjectVersion & _v1,
-						const ProjectVersion & _v2 );
-
-} ;
+enum CompareType { Major, Minor, Release, Build };
 
 
+static inline int parseMajor(QString & version) {
+	return version.section( '.', 0, 0 ).toInt();
+}
 
+static inline int parseMinor(QString & version) {
+	return version.section( '.', 1, 1 ).toInt();
+}
 
-inline bool operator<( const ProjectVersion & _v1, const char * _str )
-{
-	return ProjectVersion::compare( _v1, ProjectVersion( _str ) ) < 0;
+static inline int parseRelease(QString & version) {
+	return version.section( '.', 2 ).section( '-', 0, 0 ).toInt();
+}
+
+static inline QString parseBuild(QString & version) {
+	return version.section( '.', 2 ).section( '-', 1 );
 }
 
 
+/*! \brief Version number parsing and comparison 
+ *
+ *  Parses and compares version information.  i.e. "1.0.3" < "1.0.10"
+ */
+class ProjectVersion
+{
+public:
+	ProjectVersion(QString version, CompareType c = CompareType::Build) : 
+		m_version(version), 
+		m_major(parseMajor(m_version)),
+		m_minor(parseMinor(m_version)),
+		m_release(parseRelease(m_version)) ,
+		m_build(parseBuild(m_version)),
+		m_compareType(c)
+	{
+	}
+
+	ProjectVersion(const char * version, CompareType c = CompareType::Build) : 
+		m_version(QString(version)), 
+		m_major(parseMajor(m_version)),
+		m_minor(parseMinor(m_version)),
+		m_release(parseRelease(m_version)) ,
+		m_build(parseBuild(m_version)),
+		m_compareType(c)
+	{
+	}
+
+	static int compare(ProjectVersion v1, ProjectVersion v2);
+
+	int getMajor() { return m_major; }
+	int getMinor() { return m_minor; }
+	int getRelease() { return m_release; }
+	QString getBuild() { return m_build; }
+	CompareType getCompareType() { return m_compareType; }
+	ProjectVersion setCompareType(CompareType compareType) { m_compareType = compareType; return * this; }
+	
+
+private:
+	QString m_version;
+	int m_major;
+	int m_minor;
+	int m_release;
+	QString m_build;
+	CompareType m_compareType;
+} ;
+
+inline int compare(ProjectVersion v1, QString v2)
+{
+	return ProjectVersion::compare(v1, ProjectVersion(v2));
+}
+
+
+/*
+ * ProjectVersion v. QString
+ */
+inline bool operator<(ProjectVersion v1, QString v2) { return compare(v1, v2) < 0; }
+inline bool operator>(ProjectVersion v1, QString v2) { return compare(v1, v2) > 0; }
+inline bool operator<=(ProjectVersion v1, QString v2) { return compare(v1, v2) <= 0; }
+inline bool operator>=(ProjectVersion v1, QString v2) { return compare(v1, v2) >= 0; }
+inline bool operator==(ProjectVersion v1, QString v2) { return compare(v1, v2) == 0; }
+inline bool operator!=(ProjectVersion v1, QString v2) { return compare(v1, v2) != 0; }
+
+inline bool operator<(QString v1, ProjectVersion v2) { return 0 < compare(v2, v1); }
+inline bool operator>(QString v1, ProjectVersion v2) { return 0 > compare(v2, v1); }
+inline bool operator<=(QString v1, ProjectVersion v2) { return 0 <= compare(v2, v1); }
+inline bool operator>=(QString v1, ProjectVersion v2) { return 0 >= compare(v2, v1); }
+inline bool operator==(QString v1, ProjectVersion v2) { return 0 == compare(v2, v1); }
+inline bool operator!=(QString v1, ProjectVersion v2) { return 0 != compare(v2, v1); }
+
+
+
+
+/*
+ * ProjectVersion v. ProjectVersion
+ */
+inline bool operator<(ProjectVersion & v1, ProjectVersion & v2) { return ProjectVersion::compare(v1, v2) < 0; }
+inline bool operator>(ProjectVersion & v1, ProjectVersion & v2) { return ProjectVersion::compare(v1, v2) > 0; }
+inline bool operator<=(ProjectVersion & v1, ProjectVersion & v2) { return ProjectVersion::compare(v1, v2) <= 0; }
+inline bool operator>=(ProjectVersion & v1, ProjectVersion & v2) { return ProjectVersion::compare(v1, v2) >= 0; }
+inline bool operator==(ProjectVersion & v1, ProjectVersion & v2) { return ProjectVersion::compare(v1, v2) == 0; }
+inline bool operator!=(ProjectVersion & v1, ProjectVersion & v2) { return ProjectVersion::compare(v1, v2) != 0; }
 
 
 #endif

src/core/ProjectVersion.cpp

@@ -3,6 +3,7 @@
  *
  * Copyright (c) 2007 Javier Serrano Polo <jasp00/at/users.sourceforge.net>
  * Copyright (c) 2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2015 Tres Finocchiaro <tres.finocchiaro/at/gmail.com>
  * 
  * This file is part of LMMS - http://lmms.io
  *
@@ -24,59 +25,54 @@
  */
 
 
-
-
 #include "ProjectVersion.h"
 
-
-
-
-int ProjectVersion::compare( const ProjectVersion & _v1,
-						const ProjectVersion & _v2 )
+int ProjectVersion::compare(ProjectVersion v1, ProjectVersion v2)
 {
-	int n1, n2;
-
-	// Major
-	n1 = _v1.section( '.', 0, 0 ).toInt();
-	n2 = _v2.section( '.', 0, 0 ).toInt();
-	if( n1 != n2 )
+	if(v1.getMajor() != v2.getMajor())
 	{
-		return n1 - n2;
+		return v1.getMajor() - v2.getMajor();
+	}
+	
+	// return prematurely for Major comparison
+	if(v1.getCompareType() == CompareType::Major || 
+		v2.getCompareType() == CompareType::Major)
+	{
+		return 0;
 	}
 
-	// Minor
-	n1 = _v1.section( '.', 1, 1 ).toInt();
-	n2 = _v2.section( '.', 1, 1 ).toInt();
-	if( n1 != n2 )
+	if(v1.getMinor() != v2.getMinor())
 	{
-		return n1 - n2;
+		return v1.getMinor() - v2.getMinor();
 	}
 
-	// Release
-	n1 = _v1.section( '.', 2 ).section( '-', 0, 0 ).toInt();
-	n2 = _v2.section( '.', 2 ).section( '-', 0, 0 ).toInt();
-	if( n1 != n2 )
+	// return prematurely for Minor comparison
+	if(v1.getCompareType() == CompareType::Minor || 
+		v2.getCompareType() == CompareType::Minor)
 	{
-		return n1 - n2;
+		return 0;
 	}
 
-	// Build
-	const QString b1 = _v1.section( '.', 2 ).section( '-', 1 );
-	const QString b2 = _v2.section( '.', 2 ).section( '-', 1 );
+	if(v1.getRelease() != v2.getRelease())
+	{
+		return v1.getRelease() - v2.getRelease();
+	}
+
+	if(v1.getCompareType() == CompareType::Release || 
+		v2.getCompareType() == CompareType::Release) {
+		return 0;
+	}
 
 	// make sure 0.x.y > 0.x.y-patch
-	if( b1.isEmpty() )
+	if(v1.getBuild().isEmpty())
 	{
 		return 1;
 	}
-	if( b2.isEmpty() )
+	if(v2.getBuild().isEmpty())
 	{
 		return -1;
 	}
 
-	return QString::compare( b1, b2 );
+	return QString::compare(v1.getBuild(), v2.getBuild());
 }
 
-
-
-