Commit 67f5c1ae authored by Björn Steinbrink's avatar Björn Steinbrink Committed by Matěj Laitl
Browse files

Fix failure to rip CD tracks with special characters in their title

Certain characters such as ? have a special meaning in URLs so they have
to be encoded when used in path component, but the AudioCdCollection
fails to do so and just embeds the raw track title into the URL. Thus it
is impossible to rip tracks that contain such characters in their title,
as the URL passed to the KIO subsystem is invalid.

BUG: 224437
FIXED-IN: 2.6
REVIEW: 103841
parent 8d103cf3
......@@ -30,6 +30,8 @@ Version 2.6-Beta 1
"1.2 GB free" is shown instead of "85% used"; thicker capacity bar.
BUGFIXES:
* Allow ripping of CD tracks with special characters in name tranks to
Björn Steinbrink. (BR 224437)
* Don't show organize collection when dropping track on non-collection
entry in Collection Browser. (BR 291068)
* Fix scrollarea following keyboard navigation. (BR 259791)
......
......@@ -84,12 +84,15 @@ AudioCdCollection::~AudioCdCollection()
KUrl
AudioCdCollection::audiocdUrl( const QString & path ) const
AudioCdCollection::audiocdUrl( const QString &path ) const
{
if (m_device.isNull())
return KUrl( QString( "audiocd:/" + path ) );
else
return KUrl( QString( "audiocd:/%1?device=%2" ).arg( path ).arg( m_device ) );
KUrl url("audiocd:/");
url.addPath( path );
if( !m_device.isEmpty() )
url.addQueryItem( "device", m_device );
return url;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment