Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
mirror of https://github.com/clementine-player/Clementine synced 2024-12-23 08:20:01 +01:00
Code Issues Releases Wiki Activity

Fix encoding of GError messages when logging. (#6228)

Browse Source 
GError messages contain non-ascii characters. This normally just produces some garbage when we use the default QString contructor that assumes ASCII for logging. However, when a message includes the right double quote, UTF-8 sequence 0xE2 0x80 0x9D, the final byte is OSC. VT100 expects a command sequence to follow and stops echoing output until it sees ST or BEL character, which may never come. Thus, the console output is halted.

This change uses QString::fromLocal8Bit instead of depending on the default constructor. About half of the sites in the codebase had already been converted.

One side effect is that log messages are quoted. There are additional options to control this, but those were only introduced in Qt 5.4.
This commit is contained in:
Jim Broadus 2018-12-02 01:51:19 -08:00 committed by John Maguire
parent 6a37af7b42
commit 95187ed0a1
5 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/songloader.cpp
View File

@ -520,8 +520,8 @@ void SongLoader::ErrorMessageReceived(GstMessage* msg) {
gchar* debugs;
gst_message_parse_error(msg, &error, &debugs);
qLog(Error) << error->message;
qLog(Error) << debugs;
qLog(Error) << QString::fromLocal8Bit(error->message);
qLog(Error) << QString::fromLocal8Bit(debugs);
QString message_str = error->message;

2
src/devices/cddasongloader.cpp
View File

@ -56,7 +56,7 @@ void CddaSongLoader::LoadSongsFromCdda() {
GError* error = nullptr;
cdda_ = gst_element_make_from_uri(GST_URI_SRC, "cdda://", nullptr, &error);
if (error) {
qLog(Error) << error->code << error->message;
qLog(Error) << error->code << QString::fromLocal8Bit(error->message);
}
if (cdda_ == nullptr) {
return;

9
src/devices/giolister.cpp
View File

@ -60,7 +60,8 @@ void OperationFinished(F f, GObject* object, GAsyncResult* result) {
f(obj, result, &error);
if (error) {
qLog(Error) << "Mount/unmount error:" << error->message;
qLog(Error) << "Mount/unmount error:"
<< QString::fromLocal8Bit(error->message);
g_error_free(error);
}
}
@ -381,7 +382,7 @@ void GioLister::DeviceInfo::ReadMountInfo(GMount* mount) {
"," G_FILE_ATTRIBUTE_FILESYSTEM_FREE "," G_FILE_ATTRIBUTE_FILESYSTEM_TYPE,
nullptr, &error);
if (error) {
qLog(Warning) << error->message;
qLog(Warning) << QString::fromLocal8Bit(error->message);
g_error_free(error);
} else {
filesystem_size = g_file_info_get_attribute_uint64(
@ -400,7 +401,7 @@ void GioLister::DeviceInfo::ReadMountInfo(GMount* mount) {
info = g_file_query_info(root, G_FILE_ATTRIBUTE_ID_FILESYSTEM,
G_FILE_QUERY_INFO_NONE, nullptr, &error);
if (error) {
qLog(Warning) << error->message;
qLog(Warning) << QString::fromLocal8Bit(error->message);
g_error_free(error);
} else {
mount_uuid = QString::fromUtf8(g_file_info_get_attribute_string(
@ -513,7 +514,7 @@ void GioLister::UpdateDeviceFreeSpace(const QString& id) {
GFileInfo* info = g_file_query_filesystem_info(
root, G_FILE_ATTRIBUTE_FILESYSTEM_FREE, nullptr, &error);
if (error) {
qLog(Warning) << error->message;
qLog(Warning) << QString::fromLocal8Bit(error->message);
g_error_free(error);
} else {
device_info.filesystem_free = g_file_info_get_attribute_uint64(

5
src/devices/gpoddevice.cpp
View File

@ -113,7 +113,7 @@ bool GPodDevice::CopyToStorage(const CopyJob& job) {
track, QDir::toNativeSeparators(job.source_).toLocal8Bit().constData(),
&error);
if (error) {
qLog(Error) << "copying failed:" << error->message;
qLog(Error) << "copying failed:" << QString::fromUtf8(error->message);
app_->AddError(QString::fromUtf8(error->message));
g_error_free(error);
@ -138,7 +138,8 @@ void GPodDevice::WriteDatabase(bool success) {
GError* error = nullptr;
itdb_write(db_, &error);
if (error) {
qLog(Error) << "writing database failed:" << error->message;
qLog(Error) << "writing database failed:"
<< QString::fromUtf8(error->message);
app_->AddError(QString::fromUtf8(error->message));
g_error_free(error);
} else {

3
src/devices/gpodloader.cpp
View File

@ -53,7 +53,8 @@ void GPodLoader::LoadDatabase() {
// Check for errors
if (!db) {
if (error) {
qLog(Error) << "loading database failed:" << error->message;
qLog(Error) << "loading database failed:"
<< QString::fromUtf8(error->message);
emit Error(QString::fromUtf8(error->message));
g_error_free(error);
} else {