mattburchett/NadekoBot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Migration 0.9->1.0 now works

Browse Source
This commit is contained in:
Kwoth 2016-10-12 03:44:31 +02:00
parent 373e4c0ad9
commit cfe0d09da6
1 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/NadekoBot/Modules/Administration/Commands/Migration.cs
View File

@ -57,8 +57,9 @@ namespace NadekoBot.Modules.Administration
} }
await umsg.Channel.SendMessageAsync("Migration done.").ConfigureAwait(false); await umsg.Channel.SendMessageAsync("Migration done.").ConfigureAwait(false);
} }
catch (MigrationException) catch (Exception ex)
{ {
_log.Error(ex);
await umsg.Channel.SendMessageAsync(":warning: Error while migrating, check logs for more informations.").ConfigureAwait(false); await umsg.Channel.SendMessageAsync(":warning: Error while migrating, check logs for more informations.").ConfigureAwait(false);
} }
} }
@ -82,6 +83,12 @@ namespace NadekoBot.Modules.Administration
private void MigrateDb0_9(IUnitOfWork uow) private void MigrateDb0_9(IUnitOfWork uow)
{ {
var db = new SqliteConnection("Data Source=data/nadekobot.sqlite"); var db = new SqliteConnection("Data Source=data/nadekobot.sqlite");
if (!File.Exists("data/nadekobot.sqlite"))
{
_log.Warn("No data from the old database will be migrated.");
return;
}
db.Open(); db.Open();
var com = db.CreateCommand(); var com = db.CreateCommand();
@ -90,16 +97,16 @@ namespace NadekoBot.Modules.Administration
var reader = com.ExecuteReader(); var reader = com.ExecuteReader();
while (reader.Read()) while (reader.Read())
{ {
var gid = (ulong)reader["ServerId"]; var gid = (ulong)(long)reader["ServerId"];
var greet = (bool)reader["Greet"]; var greet = (long)reader["Greet"] == 1;
var greetDM = (bool)reader["GreetPM"]; var greetDM = (long)reader["GreetPM"] == 1;
var greetChannel = (ulong)reader["GreetChannelId"]; var greetChannel = (ulong)(long)reader["GreetChannelId"];
var greetMsg = (string)reader["GreetText"]; var greetMsg = (string)reader["GreetText"];
var bye = (bool)reader["Bye"]; var bye = (long)reader["Bye"] == 1;
var byeDM = (bool)reader["ByePM"]; var byeDM = (long)reader["ByePM"] == 1;
var byeChannel = (ulong)reader["ByeChannelId"]; var byeChannel = (ulong)(long)reader["ByeChannelId"];
var byeMsg = (string)reader["ByeText"]; var byeMsg = (string)reader["ByeText"];
bool grdel = (bool)reader["DeleteGreetMessages"]; bool grdel = (long)reader["DeleteGreetMessages"] == 1;
var byedel = grdel; var byedel = grdel;
var gc = uow.GuildConfigs.For(gid); var gc = uow.GuildConfigs.For(gid);
@ -126,7 +133,7 @@ namespace NadekoBot.Modules.Administration
uow.Currency.Add(new Currency() uow.Currency.Add(new Currency()
{ {
Amount = (long)reader2["Value"], Amount = (long)reader2["Value"],
UserId = (ulong)reader2["UserId"] UserId = (ulong)(long)reader2["UserId"]
}); });
} }
db.Close(); db.Close();
@ -136,6 +143,13 @@ namespace NadekoBot.Modules.Administration
private void MigrateServerSpecificConfigs0_9(IUnitOfWork uow) private void MigrateServerSpecificConfigs0_9(IUnitOfWork uow)
{ {
const string specificConfigsPath = "data/ServerSpecificConfigs.json"; const string specificConfigsPath = "data/ServerSpecificConfigs.json";
if (!File.Exists(specificConfigsPath))
{
_log.Warn($"No data from {specificConfigsPath} will be migrated.");
return;
}
var configs = new ConcurrentDictionary<ulong, ServerSpecificConfig>(); var configs = new ConcurrentDictionary<ulong, ServerSpecificConfig>();
try try
{ {
@ -215,7 +229,10 @@ namespace NadekoBot.Modules.Administration
{ {
var PermissionsDict = new ConcurrentDictionary<ulong, ServerPermissions0_9>(); var PermissionsDict = new ConcurrentDictionary<ulong, ServerPermissions0_9>();
if (!Directory.Exists("data/permissions/")) if (!Directory.Exists("data/permissions/"))
throw new MigrationException(); {
_log.Warn("No data from permissions will be migrated.");
return;
}
foreach (var file in Directory.EnumerateFiles("data/permissions/")) foreach (var file in Directory.EnumerateFiles("data/permissions/"))
{ {
try try