Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix playlist parsing for iTunes M3U 

Fixes issue #736
This is really Apple's fault for bizarrely using \r for line endings.
This commit is contained in:
John Maguire 2010-09-13 16:31:42 +00:00
parent 4570d891f2
commit b0e1a516a9
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/playlistparsers/m3uparser.cpp
View File

@ -16,6 +16,7 @@
#include "m3uparser.h"
#include <QBuffer>
#include <QtDebug>
M3UParser::M3UParser(QObject* parent)
@ -29,14 +30,22 @@ SongList M3UParser::Load(QIODevice* device, const QDir& dir) const {
M3UType type = STANDARD;
Metadata current_metadata;
QString line = QString::fromUtf8(device->readLine()).trimmed();
QString data = QString::fromUtf8(device->readAll());
data.replace('\r', '\n');
QByteArray bytes = data.toUtf8();
QBuffer buffer(&bytes);
buffer.open(QIODevice::ReadOnly);
QString line = QString::fromUtf8(buffer.readLine()).trimmed();
qDebug() << line;
if (line.startsWith("#EXTM3U")) {
// This is in extended M3U format.
type = EXTENDED;
line = QString::fromUtf8(device->readLine()).trimmed();
line = QString::fromUtf8(buffer.readLine()).trimmed();
}
forever {
qDebug() << line;
if (line.startsWith('#')) {
// Extended info or comment.
if (type == EXTENDED && line.startsWith("#EXT")) {
@ -62,10 +71,10 @@ SongList M3UParser::Load(QIODevice* device, const QDir& dir) const {
current_metadata.length = -1;
}
}
if (device->atEnd()) {
if (buffer.atEnd()) {
break;
}
line = QString::fromUtf8(device->readLine()).trimmed();
line = QString::fromUtf8(buffer.readLine()).trimmed();
}
return ret;