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

playlistparsers: Handle m3u UTF-16 playlists. 

Rather than assume UTF-8, use QTextStream to read data. This checks the
byte order mark of the file to determine encoding.

As an optimization, since the playlist already needs to be searched for \r
characters, just create a string list and work from that.
This commit is contained in:
Jim Broadus 2021-05-10 13:19:22 -07:00 committed by John Maguire
parent d16d9ba282
commit 9bfd458b15
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/playlistparsers/m3uparser.cpp
View File

@ -18,6 +18,8 @@
#include "m3uparser.h" #include "m3uparser.h"
#include <QBuffer> #include <QBuffer>
#include <QRegExp>
#include <QTextCodec>
#include <QtDebug> #include <QtDebug>
#include "core/logging.h" #include "core/logging.h"
@ -34,22 +36,21 @@ SongList M3UParser::Load(QIODevice* device, const QString& playlist_path,
M3UType type = STANDARD; M3UType type = STANDARD;
Metadata current_metadata; Metadata current_metadata;
QString data = QString::fromUtf8(device->readAll()); // Unicode auto-detection is enabled in QTextStream by default.
data.replace('\r', '\n'); QTextStream playlist_stream(device);
data.replace("\n\n", "\n"); QString data = playlist_stream.readAll();
QByteArray bytes = data.toUtf8(); qLog(Debug) << "Detected codec" << playlist_stream.codec()->name();
QBuffer buffer(&bytes);
buffer.open(QIODevice::ReadOnly);
QString line = QString::fromUtf8(buffer.readLine()).trimmed(); // iTune playlists use \r newlines. These aren't handled by the Qt readLine
if (line.startsWith("#EXTM3U")) { // methods.
// This is in extended M3U format. QStringList lines = data.split(QRegExp("\n|\r|\r\n"));
type = EXTENDED;
line = QString::fromUtf8(buffer.readLine()).trimmed();
}
forever { for (int i = 0; i < lines.count(); i++) {
if (line.startsWith('#')) { QString line = lines[i].trimmed();
if (i == 0 && line.startsWith("#EXTM3U")) {
// This is in extended M3U format.
type = EXTENDED;
} else if (line.startsWith('#')) {
// Extended info or comment. // Extended info or comment.
if (type == EXTENDED && line.startsWith("#EXT")) { if (type == EXTENDED && line.startsWith("#EXT")) {
if (!ParseMetadata(line, &current_metadata)) { if (!ParseMetadata(line, &current_metadata)) {
@ -71,10 +72,6 @@ SongList M3UParser::Load(QIODevice* device, const QString& playlist_path,
current_metadata = Metadata(); current_metadata = Metadata();
} }
if (buffer.atEnd()) {
break;
}
line = QString::fromUtf8(buffer.readLine()).trimmed();
} }
return ret; return ret;