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

Fix track order when adding newly added album, via folders page, to playqueue.

Browse Source
This commit is contained in:
craig.p.drummond@gmail.com
2012-08-20 11:36:51 +00:00
committed by craig.p.drummond@gmail.com
parent 7f43f2bfd8
commit be707eaa3c
8 changed files with 58 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
models/dirviewmodel.cpp
View File

@@ -314,13 +314,12 @@ Qt::ItemFlags DirViewModel::flags(const QModelIndex &index) const
}
}
QStringList DirViewModel::filenames(const QModelIndexList &indexes) const
QStringList DirViewModel::filenames(const QModelIndexList &indexes, bool allowPlaylists) const
{
QStringList fnames;
foreach(QModelIndex index, indexes) {
DirViewItem *item = static_cast<DirViewItem *>(index.internalPointer());
recurseDirItems(*item, fnames);
getFiles(static_cast<DirViewItem *>(index.internalPointer()), fnames, allowPlaylists);
}
return fnames;
}
@@ -328,7 +327,7 @@ QStringList DirViewModel::filenames(const QModelIndexList &indexes) const
QMimeData *DirViewModel::mimeData(const QModelIndexList &indexes) const
{
QMimeData *mimeData = new QMimeData();
QStringList files=filenames(indexes);
QStringList files=filenames(indexes, true);
PlayQueueModel::encode(*mimeData, PlayQueueModel::constFileNameMimeType, files);
if (!MPDConnection::self()->getDetails().dir.isEmpty()) {
QStringList paths;
@@ -340,15 +339,39 @@ QMimeData *DirViewModel::mimeData(const QModelIndexList &indexes) const
return mimeData;
}
void DirViewModel::recurseDirItems(DirViewItem &parent, QStringList &filenames) const
static inline void addFile(DirViewItem *item, QStringList &insertInto, QStringList &checkAgainst, bool allowPlaylists)
{
if (parent.childCount() == 0) {
if (!filenames.contains(parent.fullName())) {
filenames << parent.fullName();
}
} else {
for (int i = 0; i < parent.childCount(); i++) {
recurseDirItems(*parent.child(i), filenames);
}
QString path=item->fullName();
if ((allowPlaylists || !MPDConnection::isPlaylist(path)) && !checkAgainst.contains(path)) {
insertInto << path;
}
}
void DirViewModel::getFiles(DirViewItem *item, QStringList &filenames, bool allowPlaylists) const
{
if (!item) {
return;
}
switch (item->type()) {
case DirViewItem::Type_File:
addFile(item, filenames, filenames, allowPlaylists);
break;
case DirViewItem::Type_Dir: {
QStringList dirFiles;
for (int c=0; c<item->childCount(); c++) {
DirViewItem *child=item->child(c);
if (DirViewItem::Type_Dir==child->type()) {
getFiles(child, filenames, allowPlaylists);
} else if (DirViewItem::Type_File==child->type()) {
addFile(child, dirFiles, filenames, allowPlaylists);
}
}
qSort(dirFiles);
filenames+=dirFiles;
}
default:
break;
}
}