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

[gburt svn gnome org]

Author: gburt
Date: Fri May 30 17:20:09 2008
New Revision: 4039
URL: http://svn.gnome.org/viewvc/banshee?rev=4039&view=rev

Log:
2008-05-30  Gabriel Burt  <gabriel burt gmail com>

	* src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackInfo.cs:
	* src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs: Respect
	copy-to-library when dragging FileSystemQueue items to the library.


Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackInfo.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackInfo.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackInfo.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackInfo.cs	Fri May 30 17:20:09 2008
@@ -473,7 +473,6 @@
             }
             
             bool in_library = old_uri.AbsolutePath.StartsWith (Paths.CachedLibraryLocation);
-            //Console.WriteLine ("{0} is{1}in library.", old_uri.ToString (), in_library ? " " : " not ");
 
             if (!in_library && (LibrarySchema.CopyOnImport.Get () || force_copy)) {
                 string new_filename = FileNamePattern.BuildFull (this, Path.GetExtension (old_uri.ToString ()).Substring (1));
@@ -487,7 +486,7 @@
                     Banshee.IO.File.Copy (old_uri, new_uri, false);
                     Uri = new_uri;
                 } catch (Exception e) {
-                    Log.Error (String.Format("Exception copying into library: {0}", e), false);
+                    Log.ErrorFormat ("Exception copying into library: {0}", e);
                 }
             }
         }

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs	Fri May 30 17:20:09 2008
@@ -83,6 +83,11 @@
             // If it's from a local primary source, change it's PrimarySource
             if (source.IsLocal || source is LibrarySource) {
                 track.PrimarySource = this;
+
+                if (!(source is LibrarySource)) {
+                    track.CopyToLibraryIfAppropriate (false);
+                }
+
                 track.Save (false);
                 source.NotifyTracksChanged ();
             } else {