mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-11 00:24:12 +02:00
Code Issues Releases Wiki Activity

Use album-artist if available.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2014-11-21 21:04:05 +01:00
parent 90437a7666
commit 235ecc66b4
1 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -96,21 +96,21 @@ DatabaseCommand_AddFiles::exec( DatabaseImpl* dbi )
int fileid = 0, artistid = 0, albumartistid = 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(); const QString url = m.value( "url" ).toString();
int mtime = m.value( "mtime" ).toInt(); const int mtime = m.value( "mtime" ).toInt();
uint size = m.value( "size" ).toUInt(); const uint size = m.value( "size" ).toUInt();
QString hash = m.value( "hash" ).toString(); const QString hash = m.value( "hash" ).toString();
QString mimetype = m.value( "mimetype" ).toString(); const QString mimetype = m.value( "mimetype" ).toString();
uint duration = m.value( "duration" ).toUInt(); const uint duration = m.value( "duration" ).toUInt();
uint bitrate = m.value( "bitrate" ).toUInt(); const uint bitrate = m.value( "bitrate" ).toUInt();
QString artist = m.value( "artist" ).toString(); const QString artist = m.value( "artist" ).toString();
QString albumartist = m.value( "albumartist" ).toString(); const QString albumartist = m.value( "albumartist" ).toString();
QString album = m.value( "album" ).toString(); const QString album = m.value( "album" ).toString();
QString track = m.value( "track" ).toString(); const QString track = m.value( "track" ).toString();
uint albumpos = m.value( "albumpos" ).toUInt(); const uint albumpos = m.value( "albumpos" ).toUInt();
QString composer = m.value( "composer" ).toString(); const QString composer = m.value( "composer" ).toString();
uint discnumber = m.value( "discnumber" ).toUInt(); const uint discnumber = m.value( "discnumber" ).toUInt();
int year = m.value( "year" ).toInt(); const int year = m.value( "year" ).toInt();
query_file.bindValue( 0, srcid ); query_file.bindValue( 0, srcid );
query_file.bindValue( 1, url ); query_file.bindValue( 1, url );
@@ -132,21 +132,20 @@ DatabaseCommand_AddFiles::exec( DatabaseImpl* dbi )
v = m; v = m;
// add the album artist to the artist database. // add the album artist to the artist database.
if( !albumartist.trimmed().isEmpty() ) if ( !albumartist.trimmed().isEmpty() )
albumartistid = dbi->artistId( albumartist, true ); albumartistid = dbi->artistId( albumartist, true );
if( !artist.trimmed().isEmpty() ) 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;
// If there's an album artist, use it. Otherwise use the track artist // If there's an album artist, use it. Otherwise use the track artist
albumid = dbi->albumId( albumartistid > 0 ? albumartistid : artistid, album, true ); 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 );
// Now add the association // Now add the association