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

If a cue file references a non-existant file, then dont use cue file.

Browse Source 
BUG: 256
This commit is contained in:
craig.p.drummond@gmail.com
2013-07-17 11:07:09 +00:00
committed by craig.p.drummond@gmail.com
parent 2b6064492d
commit 58287ed7bc
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mpd/mpdparseutils.cpp
View File

@@ -407,9 +407,24 @@ MusicLibraryItemRoot * MPDParseUtils::parseLibraryItems(const QByteArray &data,
QSet<QString> cueFiles; // List of source (flac, mp3, etc) files referenced in cue file
DBUG << "Got playlist item" << currentSong.file << "prevFile:" << prevSongFile;
if (canSplitCue && currentSong.file.endsWith(".cue", Qt::CaseInsensitive) && CueFile::parse(currentSong.file, mpdDir, cueSongs, cueFiles) &&
if (canSplitCue && currentSong.file.endsWith(".cue", Qt::CaseInsensitive) && !mpdDir.startsWith("http://") &&
CueFile::parse(currentSong.file, mpdDir, cueSongs, cueFiles) &&
(cueFiles.count()<cueSongs.count() || (albumItem && albumItem->data()==unknown && albumItem->parentItem()->data()==unknown))) {
DBUG << "Parsed file, songs:" << cueSongs.count() << "files:" << cueFiles;
bool canUseThisCueFile=true;
foreach (const Song &s, cueSongs) {
if (!QFile::exists(mpdDir+s.name)) {
DBUG << QString(mpdDir+s.name) << "is referenced in cue file, but does not exist in MPD folder";
canUseThisCueFile=false;
break;
}
}
if (!canUseThisCueFile) {
continue;
}
bool canUseCueFileTracks=false;
QList<Song> fixedCueSongs; // Songs taken from cueSongs that have been updated...