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

[abock svn gnome org]

Author: abock
Date: Tue Jul 29 20:33:55 2008
New Revision: 4292
URL: http://svn.gnome.org/viewvc/banshee?rev=4292&view=rev

Log:
2008-07-29  Aaron Bockover  <abock gnome org>

    * src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:
    Reworked the count query so that it really is fast now



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	Tue Jul 29 20:33:55 2008
@@ -57,27 +57,28 @@
         private DateTime last_scan = DateTime.MinValue;
         private TimeSpan retry_every = TimeSpan.FromDays (7);
 
-        private static string query = @"
-                SELECT {0}
-                FROM CoreTracks, CoreAlbums, CoreArtists
-                WHERE
-                    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)
-                {1}";
-
-        private static HyenaSqliteCommand count_query = new HyenaSqliteCommand (String.Format (query,
-            "count(DISTINCT CoreAlbums.AlbumID)", null
-        ));
-
-        private static HyenaSqliteCommand select_query = new HyenaSqliteCommand (String.Format (query,
-            "DISTINCT CoreAlbums.AlbumID, CoreAlbums.Title, CoreArtists.Name, CoreTracks.Uri",
-            "GROUP BY CoreTracks.AlbumID LIMIT ?"
-        ));
+        private static HyenaSqliteCommand count_query = new HyenaSqliteCommand (@"
+            SELECT count(DISTINCT CoreTracks.AlbumID)
+            FROM CoreTracks
+            WHERE
+                CoreTracks.PrimarySourceID = ? AND
+                CoreTracks.DateUpdatedStamp > ? AND
+                CoreTracks.AlbumID NOT IN (
+                    SELECT AlbumID FROM CoverArtDownloads WHERE
+                        LastAttempt > ? OR Downloaded = 1)");
+
+        private static HyenaSqliteCommand select_query = new HyenaSqliteCommand (@"
+            SELECT DISTINCT CoreAlbums.AlbumID, CoreAlbums.Title, CoreArtists.Name, CoreTracks.Uri
+            FROM CoreTracks, CoreArtists, CoreAlbums
+            WHERE
+                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)
+            GROUP BY CoreTracks.AlbumID LIMIT ?");
         
         public CoverArtJob (DateTime lastScan) : base (Catalog.GetString ("Downloading Cover Art"))
         {