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

Fix album name after read from cache

Browse Source
This commit is contained in:
craig.p.drummond
2013-08-23 16:32:01 +00:00
parent c404b03916
commit 2bd038f3a6
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
models/musiclibraryitemroot.cpp
View File

@@ -405,7 +405,7 @@ void MusicLibraryItemRoot::toXML(QXmlStreamWriter &writer, const QDateTime &date
const MusicLibraryItemAlbum *album = static_cast<const MusicLibraryItemAlbum *>(al);
QString albumGenre=!album->childItems().isEmpty() ? static_cast<const MusicLibraryItemSong *>(album->childItems().at(0))->song().genre : QString();
writer.writeStartElement(constAlbumElement);
writer.writeAttribute(constNameAttribute, album->data());
writer.writeAttribute(constNameAttribute, album->originalName().isEmpty() ? album->data() : album->originalName());
writer.writeAttribute(constYearAttribute, QString::number(album->year()));
if (!albumGenre.isEmpty() && albumGenre!=unknown) {
writer.writeAttribute(constGenreAttribute, albumGenre);
@@ -415,9 +415,6 @@ void MusicLibraryItemRoot::toXML(QXmlStreamWriter &writer, const QDateTime &date
} else if (album->isMultipleArtists()) {
writer.writeAttribute(constMultipleArtistsAttribute, constTrueValue);
}
if (!album->originalName().isEmpty()) {
writer.writeAttribute(constActualAttribute, album->originalName());
}
if (!album->imageUrl().isEmpty()) {
writer.writeAttribute(constImageAttribute, album->imageUrl());
}
@@ -587,10 +584,6 @@ quint32 MusicLibraryItemRoot::fromXML(QXmlStreamReader &reader, const QDateTime
} else {
song.type=Song::Standard;
}
QString actual=attributes.value(constActualAttribute).toString();
if (!actual.isEmpty()) {
song.album=actual;
}
} else if (constTrackElement==element) {
song.title=attributes.value(constNameAttribute).toString();
song.file=attributes.value(constFileAttribute).toString();