From 6b877e3364fe5169afdacb1f554bc95c002a7f08 Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Sat, 21 May 2011 10:02:04 -0400 Subject: [PATCH] Load the year for results. Fixes TWK-183. This will take some thinking post-0.1 as years are stored by trackid right now so if you get a peer's database with a clashing trackid we'll not handle that properly --- src/libtomahawk/database/databasecommand_resolve.cpp | 7 +++++-- src/libtomahawk/database/databaseimpl.cpp | 7 +++++-- src/libtomahawk/result.h | 1 + 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/libtomahawk/database/databasecommand_resolve.cpp b/src/libtomahawk/database/databasecommand_resolve.cpp index 7af53ba26..a9b190ca7 100644 --- a/src/libtomahawk/database/databasecommand_resolve.cpp +++ b/src/libtomahawk/database/databasecommand_resolve.cpp @@ -88,13 +88,15 @@ DatabaseCommand_Resolve::exec( DatabaseImpl* lib ) "file.source, " "file_join.albumpos, " "artist.id as artid, " - "album.id as albid " - "FROM file, file_join, artist, track " + "album.id as albid, " + "track_attributes.v as year " + "FROM file, file_join, artist, track, track_attributes " "LEFT JOIN album ON album.id = file_join.album " "WHERE " "artist.id = file_join.artist AND " "track.id = file_join.track AND " "file.id = file_join.file AND " + "file.id = track_attributes.id AND " "file_join.artist IN (%1) AND " "file_join.track IN (%2)" ) .arg( artsl.join( "," ) ) @@ -140,6 +142,7 @@ DatabaseCommand_Resolve::exec( DatabaseImpl* lib ) result->setRID( uuid() ); result->setAlbumPos( files_query.value( 14 ).toUInt() ); result->setId( files_query.value( 9 ).toUInt() ); + result->setYear( files_query.value( 17 ).toUInt() ); float score = how_similar( m_query, result ); result->setScore( score ); diff --git a/src/libtomahawk/database/databaseimpl.cpp b/src/libtomahawk/database/databaseimpl.cpp index 269ac78d0..b41852ad4 100644 --- a/src/libtomahawk/database/databaseimpl.cpp +++ b/src/libtomahawk/database/databaseimpl.cpp @@ -580,14 +580,16 @@ DatabaseImpl::resultFromHint( const Tomahawk::query_ptr& origquery ) "file.source, " "file_join.albumpos, " "artist.id as artid, " - "album.id as albid " - "FROM file, file_join, artist, track " + "album.id as albid, " + "track_attributes.v as year " + "FROM file, file_join, artist, track, track_attributes " "LEFT JOIN album ON album.id = file_join.album " "WHERE " "artist.id = file_join.artist AND " "track.id = file_join.track AND " "file.source %1 AND " "file_join.file = file.id AND " + "file.id = track_attributes.id AND " "file.url = ?" ).arg( searchlocal ? "IS NULL" : QString( "= %1" ).arg( s->id() ) ); @@ -632,6 +634,7 @@ DatabaseImpl::resultFromHint( const Tomahawk::query_ptr& origquery ) res->setRID( uuid() ); res->setId( query.value( 9 ).toUInt() ); res->setCollection( s->collection() ); + res->setYear( query.value( 17 ).toUInt() ); } return res; diff --git a/src/libtomahawk/result.h b/src/libtomahawk/result.h index ce2c69542..ed4e5cbfd 100644 --- a/src/libtomahawk/result.h +++ b/src/libtomahawk/result.h @@ -87,6 +87,7 @@ public: void setSize( unsigned int size ) { m_size = size; } void setAlbumPos( unsigned int albumpos ) { m_albumpos = albumpos; } void setModificationTime( unsigned int modtime ) { m_modtime = modtime; } + void setYear( unsigned int year ) { m_year = year; } QVariantMap attributes() const { return m_attributes; } void setAttributes( const QVariantMap& map ) { m_attributes = map; updateAttributes(); }