banshee r3567 - in trunk/banshee: . src/Core/Banshee.Services/Banshee.Collection.Database

[gburt svn gnome org]

Author: gburt
Date: Thu Mar 27 19:51:45 2008
New Revision: 3567
URL: http://svn.gnome.org/viewvc/banshee?rev=3567&view=rev

Log:
2008-03-27  Gabriel Burt  <gabriel burt gmail com>

	* src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumInfo.cs:
	* src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistInfo.cs:
	Fix issue with importing items that have null artist or album names.
	Fixes BGO #524600.


Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumInfo.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistInfo.cs

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumInfo.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumInfo.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumInfo.cs	Thu Mar 27 19:51:45 2008
@@ -63,12 +63,13 @@
         private static DatabaseAlbumInfo last_album;
         public static DatabaseAlbumInfo FindOrCreate (DatabaseArtistInfo artist, string title)
         {
-            if (title == last_title && artist.DbId == last_artist_id) {
+            if (title == last_title && artist.DbId == last_artist_id && last_album != null) {
                 return last_album;
             }
 
-            if (title == null || title.Trim () == String.Empty)
+            if (String.IsNullOrEmpty (title) || title.Trim () == String.Empty) {
                 title = Catalog.GetString ("Unknown Album");
+            }
 
             using (IDataReader reader = ServiceManager.DbConnection.Query (select_command, artist.DbId, title)) {
                 if (reader.Read ()) {

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistInfo.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistInfo.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistInfo.cs	Thu Mar 27 19:51:45 2008
@@ -61,12 +61,13 @@
         private static DatabaseArtistInfo last_artist = null;
         public static DatabaseArtistInfo FindOrCreate (string artistName)
         {
-            if (artistName == last_artist_name) {
+            if (artistName == last_artist_name && last_artist != null) {
                 return last_artist;
             }
 
-            if (artistName == null || artistName.Trim () == String.Empty)
+            if (String.IsNullOrEmpty (artistName) || artistName.Trim () == String.Empty) {
                 artistName = Catalog.GetString ("Unknown Artist");
+            }
 
             using (IDataReader reader = ServiceManager.DbConnection.Query (select_command, artistName)) {
                 if (reader.Read ()) {
@@ -125,5 +126,10 @@
             get { return base.Name; }
             set { base.Name = value; }
         }
+
+        public override string ToString ()
+        {
+            return String.Format ("DatabaseArtistInfo<DbId: {0}, Name: {1}>", DbId, Name);
+        }
     }
 }