Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update all songs for the same directory+album when updating compilations

Browse Source 
- Fixes a bug where the songs are stuck in various artists, because the
album has child songs, it will be stuck with various artists as the
parent node.
This commit is contained in:
Jonas Kvinge 2019-11-25 00:28:49 +01:00
parent 089a2271c2
commit bf35665932
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/collection/collectionbackend.cpp
View File

@ -284,12 +284,6 @@ void CollectionBackend::AddDirectory(const QString &path) {
QString canonical_path = QFileInfo(path).canonicalFilePath(); QString canonical_path = QFileInfo(path).canonicalFilePath();
QString db_path = canonical_path; QString db_path = canonical_path;
if (Application::kIsPortable && Utilities::UrlOnSameDriveAsStrawberry(QUrl::fromLocalFile(canonical_path))) {
db_path = Utilities::GetRelativePathToStrawberryBin(QUrl::fromLocalFile(db_path)).toLocalFile();
qLog(Debug) << "db_path" << db_path;
}
QMutexLocker l(db_->Mutex()); QMutexLocker l(db_->Mutex());
QSqlDatabase db(db_->Connect()); QSqlDatabase db(db_->Connect());
@ -780,11 +774,11 @@ SongList CollectionBackend::GetSongsById(const QStringList &ids, QSqlDatabase &d
} }
Song CollectionBackend::GetSongByUrl(const QUrl &url, qint64 beginning) { Song CollectionBackend::GetSongByUrl(const QUrl &url, const qint64 beginning) {
CollectionQuery query; CollectionQuery query;
query.SetColumnSpec("%songs_table.ROWID, " + Song::kColumnSpec); query.SetColumnSpec("%songs_table.ROWID, " + Song::kColumnSpec);
query.AddWhere("url", url.toString()); query.AddWhere("url", url.toString(QUrl::FullyEncoded));
query.AddWhere("beginning", beginning); query.AddWhere("beginning", beginning);
Song song(source_); Song song(source_);
@ -799,7 +793,7 @@ SongList CollectionBackend::GetSongsByUrl(const QUrl &url) {
CollectionQuery query; CollectionQuery query;
query.SetColumnSpec("%songs_table.ROWID, " + Song::kColumnSpec); query.SetColumnSpec("%songs_table.ROWID, " + Song::kColumnSpec);
query.AddWhere("url", url.toString()); query.AddWhere("url", url.toString(QUrl::FullyEncoded));
SongList songlist; SongList songlist;
if (ExecQuery(&query)) { if (ExecQuery(&query)) {
@ -923,7 +917,7 @@ void CollectionBackend::UpdateCompilations() {
// Now mark the songs that we think are in compilations // Now mark the songs that we think are in compilations
QSqlQuery find_song(db); QSqlQuery find_song(db);
find_song.prepare(QString("SELECT ROWID, " + Song::kColumnSpec + " FROM %1 WHERE url = :url AND compilation_detected = :compilation_detected AND unavailable = 0").arg(songs_table_)); find_song.prepare(QString("SELECT ROWID, " + Song::kColumnSpec + " FROM %1 WHERE url = :url AND unavailable = 0").arg(songs_table_));
QSqlQuery update_song(db); QSqlQuery update_song(db);
update_song.prepare(QString("UPDATE %1 SET compilation_detected = :compilation_detected, compilation_effective = ((compilation OR :compilation_detected OR compilation_on) AND NOT compilation_off) + 0 WHERE url = :url AND unavailable = 0").arg(songs_table_)); update_song.prepare(QString("UPDATE %1 SET compilation_detected = :compilation_detected, compilation_effective = ((compilation OR :compilation_detected OR compilation_on) AND NOT compilation_off) + 0 WHERE url = :url AND unavailable = 0").arg(songs_table_));
@ -964,8 +958,8 @@ void CollectionBackend::UpdateCompilations(QSqlQuery &find_song, QSqlQuery &upda
// Get song, so we can tell the model its updated // Get song, so we can tell the model its updated
find_song.bindValue(":url", url.toString(QUrl::FullyEncoded)); find_song.bindValue(":url", url.toString(QUrl::FullyEncoded));
find_song.bindValue(":compilation_detected", int(!compilation_detected));
find_song.exec(); find_song.exec();
while (find_song.next()) { while (find_song.next()) {
Song song(source_); Song song(source_);
song.InitFromQuery(find_song, true); song.InitFromQuery(find_song, true);

2
src/collection/collectionbackend.h
View File

@ -109,7 +109,7 @@ class CollectionBackendInterface : public QObject {
virtual SongList GetSongsByUrl(const QUrl &url) = 0; virtual SongList GetSongsByUrl(const QUrl &url) = 0;
// Returns a section of a song with the given filename and beginning. If the section is not present in collection, returns invalid song. // Returns a section of a song with the given filename and beginning. If the section is not present in collection, returns invalid song.
// Using default beginning value is suitable when searching for single-section songs. // Using default beginning value is suitable when searching for single-section songs.
virtual Song GetSongByUrl(const QUrl &url, qint64 beginning = 0) = 0; virtual Song GetSongByUrl(const QUrl &url, const qint64 beginning = 0) = 0;
virtual void AddDirectory(const QString &path) = 0; virtual void AddDirectory(const QString &path) = 0;
virtual void RemoveDirectory(const Directory &dir) = 0; virtual void RemoveDirectory(const Directory &dir) = 0;