Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
mirror of https://github.com/clementine-player/Clementine synced 2025-01-31 03:27:40 +01:00
Code Issues Releases Wiki Activity

Use url when checking if a file is already in DB instead of filename when loading files (this usecase has been missed when we have decide to use urls everywhere)

Browse Source
This commit is contained in:
Arnaud Bienner 2011-08-18 22:43:52 +02:00
parent f33b62a877
commit f319a615d9
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/songloader.cpp
View File

@ -256,11 +256,11 @@ SongLoader::Result SongLoader::LoadLocal(const QString& filename, bool block,
}
// Not a playlist, so just assume it's a song
QFileInfo info(filename);
QUrl url = QUrl::fromLocalFile(filename);
LibraryQuery query;
query.SetColumnSpec("%songs_table.ROWID, " + Song::kColumnSpec);
query.AddWhere("filename", info.canonicalFilePath());
query.AddWhere("filename", url.toString());
SongList song_list;
@ -302,12 +302,10 @@ SongLoader::Result SongLoader::LoadLocal(const QString& filename, bool block,
void SongLoader::EffectiveSongsLoad() {
for (int i = 0; i < songs_.size(); i++) {
Song& song = songs_[i];
QString filename = song.url().toLocalFile();
QFileInfo info(filename);
LibraryQuery query;
query.SetColumnSpec("%songs_table.ROWID, " + Song::kColumnSpec);
query.AddWhere("filename", info.canonicalFilePath());
query.AddWhere("filename", song.url().toString());
if (library_->ExecQuery(&query) && query.Next()) {
// we may have many results when the file has many sections
@ -316,6 +314,7 @@ void SongLoader::EffectiveSongsLoad() {
} while(query.Next());
} else {
// it's a normal media file
QString filename = song.url().toLocalFile();
song.InitFromFile(filename, -1);
}
}