feedc0de/LogBlock
1
0
Fork 0
forked from LogBlock/LogBlock
Code Pull Requests Activity

Move to proper three-part versioning (ie 1.9.4 instead of 1.94) and set the dev version to 1.10.0

Browse Source 
If it detects a version number of the form 1.xy in the config, it will change that to 1.x.y, so we should make sure we always use e.g. 1.10.0 for version 1.10

Fixes #629
This commit is contained in:
frymaster
2015-07-30 22:27:06 +01:00
parent 232ddc6323
commit a2c162489a
3 changed files with 518 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -4,7 +4,7 @@
<groupId>de.diddiz</groupId>
<artifactId>logblock</artifactId>
<version>1.95-dev-SNAPSHOT</version>
<version>1.10.0-dev-SNAPSHOT</version>
<packaging>jar</packaging>
<name>LogBlock</name>

83
src/main/java/de/diddiz/LogBlock/Updater.java
View File

@ -16,6 +16,8 @@ import java.util.logging.Level;
import static de.diddiz.LogBlock.config.Config.getLoggedWorlds;
import static de.diddiz.LogBlock.config.Config.isLogging;
import static de.diddiz.util.BukkitUtils.friendlyWorldname;
import de.diddiz.util.ComparableVersion;
import java.util.regex.Pattern;
import static org.bukkit.Bukkit.getLogger;
class Updater {
@ -28,11 +30,18 @@ class Updater {
boolean update() {
final ConfigurationSection config = logblock.getConfig();
if (config.getString("version").compareTo(logblock.getDescription().getVersion()) >= 0) {
String versionString = config.getString("version");
if (Pattern.matches("1\\.\\d{2}",versionString)) {
versionString = "1." + versionString.charAt(2) + "." + versionString.charAt(3);
config.set("version",versionString);
logblock.saveConfig();
}
ComparableVersion configVersion = new ComparableVersion(versionString);
if (configVersion.compareTo(new ComparableVersion(logblock.getDescription().getVersion())) >= 0) {
return false;
}
if (config.getString("version").compareTo("1.27") < 0) {
getLogger().info("Updating tables to 1.27 ...");
if (configVersion.compareTo(new ComparableVersion("1.2.7")) < 0) {
getLogger().info("Updating tables to 1.2.7 ...");
if (isLogging(Logging.CHAT)) {
final Connection conn = logblock.getConnection();
try {
@ -46,19 +55,19 @@ class Updater {
return false;
}
}
config.set("version", "1.27");
config.set("version", "1.2.7");
}
if (config.getString("version").compareTo("1.30") < 0) {
getLogger().info("Updating config to 1.30 ...");
if (configVersion.compareTo(new ComparableVersion("1.3")) < 0) {
getLogger().info("Updating config to 1.3.0 ...");
for (final String tool : config.getConfigurationSection("tools").getKeys(false)) {
if (config.get("tools." + tool + ".permissionDefault") == null) {
config.set("tools." + tool + ".permissionDefault", "OP");
}
}
config.set("version", "1.30");
config.set("version", "1.3.0");
}
if (config.getString("version").compareTo("1.31") < 0) {
getLogger().info("Updating tables to 1.31 ...");
if (configVersion.compareTo(new ComparableVersion("1.3.1")) < 0) {
getLogger().info("Updating tables to 1.3.1 ...");
final Connection conn = logblock.getConnection();
try {
conn.setAutoCommit(true);
@ -70,10 +79,10 @@ class Updater {
Bukkit.getLogger().log(Level.SEVERE, "[Updater] Error: ", ex);
return false;
}
config.set("version", "1.31");
config.set("version", "1.3.1");
}
if (config.getString("version").compareTo("1.32") < 0) {
getLogger().info("Updating tables to 1.32 ...");
if (configVersion.compareTo(new ComparableVersion("1.3.2")) < 0) {
getLogger().info("Updating tables to 1.3.2 ...");
final Connection conn = logblock.getConnection();
try {
conn.setAutoCommit(true);
@ -85,15 +94,15 @@ class Updater {
Bukkit.getLogger().log(Level.SEVERE, "[Updater] Error: ", ex);
return false;
}
config.set("version", "1.32");
config.set("version", "1.3.2");
}
if (config.getString("version").compareTo("1.40") < 0) {
getLogger().info("Updating config to 1.40 ...");
if (configVersion.compareTo(new ComparableVersion("1.4")) < 0) {
getLogger().info("Updating config to 1.4.0 ...");
config.set("clearlog.keepLogDays", null);
config.set("version", "1.40");
config.set("version", "1.4.0");
}
if (config.getString("version").compareTo("1.42") < 0) {
getLogger().info("Updating config to 1.42 ...");
if (configVersion.compareTo(new ComparableVersion("1.4.2")) < 0) {
getLogger().info("Updating config to 1.4.2 ...");
for (final String world : config.getStringList("loggedWorlds")) {
final File file = new File(logblock.getDataFolder(), friendlyWorldname(world) + ".yml");
final YamlConfiguration wcfg = YamlConfiguration.loadConfiguration(file);
@ -176,10 +185,10 @@ class Updater {
}
}
config.set("clearlog.keepLogDays", null);
config.set("version", "1.42");
config.set("version", "1.4.2");
}
if (config.getString("version").compareTo("1.51") < 0) {
getLogger().info("Updating tables to 1.51 ...");
if (configVersion.compareTo(new ComparableVersion("1.5.1")) < 0) {
getLogger().info("Updating tables to 1.5.1 ...");
final Connection conn = logblock.getConnection();
try {
conn.setAutoCommit(true);
@ -195,10 +204,10 @@ class Updater {
Bukkit.getLogger().log(Level.SEVERE, "[Updater] Error: ", ex);
return false;
}
config.set("version", "1.51");
config.set("version", "1.5.1");
}
if (config.getString("version").compareTo("1.52") < 0) {
getLogger().info("Updating tables to 1.52 ...");
if (configVersion.compareTo(new ComparableVersion("1.5.2")) < 0) {
getLogger().info("Updating tables to 1.5.2 ...");
final Connection conn = logblock.getConnection();
try {
conn.setAutoCommit(true);
@ -218,10 +227,10 @@ class Updater {
Bukkit.getLogger().log(Level.SEVERE, "[Updater] Error: ", ex);
return false;
}
config.set("version", "1.52");
config.set("version", "1.5.2");
}
if (config.getString("version").compareTo("1.81") < 0) {
getLogger().info("Updating tables to 1.81 ...");
if (configVersion.compareTo(new ComparableVersion("1.8.1")) < 0) {
getLogger().info("Updating tables to 1.8.1 ...");
final Connection conn = logblock.getConnection();
try {
conn.setAutoCommit(true);
@ -238,11 +247,11 @@ class Updater {
Bukkit.getLogger().log(Level.SEVERE, "[Updater] Error: ", ex);
return false;
}
config.set("version", "1.81");
config.set("version", "1.8.1");
}
if (config.getString("version").compareTo("1.90") < 0) {
getLogger().info("Updating tables to 1.9 ...");
if (configVersion.compareTo(new ComparableVersion("1.9")) < 0) {
getLogger().info("Updating tables to 1.9.0 ...");
getLogger().info("Importing UUIDs for large databases may take some time");
final Connection conn = logblock.getConnection();
try {
@ -316,12 +325,12 @@ class Updater {
Bukkit.getLogger().log(Level.SEVERE, "[UUID importer]", ex);
return false;
}
config.set("version", "1.90");
config.set("version", "1.9.0");
}
// Ensure charset for free-text fields is UTF-8, or UTF8-mb4 if possible
// As this may be an expensive operation and the database default may already be this, check on a table-by-table basis before converting
if (config.getString("version").compareTo("1.92") < 0) {
getLogger().info("Updating tables to 1.92 ...");
if (configVersion.compareTo(new ComparableVersion("1.9.2")) < 0) {
getLogger().info("Updating tables to 1.9.2 ...");
String charset = "utf8";
if (Config.mb4) {
charset = "utf8mb4";
@ -356,10 +365,10 @@ class Updater {
Bukkit.getLogger().log(Level.SEVERE, "[Updater] Error: ", ex);
return false;
}
config.set("version", "1.92");
config.set("version", "1.9.2");
}
if (config.getString("version").compareTo("1.94") < 0) {
getLogger().info("Updating tables to 1.94 ...");
if (configVersion.compareTo(new ComparableVersion("1.9.4")) < 0) {
getLogger().info("Updating tables to 1.9.4 ...");
final Connection conn = logblock.getConnection();
try {
conn.setAutoCommit(true);
@ -389,7 +398,7 @@ class Updater {
Bukkit.getLogger().log(Level.SEVERE, "[Updater] Error: ", ex);
return false;
}
config.set("version", "1.94");
config.set("version", "1.9.4");
}
logblock.saveConfig();

471
src/main/java/de/diddiz/util/ComparableVersion.java Normal file
View File

@ -0,0 +1,471 @@
package de.diddiz.util;
// Taken from maven-artifact at
// http://grepcode.com/file_/repo1.maven.org/maven2/org.apache.maven/maven-artifact/3.2.3/org/apache/maven/artifact/versioning/ComparableVersion.java/?v=source
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
import java.util.Locale;
import java.util.Properties;
import java.util.Stack;
/**
* Generic implementation of version comparison.
*
* <p>Features:
* <ul>
* <li>mixing of '<code>-</code>' (dash) and '<code>.</code>' (dot) separators,</li>
* <li>transition between characters and digits also constitutes a separator:
* <code>1.0alpha1 =&gt; [1, 0, alpha, 1]</code></li>
* <li>unlimited number of version components,</li>
* <li>version components in the text can be digits or strings,</li>
* <li>strings are checked for well-known qualifiers and the qualifier ordering is used for version ordering.
* Well-known qualifiers (case insensitive) are:<ul>
* <li><code>alpha</code> or <code>a</code></li>
* <li><code>beta</code> or <code>b</code></li>
* <li><code>milestone</code> or <code>m</code></li>
* <li><code>rc</code> or <code>cr</code></li>
* <li><code>snapshot</code></li>
* <li><code>(the empty string)</code> or <code>ga</code> or <code>final</code></li>
* <li><code>sp</code></li>
* </ul>
* Unknown qualifiers are considered after known qualifiers, with lexical order (always case insensitive),
* </li>
* <li>a dash usually precedes a qualifier, and is always less important than something preceded with a dot.</li>
* </ul></p>
*
* @see <a href="https://cwiki.apache.org/confluence/display/MAVENOLD/Versioning">"Versioning" on Maven Wiki</a>
* @author <a href="mailto:kenney@apache.org">Kenney Westerhof</a>
* @author <a href="mailto:hboutemy@apache.org">Hervé Boutemy</a>
*/
public class ComparableVersion
implements Comparable<ComparableVersion>
{
private String value;
private String canonical;
private ListItem items;
private interface Item
{
int INTEGER_ITEM = 0;
int STRING_ITEM = 1;
int LIST_ITEM = 2;
int compareTo( Item item );
int getType();
boolean isNull();
}
/**
* Represents a numeric item in the version item list.
*/
private static class IntegerItem
implements Item
{
private static final BigInteger BIG_INTEGER_ZERO = new BigInteger( "0" );
private final BigInteger value;
public static final IntegerItem ZERO = new IntegerItem();
private IntegerItem()
{
this.value = BIG_INTEGER_ZERO;
}
public IntegerItem( String str )
{
this.value = new BigInteger( str );
}
public int getType()
{
return INTEGER_ITEM;
}
public boolean isNull()
{
return BIG_INTEGER_ZERO.equals( value );
}
public int compareTo( Item item )
{
if ( item == null )
{
return BIG_INTEGER_ZERO.equals( value ) ? 0 : 1; // 1.0 == 1, 1.1 > 1
}
switch ( item.getType() )
{
case INTEGER_ITEM:
return value.compareTo( ( (IntegerItem) item ).value );
case STRING_ITEM:
return 1; // 1.1 > 1-sp
case LIST_ITEM:
return 1; // 1.1 > 1-1
default:
throw new RuntimeException( "invalid item: " + item.getClass() );
}
}
public String toString()
{
return value.toString();
}
}
/**
* Represents a string in the version item list, usually a qualifier.
*/
private static class StringItem
implements Item
{
private static final String[] QUALIFIERS = { "alpha", "beta", "milestone", "rc", "snapshot", "", "sp" };
private static final List<String> _QUALIFIERS = Arrays.asList( QUALIFIERS );
private static final Properties ALIASES = new Properties();
static
{
ALIASES.put( "ga", "" );
ALIASES.put( "final", "" );
ALIASES.put( "cr", "rc" );
}
/**
* A comparable value for the empty-string qualifier. This one is used to determine if a given qualifier makes
* the version older than one without a qualifier, or more recent.
*/
private static final String RELEASE_VERSION_INDEX = String.valueOf( _QUALIFIERS.indexOf( "" ) );
private String value;
public StringItem( String value, boolean followedByDigit )
{
if ( followedByDigit && value.length() == 1 )
{
// a1 = alpha-1, b1 = beta-1, m1 = milestone-1
switch ( value.charAt( 0 ) )
{
case 'a':
value = "alpha";
break;
case 'b':
value = "beta";
break;
case 'm':
value = "milestone";
break;
}
}
this.value = ALIASES.getProperty( value , value );
}
public int getType()
{
return STRING_ITEM;
}
public boolean isNull()
{
return ( comparableQualifier( value ).compareTo( RELEASE_VERSION_INDEX ) == 0 );
}
/**
* Returns a comparable value for a qualifier.
*
* This method takes into account the ordering of known qualifiers then unknown qualifiers with lexical ordering.
*
* just returning an Integer with the index here is faster, but requires a lot of if/then/else to check for -1
* or QUALIFIERS.size and then resort to lexical ordering. Most comparisons are decided by the first character,
* so this is still fast. If more characters are needed then it requires a lexical sort anyway.
*
* @param qualifier
* @return an equivalent value that can be used with lexical comparison
*/
public static String comparableQualifier( String qualifier )
{
int i = _QUALIFIERS.indexOf( qualifier );
return i == -1 ? ( _QUALIFIERS.size() + "-" + qualifier ) : String.valueOf( i );
}
public int compareTo( Item item )
{
if ( item == null )
{
// 1-rc < 1, 1-ga > 1
return comparableQualifier( value ).compareTo( RELEASE_VERSION_INDEX );
}
switch ( item.getType() )
{
case INTEGER_ITEM:
return -1; // 1.any < 1.1 ?
case STRING_ITEM:
return comparableQualifier( value ).compareTo( comparableQualifier( ( (StringItem) item ).value ) );
case LIST_ITEM:
return -1; // 1.any < 1-1
default:
throw new RuntimeException( "invalid item: " + item.getClass() );
}
}
public String toString()
{
return value;
}
}
/**
* Represents a version list item. This class is used both for the global item list and for sub-lists (which start
* with '-(number)' in the version specification).
*/
private static class ListItem
extends ArrayList<Item>
implements Item
{
public int getType()
{
return LIST_ITEM;
}
public boolean isNull()
{
return ( size() == 0 );
}
void normalize()
{
for ( ListIterator<Item> iterator = listIterator( size() ); iterator.hasPrevious(); )
{
Item item = iterator.previous();
if ( item.isNull() )
{
iterator.remove(); // remove null trailing items: 0, "", empty list
}
else
{
break;
}
}
}
public int compareTo( Item item )
{
if ( item == null )
{
if ( size() == 0 )
{
return 0; // 1-0 = 1- (normalize) = 1
}
Item first = get( 0 );
return first.compareTo( null );
}
switch ( item.getType() )
{
case INTEGER_ITEM:
return -1; // 1-1 < 1.0.x
case STRING_ITEM:
return 1; // 1-1 > 1-sp
case LIST_ITEM:
Iterator<Item> left = iterator();
Iterator<Item> right = ( (ListItem) item ).iterator();
while ( left.hasNext() || right.hasNext() )
{
Item l = left.hasNext() ? left.next() : null;
Item r = right.hasNext() ? right.next() : null;
// if this is shorter, then invert the compare and mul with -1
int result = l == null ? ( r == null ? 0 : -1 * r.compareTo( l ) ) : l.compareTo( r );
if ( result != 0 )
{
return result;
}
}
return 0;
default:
throw new RuntimeException( "invalid item: " + item.getClass() );
}
}
public String toString()
{
StringBuilder buffer = new StringBuilder( "(" );
for ( Iterator<Item> iter = iterator(); iter.hasNext(); )
{
buffer.append( iter.next() );
if ( iter.hasNext() )
{
buffer.append( ',' );
}
}
buffer.append( ')' );
return buffer.toString();
}
}
public ComparableVersion( String version )
{
parseVersion( version );
}
public final void parseVersion( String version )
{
this.value = version;
items = new ListItem();
version = version.toLowerCase( Locale.ENGLISH );
ListItem list = items;
Stack<Item> stack = new Stack<Item>();
stack.push( list );
boolean isDigit = false;
int startIndex = 0;
for ( int i = 0; i < version.length(); i++ )
{
char c = version.charAt( i );
if ( c == '.' )
{
if ( i == startIndex )
{
list.add( IntegerItem.ZERO );
}
else
{
list.add( parseItem( isDigit, version.substring( startIndex, i ) ) );
}
startIndex = i + 1;
}
else if ( c == '-' )
{
if ( i == startIndex )
{
list.add( IntegerItem.ZERO );
}
else
{
list.add( parseItem( isDigit, version.substring( startIndex, i ) ) );
}
startIndex = i + 1;
if ( isDigit )
{
list.normalize(); // 1.0-* = 1-*
if ( ( i + 1 < version.length() ) && Character.isDigit( version.charAt( i + 1 ) ) )
{
// new ListItem only if previous were digits and new char is a digit,
// ie need to differentiate only 1.1 from 1-1
list.add( list = new ListItem() );
stack.push( list );
}
}
}
else if ( Character.isDigit( c ) )
{
if ( !isDigit && i > startIndex )
{
list.add( new StringItem( version.substring( startIndex, i ), true ) );
startIndex = i;
}
isDigit = true;
}
else
{
if ( isDigit && i > startIndex )
{
list.add( parseItem( true, version.substring( startIndex, i ) ) );
startIndex = i;
}
isDigit = false;
}
}
if ( version.length() > startIndex )
{
list.add( parseItem( isDigit, version.substring( startIndex ) ) );
}
while ( !stack.isEmpty() )
{
list = (ListItem) stack.pop();
list.normalize();
}
canonical = items.toString();
}
private static Item parseItem( boolean isDigit, String buf )
{
return isDigit ? new IntegerItem( buf ) : new StringItem( buf, false );
}
public int compareTo( ComparableVersion o )
{
return items.compareTo( o.items );
}
public String toString()
{
return value;
}
public boolean equals( Object o )
{
return ( o instanceof ComparableVersion ) && canonical.equals( ( (ComparableVersion) o ).canonical );
}
public int hashCode()
{
return canonical.hashCode();
}
}