[Pkg-cli-apps-commits] [SCM] banshee branch, master, updated. debian/1.4.3-6-2-g093ac59

[Chow Loong Jin]

The following commit has been merged in the master branch:
commit 093ac59706aeefc794fab4ad035b0a510c9b5a11
Author: Chow Loong Jin <hyperair at gmail.com>
Date:   Fri Oct 2 18:01:57 2009 +0800

    Fix 100% CPU usage during cover art fetching (LP: #340436)
    
    * debian/patches/21_cover-art-cpu-fix.patch:
      + Fix 100% CPU usage during cover art fetching (LP: #340436)

diff --git a/debian/changelog b/debian/changelog
index fd83f39..a3f0735 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ banshee (1.4.3-7) UNRELEASED; urgency=low
   * debian/control, debian/changelog:
     + Use mono-csc instead of csc for MCS.
     + Bump mono-devel version to 2.4.2 for mono-csc
+  * debian/patches/21_cover-art-cpu-fix.patch:
+    + Fix 100% CPU usage during cover art fetching (LP: #340436)
 
- -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 15 Aug 2009 01:53:40 +0800
+ -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 02 Oct 2009 18:01:07 +0800
 
 banshee (1.4.3-6) unstable; urgency=low
 
diff --git a/debian/patches/21_cover-art-cpu-fix.patch b/debian/patches/21_cover-art-cpu-fix.patch
new file mode 100644
index 0000000..36661c8
--- /dev/null
+++ b/debian/patches/21_cover-art-cpu-fix.patch
@@ -0,0 +1,37 @@
+From ab8d6c6ca4b7e5b4d1dccf414cd14fdef06a026f Mon Sep 17 00:00:00 2001
+From: Bertrand Lorentz <bertrand.lorentz at gmail.com>
+Date: Wed, 21 Jan 2009 21:34:03 +0000
+Subject: [PATCH] Change the count query to avoid an infinite loop (BGO #548131).
+
+2009-01-21  Bertrand Lorentz  <bertrand.lorentz at gmail.com>
+
+	* src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:
+	Change the count query to avoid an infinite loop (BGO #548131).
+
+
+svn path=/trunk/banshee/; revision=4935
+---
+ .../Banshee.CoverArt/CoverArtJob.cs                |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs b/src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs
+index caa0db5..b154a18 100644
+--- a/src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs
++++ b/src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs
+@@ -58,10 +58,12 @@ namespace Banshee.CoverArt
+ 
+         private static HyenaSqliteCommand count_query = new HyenaSqliteCommand (@"
+             SELECT count(DISTINCT CoreTracks.AlbumID)
+-            FROM CoreTracks
++            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)");
+-- 
+1.6.3.3
+
diff --git a/debian/patches/series b/debian/patches/series
index decba2d..8685a88 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,5 @@
 03_fix-lastfm.patch
 03_muinshee-booter.patch
 20_check_notification_support.patch
+21_cover-art-cpu-fix.patch
 99_ltmain_as-needed.patch

-- 
banshee