banshee r4257 - in trunk/banshee: . src/Extensions/Banshee.CoverArt/Banshee.CoverArt

[gburt svn gnome org]

Author: gburt
Date: Fri Jul 25 22:19:41 2008
New Revision: 4257
URL: http://svn.gnome.org/viewvc/banshee?rev=4257&view=rev

Log:
2008-07-25  Gabriel Burt  <gabriel burt gmail com>

	* src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs: Ok,
	last fix for Cover Art, I swear.  Thought I'd fixed all the sql issues in
	the last commit, but hadn't - this one should really fix BGO #541469.


Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs

Modified: trunk/banshee/src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs	(original)
+++ trunk/banshee/src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs	Fri Jul 25 22:19:41 2008
@@ -59,12 +59,12 @@
 
         private static string query = @"
                 SELECT {0}
-                FROM CoreAlbums, CoreArtists, CoreTracks
+                FROM CoreTracks, CoreAlbums, CoreArtists
                 WHERE
-                    CoreAlbums.ArtistID = CoreArtists.ArtistID AND
-                    CoreTracks.AlbumID = CoreAlbums.AlbumID AND
-                    CoreTracks.DateUpdatedStamp > ? AND
                     CoreTracks.PrimarySourceID = ? AND
+                    CoreTracks.DateUpdatedStamp > ? AND
+                    CoreTracks.AlbumID = CoreAlbums.AlbumID AND 
+                    CoreAlbums.ArtistID = CoreArtists.ArtistID AND
                     CoreTracks.AlbumID NOT IN (
                         SELECT AlbumID FROM CoverArtDownloads WHERE
                             LastAttempt > ? OR Downloaded = 1)
@@ -102,7 +102,7 @@
         private IDataReader RunQuery ()
         {
             return ServiceManager.DbConnection.Query (select_query,
-                last_scan, ServiceManager.SourceManager.MusicLibrary.DbId, last_scan - retry_every, BatchSize
+                ServiceManager.SourceManager.MusicLibrary.DbId, last_scan, last_scan - retry_every, BatchSize
             );
         }
         
@@ -117,7 +117,7 @@
             try {
                 DatabaseTrackInfo track = new DatabaseTrackInfo ();
                 while (true) {
-                    total = current + ServiceManager.DbConnection.Query<int> (count_query, last_scan, ServiceManager.SourceManager.MusicLibrary.DbId, last_scan - retry_every);
+                    total = current + ServiceManager.DbConnection.Query<int> (count_query, ServiceManager.SourceManager.MusicLibrary.DbId, last_scan, last_scan - retry_every);
                     if (total == 0 || total <= current) {
                         break;
                     }