Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
mirror of https://github.com/clementine-player/Clementine synced 2025-01-11 01:14:24 +01:00
Code Issues Releases Wiki Activity

playlistparser: Add error mechanism for parsers.

Browse Source 
Add a new Error signal to parser implementations. Display an error when
user tries to use the unimplemented CueParser::Save.
This commit is contained in:
Jim Broadus 2021-06-10 21:23:57 -07:00 committed by John Maguire
parent f4108b5a0c
commit 4e4fccc07a
4 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/playlistparsers/cueparser.cpp
View File

@ -348,7 +348,9 @@ qint64 CueParser::IndexToMarker(const QString& index) const {
void CueParser::Save(const SongList& songs, QIODevice* device, const QDir& dir, void CueParser::Save(const SongList& songs, QIODevice* device, const QDir& dir,
Playlist::Path path_type) const { Playlist::Path path_type) const {
// TODO // TODO: Not yet implemented. Cue files represent tracks within a single
// file, so the song list would need to be composed properly.
emit Error(tr("Saving cue files is not yet supported."));
} }
// Looks for a track starting with one of the .cue's keywords. // Looks for a track starting with one of the .cue's keywords.

3
src/playlistparsers/parserbase.h
View File

@ -55,6 +55,9 @@ class ParserBase : public QObject {
const SongList& songs, QIODevice* device, const QDir& dir = QDir(), const SongList& songs, QIODevice* device, const QDir& dir = QDir(),
Playlist::Path path_type = Playlist::Path_Automatic) const = 0; Playlist::Path path_type = Playlist::Path_Automatic) const = 0;
signals:
void Error(const QString& msg) const;
protected: protected:
// Loads a song. If filename_or_url is a URL (with a scheme other than // Loads a song. If filename_or_url is a URL (with a scheme other than
// "file") then it is set on the song and the song marked as a stream. // "file") then it is set on the song and the song marked as a stream.

19
src/playlistparsers/playlistparser.cpp
View File

@ -35,13 +35,18 @@ PlaylistParser::PlaylistParser(LibraryBackendInterface* library,
QObject* parent) QObject* parent)
: QObject(parent) { : QObject(parent) {
default_parser_ = new XSPFParser(library, this); default_parser_ = new XSPFParser(library, this);
parsers_ << new M3UParser(library, this); AddParser(new M3UParser(library, this));
parsers_ << default_parser_; AddParser(default_parser_);
parsers_ << new PLSParser(library, this); AddParser(new PLSParser(library, this));
parsers_ << new ASXParser(library, this); AddParser(new ASXParser(library, this));
parsers_ << new AsxIniParser(library, this); AddParser(new AsxIniParser(library, this));
parsers_ << new CueParser(library, this); AddParser(new CueParser(library, this));
parsers_ << new WplParser(library, this); AddParser(new WplParser(library, this));
}
void PlaylistParser::AddParser(ParserBase* parser) {
parsers_ << parser;
connect(parser, SIGNAL(Error(QString)), this, SIGNAL(Error(QString)));
} }
QStringList PlaylistParser::file_extensions() const { QStringList PlaylistParser::file_extensions() const {

2
src/playlistparsers/playlistparser.h
View File

@ -59,6 +59,8 @@ class PlaylistParser : public QObject {
void Error(const QString& msg) const; void Error(const QString& msg) const;
private: private:
void AddParser(ParserBase* parser);
QString FilterForParser(const ParserBase* parser, QString FilterForParser(const ParserBase* parser,
QStringList* all_extensions = nullptr) const; QStringList* all_extensions = nullptr) const;