From c3e92bb25a274719729b7b1be5f9e2904a15ec6b Mon Sep 17 00:00:00 2001 From: dougma Date: Tue, 16 Jun 2009 12:20:59 +0100 Subject: [PATCH] correct behaviour of map_files_without_tags and rename to map_tracks_without_tags --- resolvers/boffin/BoffinDb.h | 4 ++-- resolvers/boffin/Tagger.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resolvers/boffin/BoffinDb.h b/resolvers/boffin/BoffinDb.h index b193053..818a446 100644 --- a/resolvers/boffin/BoffinDb.h +++ b/resolvers/boffin/BoffinDb.h @@ -49,10 +49,10 @@ class BoffinDb // for each track without tags, call f(track_id, artist_sortname, album_sortname, track_sortname) template - void map_files_without_tags(Functor f) + void map_tracks_without_tags(Functor f) { sqlite3pp::query qry(m_db, - "SELECT pd.file_join.track, pd.artist.sortname, pd.album.sortname, pd.track.sortname FROM pd.file_join " + "SELECT DISTINCT pd.file_join.track, pd.artist.sortname, pd.album.sortname, pd.track.sortname FROM pd.file_join " "INNER JOIN pd.artist ON pd.file_join.artist = pd.artist.id " "LEFT JOIN pd.album ON pd.file_join.album = pd.album.id " "INNER JOIN pd.track ON pd.file_join.track = pd.track.id " diff --git a/resolvers/boffin/Tagger.cpp b/resolvers/boffin/Tagger.cpp index 26cd14f..da374f9 100644 --- a/resolvers/boffin/Tagger.cpp +++ b/resolvers/boffin/Tagger.cpp @@ -105,7 +105,7 @@ int main(int argc, char *argv[]) BoffinDb db(argv[2], argv[1]); // build up the request: - db.map_files_without_tags(track_out); + db.map_tracks_without_tags(track_out); ossreq.flush(); issreq = new istringstream(ossreq.str());