nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-13 08:08:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix "JSON char > 127 codepage problem""

Browse Source 
[cherry-picked from master]
This commit is contained in:
Joern
2014-09-04 19:44:56 +02:00
committed by Mark Liversedge
parent ec620db595
commit 6621352551
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/JsonRideFile.l
View File

@@ -91,5 +91,8 @@ int JsonRideFilelex_destroy(void) { return 0; }
void JsonRideFile_setString(QString p)
{
JsonRideFile_scan_string(p.toLocal8Bit().data());
// internally work with UTF-8 encoding
// this works for FLEX, since the multi-byte characters only appear WITHIN a "String",
// but not as part of the grammar - this is important since a char in UTF-8 can have up to 4 bytes
JsonRideFile_scan_string(p.toUtf8().data());
}

19
src/JsonRideFile.y
View File

@@ -84,7 +84,8 @@ static QString protect(const QString string)
// Un-Escape special characters (JSON compliance)
static QString unprotect(const char * string)
{
QString string2 = QString::fromLocal8Bit(string);
// sending UTF-8 to FLEX demands symetric conversion back to QString
QString string2 = QString::fromUtf8(string);
// this is a lexer string so it will be enclosed
// in quotes. Lets strip those first
@@ -293,9 +294,22 @@ JsonFileReader::openRideFile(QFile &file, QStringList &errors, QList<RideFile*>*
// read in the whole thing
QTextStream in(&file);
// GC .JSON is stored in UTF-8 with BOM(Byte order mark) for identification
in.setCodec ("UTF-8");
contents = in.readAll();
file.close();
// check if the text string contains the replacement character for UTF-8 encoding
// if yes, try to read with Latin1/ISO 8859-1 (assuming this is an "old" non-UTF-8 Json file)
if (contents.contains(QChar::ReplacementCharacter)) {
if (file.exists() && file.open(QFile::ReadOnly | QFile::Text)) {
QTextStream in(&file);
in.setCodec ("ISO 8859-1");
contents = in.readAll();
file.close();
}
}
} else {
errors << "unable to open file" + file.fileName();
@@ -340,6 +354,9 @@ JsonFileReader::writeRideFile(Context *, const RideFile *ride, QFile &file) cons
// setup streamer
QTextStream out(&file);
// unified codepage and BOM for identification on all platforms
out.setCodec("UTF-8");
out.setGenerateByteOrderMark(true);
// start of document and ride
out << "{\n\t\"RIDE\":{\n";