Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Recursively add songs in subdirectories to the organise dialog. Broken in revision 35060d6.

This commit is contained in:
David Sansome 2014-04-23 21:06:23 +10:00
parent e8a0c1cd9f
commit 25ee987ec7
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/ui/organisedialog.cpp
View File

@ -130,17 +130,16 @@ int OrganiseDialog::SetSongs(const SongList& songs) {
}
int OrganiseDialog::SetUrls(const QList<QUrl>& urls, quint64 total_size) {
SongList songs;
Song song;
QStringList filenames;
// Only add file:// URLs
for (const QUrl& url : urls) {
if (url.scheme() != "file") continue;
TagReaderClient::Instance()->ReadFileBlocking(url.toLocalFile(), &song);
if (song.is_valid()) songs << song;
if (url.scheme() == "file") {
filenames << url.toLocalFile();
}
}
return SetSongs(songs);
return SetFilenames(filenames);
}
int OrganiseDialog::SetFilenames(const QStringList& filenames,
@ -148,8 +147,20 @@ int OrganiseDialog::SetFilenames(const QStringList& filenames,
SongList songs;
Song song;
// Load some of the songs to show in the preview
for (const QString& filename : filenames) {
QStringList filenames_copy = filenames;
while (!filenames_copy.isEmpty()) {
const QString filename = filenames_copy.takeFirst();
// If it's a directory, add all the files inside.
if (QFileInfo(filename).isDir()) {
const QDir dir(filename);
foreach (const QString& entry, dir.entryList(
QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot | QDir::Readable)) {
filenames_copy << dir.filePath(entry);
}
continue;
}
TagReaderClient::Instance()->ReadFileBlocking(filename, &song);
if (song.is_valid()) songs << song;
}