iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Show playlist files in library and album views.

Browse Source 
BUG:27
This commit is contained in:
craig.p.drummond@gmail.com
2012-06-12 11:16:37 +00:00
committed by craig.p.drummond@gmail.com
parent ea969ce1d0
commit 692bbf6590
18 changed files with 168 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mpd/mpdparseutils.cpp
View File

@@ -43,6 +43,7 @@
#include "output.h"
#include "covers.h"
#include "httpserver.h"
#include "utils.h"
#include "debugtimer.h"
QString MPDParseUtils::fixPath(const QString &f)
@@ -227,10 +228,15 @@ Song MPDParseUtils::parseSong(const QByteArray &data)
song.genre = value;
} else if (element == QLatin1String("Name")) {
song.name = value;
} else if (element == QLatin1String("playlist")) {
song.file = value;
song.file.replace("\"", "\\\"");
song.title=Utils::getFile(song.file);
song.type=Song::Playlist;
}
}
if (song.genre.isEmpty()) {
if (Song::Playlist!=song.type && song.genre.isEmpty()) {
song.genre = i18n("Unknown");
}
@@ -366,14 +372,22 @@ MusicLibraryItemRoot * MPDParseUtils::parseLibraryItems(const QByteArray &data)
int amountOfLines = lines.size();
MusicLibraryItemArtist *artistItem = 0;
MusicLibraryItemAlbum *albumItem = 0;
MusicLibraryItemSong *songItem = 0;
for (int i = 0; i < amountOfLines; i++) {
currentItem += lines.at(i);
currentItem += "\n";
if (i == lines.size() - 1 || lines.at(i + 1).startsWith("file:")) {
if (i == lines.size() - 1 || lines.at(i + 1).startsWith("file:") || lines.at(i + 1).startsWith("playlist:")) {
Song currentSong = parseSong(currentItem);
currentItem.clear();
if (Song::Playlist==currentSong.type) {
if (songItem && Utils::getDir(songItem->file())==Utils::getDir(currentSong.file)) {
songItem = new MusicLibraryItemSong(currentSong, albumItem);
albumItem->append(songItem);
}
continue;
}
if (currentSong.isEmpty()) {
continue;
}
@@ -386,7 +400,7 @@ MusicLibraryItemRoot * MPDParseUtils::parseLibraryItems(const QByteArray &data)
albumItem = artistItem->album(currentSong);
}
MusicLibraryItemSong *songItem = new MusicLibraryItemSong(currentSong, albumItem);
songItem = new MusicLibraryItemSong(currentSong, albumItem);
albumItem->append(songItem);
albumItem->addGenre(currentSong.genre);
artistItem->addGenre(currentSong.genre);