mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-07-31 11:20:22 +02:00
Code Issues Releases Wiki Activity

Merge pull request #273 from hansschmucker/master

Browse Source 
Use albumartist in DatabaseCommand_AddFiles
This commit is contained in:
Christian Muehlhaeuser
2014-11-21 20:44:20 +01:00
parent 9c4b486a44 68af1d1e4b
commit 90437a7666
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libtomahawk/database/DatabaseCommand_AddFiles.cpp
View File

@@ -94,7 +94,7 @@ DatabaseCommand_AddFiles::exec( DatabaseImpl* dbi )
QVariant& v = *it; QVariant& v = *it;
QVariantMap m = v.toMap(); QVariantMap m = v.toMap();
int fileid = 0, artistid = 0, albumid = 0, trackid = 0, composerid = 0; int fileid = 0, artistid = 0, albumartistid = 0, albumid = 0, trackid = 0, composerid = 0;
QString url = m.value( "url" ).toString(); QString url = m.value( "url" ).toString();
int mtime = m.value( "mtime" ).toInt(); int mtime = m.value( "mtime" ).toInt();
@@ -104,6 +104,7 @@ DatabaseCommand_AddFiles::exec( DatabaseImpl* dbi )
uint duration = m.value( "duration" ).toUInt(); uint duration = m.value( "duration" ).toUInt();
uint bitrate = m.value( "bitrate" ).toUInt(); uint bitrate = m.value( "bitrate" ).toUInt();
QString artist = m.value( "artist" ).toString(); QString artist = m.value( "artist" ).toString();
QString albumartist = m.value( "albumartist" ).toString();
QString album = m.value( "album" ).toString(); QString album = m.value( "album" ).toString();
QString track = m.value( "track" ).toString(); QString track = m.value( "track" ).toString();
uint albumpos = m.value( "albumpos" ).toUInt(); uint albumpos = m.value( "albumpos" ).toUInt();
@@ -130,13 +131,20 @@ DatabaseCommand_AddFiles::exec( DatabaseImpl* dbi )
// this is the qvariant(map) the remote will get // this is the qvariant(map) the remote will get
v = m; v = m;
// add the album artist to the artist database.
if( !albumartist.trimmed().isEmpty() )
albumartistid = dbi->artistId( albumartist, true );
if( !artist.trimmed().isEmpty() )
artistid = dbi->artistId( artist, true ); artistid = dbi->artistId( artist, true );
if ( artistid < 1 ) if ( artistid < 1 )
continue; continue;
trackid = dbi->trackId( artistid, track, true ); trackid = dbi->trackId( artistid, track, true );
if ( trackid < 1 ) if ( trackid < 1 )
continue; continue;
albumid = dbi->albumId( artistid, album, true );
// If there's an album artist, use it. Otherwise use the track artist
albumid = dbi->albumId( albumartistid > 0 ? albumartistid : artistid, album, true );
if( !composer.trimmed().isEmpty() ) if( !composer.trimmed().isEmpty() )
composerid = dbi->artistId( composer, true ); composerid = dbi->artistId( composer, true );