hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Add internal support for major/minor/build comparator

Browse Source
This commit is contained in:
Tres Finocchiaro
2015-01-09 16:25:07 -05:00
parent 407fc18d82
commit 21c532adc0
2 changed files with 39 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/ProjectVersion.h
View File

@@ -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,34 +29,39 @@
#include <QtCore/QString>
enum CompareType { Major, Minor, Release, Build };
class ProjectVersion : public QString
{
public:
ProjectVersion(const QString & s) :
ProjectVersion(const QString & s, const CompareType c = CompareType::Build) :
QString(s),
m_major(section( '.', 0, 0 ).toInt()) ,
m_minor(section( '.', 1, 1 ).toInt()) ,
m_release(section( '.', 2 ).section( '-', 0, 0 ).toInt()) ,
m_build(section( '.', 2 ).section( '-', 1 ))
m_build(section( '.', 2 ).section( '-', 1 )),
m_compareType(c)
{
}
static int compare(const ProjectVersion & v1, const ProjectVersion & v2);
const int majorVersion() const { return m_major; }
const int minorVersion() const { return m_minor; }
const int releaseVersion() const { return m_release; }
const QString buildVersion() const { return m_build; }
static int compare(const ProjectVersion & v1, const ProjectVersion & v2);
const int getMajor() const { return m_major; }
const int getMinor() const { return m_minor; }
const int getRelease() const { return m_release; }
const QString getBuild() const { return m_build; }
const CompareType getCompareType() const { return m_compareType; }
private:
const int m_major;
const int m_minor;
const int m_release;
const QString m_build;
const CompareType m_compareType;
} ;
inline bool operator<( const ProjectVersion & v1, const char * str )
{
return ProjectVersion::compare( v1, ProjectVersion( str ) ) < 0;

33
src/core/ProjectVersion.cpp
View File

@@ -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
*
@@ -31,32 +32,46 @@
int ProjectVersion::compare(const ProjectVersion & v1, const ProjectVersion & v2)
{
if(v1.majorVersion() != v2.majorVersion())
if(v1.getMajor() != v2.getMajor())
{
return v1.majorVersion() - v2.majorVersion();
return v1.getMajor() - v2.getMajor();
}
// return prematurely for Major comparison
if(v1.getCompareType() == CompareType::Major ||
v1.getCompareType() == CompareType::Major)
{
return 0;
}
if(v1.minorVersion() != v2.minorVersion())
if(v1.getMinor() != v2.getMinor())
{
return v1.minorVersion() - v2.minorVersion();
return v1.getMinor() - v2.getMinor();
}
if(v1.releaseVersion() != v2.releaseVersion())
// return prematurely for Minor comparison
if(v1.getCompareType() == CompareType::Minor ||
v1.getCompareType() == CompareType::Minor)
if(v1.getRelease() != v2.getRelease())
{
return v1.releaseVersion() - v2.releaseVersion();
return v1.getRelease() - v2.getRelease();
}
if(v1.getCompareType() == CompareType::Build ||
v1.getCompareType() == CompareType::Build)
// make sure 0.x.y > 0.x.y-patch
if(v1.buildVersion().isEmpty())
if(v1.getBuild().isEmpty())
{
return 1;
}
if(v2.buildVersion().isEmpty())
if(v2.getBuild().isEmpty())
{
return -1;
}
return QString::compare(v1.buildVersion(), v2.buildVersion());
return QString::compare(v1.getBuild(), v2.getBuild());
}