fixed CP1252->UTF8 conversion for old highscore-db,
it uses a modified sqlite lib
This commit is contained in:
1 parent
55f24015cc
commit
d60562ae26
2 files changed
+112
-30
No files matched your search
+108
-30
@@ -1,5 +1,6 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Data;
|
||||||
using System.Drawing;
|
using System.Drawing;
|
||||||
using System.Drawing.Imaging;
|
using System.Drawing.Imaging;
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
@@ -7,15 +8,22 @@ using System.IO;
|
|||||||
using System.Text;
|
using System.Text;
|
||||||
|
|
||||||
using System.Data.SQLite;
|
using System.Data.SQLite;
|
||||||
|
using Community.CsharpSqlite;
|
||||||
|
|
||||||
using Vocaluxe.Lib.Draw;
|
using Vocaluxe.Lib.Draw;
|
||||||
using Vocaluxe.Lib.Song;
|
using Vocaluxe.Lib.Song;
|
||||||
using System.Data;
|
|
||||||
|
|
||||||
namespace Vocaluxe.Base
|
namespace Vocaluxe.Base
|
||||||
{
|
{
|
||||||
static class CDataBase
|
static class CDataBase
|
||||||
{
|
{
|
||||||
|
struct SData
|
||||||
|
{
|
||||||
|
public int id;
|
||||||
|
public string str1;
|
||||||
|
public string str2;
|
||||||
|
}
|
||||||
|
|
||||||
private static string _HighscoreFilePath;
|
private static string _HighscoreFilePath;
|
||||||
private static string _CoverFilePath;
|
private static string _CoverFilePath;
|
||||||
|
|
||||||
@@ -459,19 +467,24 @@ namespace Vocaluxe.Base
|
|||||||
|
|
||||||
command.CommandText = "PRAGMA table_info(US_Scores);";
|
command.CommandText = "PRAGMA table_info(US_Scores);";
|
||||||
reader = command.ExecuteReader();
|
reader = command.ExecuteReader();
|
||||||
reader.Read();
|
|
||||||
|
|
||||||
bool dateExists = false;
|
bool dateExists = false;
|
||||||
|
|
||||||
//Check for column Date
|
//Check for column Date
|
||||||
for (int i = 0; i < reader.FieldCount; i++)
|
while (reader.Read())
|
||||||
{
|
{
|
||||||
if (reader.GetName(i) == "Date")
|
for (int i = 0; i < reader.FieldCount; i++)
|
||||||
{
|
{
|
||||||
dateExists = true;
|
if (reader.GetName(i) == "name")
|
||||||
break;
|
{
|
||||||
|
if (reader.GetString(i) == "Date")
|
||||||
|
dateExists = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
reader.Close();
|
reader.Close();
|
||||||
|
|
||||||
@@ -485,31 +498,99 @@ namespace Vocaluxe.Base
|
|||||||
command.CommandText = "INSERT INTO Songs SELECT ID, Artist, Title, TimesPlayed from US_Songs";
|
command.CommandText = "INSERT INTO Songs SELECT ID, Artist, Title, TimesPlayed from US_Songs";
|
||||||
command.ExecuteNonQuery();
|
command.ExecuteNonQuery();
|
||||||
|
|
||||||
CLog.LogError("The database has been converted but all non ASCII characters got lost in this process");
|
// convert from CP1252 to UTF8
|
||||||
|
List<SData> scores = new List<SData>();
|
||||||
|
List<SData> songs = new List<SData>();
|
||||||
|
|
||||||
/* Unfortunately all SQLite Wrappers do convert data to UTF8 when interacting with the database, so converting cant be done in .Net,
|
Sqlite3.sqlite3 OldDB;
|
||||||
* we might have to write a library in C++ which can convert data or just write a simple program to which converts the tables.
|
int res = Sqlite3.sqlite3_open(_HighscoreFilePath, out OldDB);
|
||||||
*/
|
|
||||||
|
|
||||||
//Now loop through all tables and convert from CP1252 to UTF8
|
|
||||||
//command.CommandText = "SELECT ID, Artist, Title from US_Songs";
|
|
||||||
|
|
||||||
//Create a DataTable containing the results
|
if (res != Sqlite3.SQLITE_OK)
|
||||||
//DataTable results = new DataTable();
|
{
|
||||||
//SQLiteDataAdapter adapter = new SQLiteDataAdapter(command);
|
CLog.LogError("Error opening Database: " + _HighscoreFilePath + " (" + Sqlite3.sqlite3_errmsg(OldDB) + ")");
|
||||||
//adapter.Fill(results);
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Sqlite3.Vdbe Stmt = new Sqlite3.Vdbe();
|
||||||
|
res = Sqlite3.sqlite3_prepare_v2(OldDB, "SELECT ID, Artist, Title FROM US_Songs", -1, ref Stmt, 0);
|
||||||
|
|
||||||
//foreach (DataRow row in results.Rows)
|
if (res != Sqlite3.SQLITE_OK)
|
||||||
//{
|
{
|
||||||
// //FIXME: Convert Latin1(CP1252) to UTF8
|
CLog.LogError("Error query Database: " + _HighscoreFilePath + " (" + Sqlite3.sqlite3_errmsg(OldDB) + ")");
|
||||||
// int id = Convert.ToInt32(row.ItemArray[0].ToString());
|
}
|
||||||
// string artist = row.ItemArray[1].ToString();
|
else
|
||||||
// //artist = Encoding.Unicode.GetString(Encoding.Convert(Encoding.GetEncoding(1252), Encoding.Unicode, Encoding.GetEncoding(1252).GetBytes(row.ItemArray[1].ToString())));
|
{
|
||||||
// string title = row.ItemArray[2].ToString();
|
Sqlite3.sqlite3_step(Stmt);
|
||||||
|
|
||||||
// command.CommandText = "UPDATE Songs SET Artist ='" + artist + "', Title = '" + title + "'WHERE ID = " + id;
|
Encoding UTF8 = Encoding.UTF8;
|
||||||
// command.ExecuteNonQuery();
|
Encoding CP1252 = Encoding.GetEncoding(1252);
|
||||||
//}
|
|
||||||
|
while (Sqlite3.sqlite3_step(Stmt) == Sqlite3.SQLITE_ROW)
|
||||||
|
{
|
||||||
|
SData data = new SData();
|
||||||
|
|
||||||
|
data.id = Sqlite3.sqlite3_column_int(Stmt, 0);
|
||||||
|
|
||||||
|
byte[] bytes = Sqlite3.sqlite3_column_rawbytes(Stmt, 1);
|
||||||
|
data.str1 = UTF8.GetString(Encoding.Convert(CP1252, UTF8, bytes));
|
||||||
|
|
||||||
|
bytes = Sqlite3.sqlite3_column_rawbytes(Stmt, 2);
|
||||||
|
data.str2 = UTF8.GetString(Encoding.Convert(CP1252, UTF8, bytes));
|
||||||
|
|
||||||
|
songs.Add(data);
|
||||||
|
}
|
||||||
|
Sqlite3.sqlite3_finalize(Stmt);
|
||||||
|
}
|
||||||
|
|
||||||
|
Stmt = new Sqlite3.Vdbe();
|
||||||
|
res = Sqlite3.sqlite3_prepare_v2(OldDB, "SELECT rowid, Player FROM US_Scores", -1, ref Stmt, 0);
|
||||||
|
|
||||||
|
if (res != Sqlite3.SQLITE_OK)
|
||||||
|
{
|
||||||
|
CLog.LogError("Error query Database: " + _HighscoreFilePath + " (" + Sqlite3.sqlite3_errmsg(OldDB) + ")");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Sqlite3.sqlite3_step(Stmt);
|
||||||
|
|
||||||
|
Encoding UTF8 = Encoding.UTF8;
|
||||||
|
Encoding CP1252 = Encoding.GetEncoding(1252);
|
||||||
|
|
||||||
|
while (Sqlite3.sqlite3_step(Stmt) == Sqlite3.SQLITE_ROW)
|
||||||
|
{
|
||||||
|
SData data = new SData();
|
||||||
|
|
||||||
|
data.id = Sqlite3.sqlite3_column_int(Stmt, 0);
|
||||||
|
|
||||||
|
byte[] bytes = Sqlite3.sqlite3_column_rawbytes(Stmt, 1);
|
||||||
|
data.str1 = UTF8.GetString(Encoding.Convert(CP1252, UTF8, bytes));
|
||||||
|
|
||||||
|
scores.Add(data);
|
||||||
|
}
|
||||||
|
Sqlite3.sqlite3_finalize(Stmt);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Sqlite3.sqlite3_close(OldDB);
|
||||||
|
|
||||||
|
// update Title and Artist strings
|
||||||
|
foreach (SData data in songs)
|
||||||
|
{
|
||||||
|
command.CommandText = "UPDATE Songs SET [Artist] = @artist, [Title] = @title WHERE [ID] = @id";
|
||||||
|
command.Parameters.Add("@title", System.Data.DbType.String, 0).Value = data.str2;
|
||||||
|
command.Parameters.Add("@artist", System.Data.DbType.String, 0).Value = data.str1;
|
||||||
|
command.Parameters.Add("@id", System.Data.DbType.Int32, 0).Value = data.id;
|
||||||
|
command.ExecuteNonQuery();
|
||||||
|
}
|
||||||
|
|
||||||
|
// update player names
|
||||||
|
foreach (SData data in scores)
|
||||||
|
{
|
||||||
|
command.CommandText = "UPDATE Scores SET [PlayerName] = @player WHERE [id] = @id";
|
||||||
|
command.Parameters.Add("@player", System.Data.DbType.String, 0).Value = data.str1;
|
||||||
|
command.Parameters.Add("@id", System.Data.DbType.Int32, 0).Value = data.id;
|
||||||
|
command.ExecuteNonQuery();
|
||||||
|
}
|
||||||
|
|
||||||
//Delete old tables after conversion
|
//Delete old tables after conversion
|
||||||
command.CommandText = "DROP TABLE US_Scores;";
|
command.CommandText = "DROP TABLE US_Scores;";
|
||||||
@@ -517,9 +598,6 @@ namespace Vocaluxe.Base
|
|||||||
|
|
||||||
command.CommandText = "DROP TABLE US_Songs;";
|
command.CommandText = "DROP TABLE US_Songs;";
|
||||||
command.ExecuteNonQuery();
|
command.ExecuteNonQuery();
|
||||||
|
|
||||||
//results.Dispose();
|
|
||||||
//adapter.Dispose();
|
|
||||||
|
|
||||||
reader.Dispose();
|
reader.Dispose();
|
||||||
command.Dispose();
|
command.Dispose();
|
||||||
|
|||||||
@@ -58,6 +58,10 @@
|
|||||||
<SpecificVersion>False</SpecificVersion>
|
<SpecificVersion>False</SpecificVersion>
|
||||||
<HintPath>..\Output\Bass.Net.dll</HintPath>
|
<HintPath>..\Output\Bass.Net.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
|
<Reference Include="Community.CsharpSqlite, Version=3.7.7.1, Culture=neutral, processorArchitecture=x86">
|
||||||
|
<SpecificVersion>False</SpecificVersion>
|
||||||
|
<HintPath>..\Output\Community.CsharpSqlite.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
<Reference Include="NAudio, Version=1.5.4.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="NAudio, Version=1.5.4.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<SpecificVersion>False</SpecificVersion>
|
<SpecificVersion>False</SpecificVersion>
|
||||||
<HintPath>..\Output\NAudio.dll</HintPath>
|
<HintPath>..\Output\NAudio.dll</HintPath>
|
||||||
|
|||||||
Reference in new issue
Block a user