mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-03-13 20:39:57 +01:00
Code Issues Releases Wiki Activity

Fix some QUrl percent encoding problems

Browse Source
This commit is contained in:
Jeff Mitchell 2014-11-06 12:03:28 -05:00
parent f35f5d5af0
commit add736e0ee
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/libtomahawk/utils/TomahawkUtils.cpp
View File

@ -950,7 +950,13 @@ percentEncode( const QUrl& url )
{
QByteArray data = url.toEncoded();
data.replace( "'", "%27" ); // QUrl doesn't encode ', which it doesn't have to. Some apps don't like ' though, and want %27. Both are valid.
// QUrl doesn't encode ', which it doesn't have to. Some apps don't like ' though, and want %27. Both are valid. It also doesn't encode : or ; which it should, so be safer here in general.
data.replace( "'", "%27" );
data.replace( ".", "%2E" );
data.replace( "*", "%2A" );
data.replace( ":", "%3A" );
data.replace( ";", "%3B" );
data.replace( "%20", "+" );
return data;
@ -960,11 +966,18 @@ percentEncode( const QUrl& url )
QByteArray
encodedQuery( const QUrl& url )
{
QByteArray data;
#if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 )
return url.query(QUrl::FullyEncoded).toUtf8();
data = url.query(QUrl::FullyEncoded).toUtf8();
#else
return url.encodedQuery();
data = url.encodedQuery();
#endif
data.replace( "'", "%27" );
data.replace( ".", "%2E" );
data.replace( "*", "%2A" );
data.replace( ":", "%3A" );
data.replace( ";", "%3B" );
return data;
}
} // ns