banshee r4464 - in trunk/banshee: . src/Core/Banshee.Services/Banshee.Metadata.Embedded src/Core/Banshee.Services/Banshee.Metadata.FileSystem

[gburt svn gnome org]

Author: gburt
Date: Thu Sep  4 18:27:22 2008
New Revision: 4464
URL: http://svn.gnome.org/viewvc/banshee?rev=4464&view=rev

Log:
2008-09-04  Gabriel Burt  <gabriel burt gmail com>

	* src/Core/Banshee.Services/Banshee.Metadata.Embedded/EmbeddedQueryJob.cs:
	* src/Core/Banshee.Services/Banshee.Metadata.FileSystem/FileSystemQueryJob.cs:
	Handle more gracefully the case that the directory or file is missing.



Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Core/Banshee.Services/Banshee.Metadata.Embedded/EmbeddedQueryJob.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.Metadata.FileSystem/FileSystemQueryJob.cs

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Metadata.Embedded/EmbeddedQueryJob.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Metadata.Embedded/EmbeddedQueryJob.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Metadata.Embedded/EmbeddedQueryJob.cs	Thu Sep  4 18:27:22 2008
@@ -60,7 +60,7 @@
         
         protected void Fetch()
         {
-            if (track.Uri == null || !track.Uri.IsFile)
+            if (track.Uri == null || !track.Uri.IsFile || !Banshee.IO.File.Exists (track.Uri))
                 return;
 
             string artist_album_id = track.ArtworkId;

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Metadata.FileSystem/FileSystemQueryJob.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Metadata.FileSystem/FileSystemQueryJob.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Metadata.FileSystem/FileSystemQueryJob.cs	Thu Sep  4 18:27:22 2008
@@ -62,11 +62,13 @@
         
         protected void Fetch ()
         {
-            if (Track.Uri == null || !Track.Uri.IsFile || Track.ArtworkId == null)
+            if (Track.Uri == null || !Track.Uri.IsFile ||
+                    Track.ArtworkId == null || !Banshee.IO.File.Exists (Track.Uri)) {
                 return;
+            }
             
             string directory = System.IO.Path.GetDirectoryName (Track.Uri.AbsolutePath);
-            
+
             // Get the largest (in terms of file size) JPEG in the directory
             long max_size = 0;
             string best_file = null;