banshee r2977 - in trunk/banshee: . src/Core/Banshee.Services src/Core/Banshee.Services/Banshee.Collection.Database src/Core/Banshee.Services/Banshee.Database src/Core/Hyena src/Core/Hyena/Hyena.Data.Sqlite

[gburt svn gnome org]

Author: gburt
Date: Wed Jan 16 23:32:52 2008
New Revision: 2977
URL: http://svn.gnome.org/viewvc/banshee?rev=2977&view=rev

Log:
2008-01-16  Gabriel Burt  <gabriel burt gmail com>

	* src/Core/Banshee.Services/Banshee.Collection.Database/BansheeCacheableModelAdapter.cs:
	Removed.

	* src/Core/Banshee.Services/Banshee.Collection.Database/BansheeDatabaseModelCache.cs:
	* src/Core/Banshee.Services/Banshee.Database/BansheeDatabaseModelCache.cs:
	Move from Banshee.Collection.Database to Banshee.Database.

	* src/Core/Banshee.Services/Banshee.Collection.Database/BansheeModelProvider.cs:
	* src/Core/Banshee.Services/Banshee.Database/BansheeDatabaseModel.cs:
	Renamed, moved.

	* src/Core/Banshee.Services/Banshee.Collection.Database/LibraryArtistInfo.cs:
	Remove unused methods.

	* src/Core/Banshee.Services/Makefile.am:
	* src/Core/Banshee.Services/Banshee.Database/TableSchema.cs: Remove.

	* src/Core/Hyena/Makefile.am:
	* src/Core/Hyena/Hyena.Data.Sqlite/IDatabaseModel.cs: Rename to
	ICacheableDatabaseModel.


Added:
   trunk/banshee/src/Core/Banshee.Services/Banshee.Database/BansheeDatabaseModel.cs
      - copied, changed from r2976, /trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/BansheeModelProvider.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.Database/BansheeDatabaseModelCache.cs
      - copied, changed from r2976, /trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/BansheeDatabaseModelCache.cs
   trunk/banshee/src/Core/Hyena/Hyena.Data.Sqlite/ICacheableDatabaseModel.cs
      - copied unchanged from r2976, /trunk/banshee/src/Core/Hyena/Hyena.Data.Sqlite/IDatabaseModel.cs
Removed:
   trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/BansheeCacheableModelAdapter.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/BansheeDatabaseModelCache.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/BansheeModelProvider.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.Database/TableSchema.cs
   trunk/banshee/src/Core/Hyena/Hyena.Data.Sqlite/IDatabaseModel.cs
Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/LibraryArtistInfo.cs
   trunk/banshee/src/Core/Banshee.Services/Makefile.am
   trunk/banshee/src/Core/Hyena/Makefile.am

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/LibraryArtistInfo.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/LibraryArtistInfo.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/LibraryArtistInfo.cs	Wed Jan 16 23:32:52 2008
@@ -91,33 +91,6 @@
             }
         }
 
-        private void InsertCommit ()
-        {
-            TableSchema.CoreArtists.InsertCommand.ApplyValues (
-                null, // ArtistID
-                -1, // TagSetID
-                null, // MusicBrainzID
-                Name ?? String.Empty,
-                0 // rating
-            );
-            
-            dbid = ServiceManager.DbConnection.Execute (TableSchema.CoreArtists.InsertCommand);
-        }
-        
-        private void UpdateCommit ()
-        {
-            TableSchema.CoreArtists.UpdateCommand.ApplyValues (
-                DbId,
-                -1, // TagSetID
-                null, // MusicBrainzID
-                Name,
-                0, // rating
-                DbId // ArtistID (again, for WHERE clause)
-            );
-
-            ServiceManager.DbConnection.Execute (TableSchema.CoreArtists.UpdateCommand);
-        }
-
         private void LoadFromReader(IDataReader reader)
         {
             dbid = Convert.ToInt32(reader[(int)Column.ArtistID]);

Copied: trunk/banshee/src/Core/Banshee.Services/Banshee.Database/BansheeDatabaseModel.cs (from r2976, /trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/BansheeModelProvider.cs)
==============================================================================
--- /trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/BansheeModelProvider.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Database/BansheeDatabaseModel.cs	Wed Jan 16 23:32:52 2008
@@ -32,9 +32,7 @@
 using Hyena.Data;
 using Hyena.Data.Sqlite;
 
-using Banshee.Database;
-
-namespace Banshee.Collection.Database
+namespace Banshee.Database
 {
     public class BansheeModelProvider<T> : DatabaseModel<T>
     {

Copied: trunk/banshee/src/Core/Banshee.Services/Banshee.Database/BansheeDatabaseModelCache.cs (from r2976, /trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/BansheeDatabaseModelCache.cs)
==============================================================================
--- /trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/BansheeDatabaseModelCache.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Database/BansheeDatabaseModelCache.cs	Wed Jan 16 23:32:52 2008
@@ -33,7 +33,7 @@
 using Hyena.Data;
 using Hyena.Data.Sqlite;
 
-namespace Banshee.Collection.Database
+namespace Banshee.Database
 {
     public class BansheeDatabaseModelCache<T> : DatabaseModelCache<T>
     {

Modified: trunk/banshee/src/Core/Banshee.Services/Makefile.am
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Makefile.am	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Makefile.am	Wed Jan 16 23:32:52 2008
@@ -12,8 +12,6 @@
 	Banshee.AudioProfiles/ProfileManager.cs \
 	Banshee.Collection.Database/AlbumListDatabaseModel.cs \
 	Banshee.Collection.Database/ArtistListDatabaseModel.cs \
-	Banshee.Collection.Database/BansheeModelProvider.cs \
-	Banshee.Collection.Database/BansheeDatabaseModelCache.cs \
 	Banshee.Collection.Database/LibraryAlbumInfo.cs \
 	Banshee.Collection.Database/LibraryArtistInfo.cs \
 	Banshee.Collection.Database/LibraryTrackInfo.cs \
@@ -28,9 +26,10 @@
 	Banshee.Collection/ImportManager.cs \
 	Banshee.Collection/ModelHelper.cs \
 	Banshee.Collection/TrackListModel.cs \
+	Banshee.Database/BansheeDatabaseModel.cs \
+	Banshee.Database/BansheeDatabaseModelCache.cs \
 	Banshee.Database/BansheeDbConnection.cs \
 	Banshee.Database/BansheeDbFormatMigrator.cs \
-	Banshee.Database/TableSchema.cs \
 	Banshee.Library/HomeDirectoryImportSource.cs \
 	Banshee.Library/IImportSource.cs \
 	Banshee.Library/ImportSourceManager.cs \

Modified: trunk/banshee/src/Core/Hyena/Makefile.am
==============================================================================
--- trunk/banshee/src/Core/Hyena/Makefile.am	(original)
+++ trunk/banshee/src/Core/Hyena/Makefile.am	Wed Jan 16 23:32:52 2008
@@ -20,7 +20,7 @@
 	Hyena.Data.Query/QueryToken.cs \
 	Hyena.Data.Query/UserQueryParser.cs \
 	Hyena.Data.Query/XmlQueryParser.cs \
-	Hyena.Data.Sqlite/IDatabaseModel.cs \
+	Hyena.Data.Sqlite/ICacheableDatabaseModel.cs \
 	Hyena.Data.Sqlite/DatabaseModelCache.cs \
 	Hyena.Data.Sqlite/DatabaseColumn.cs \
 	Hyena.Data.Sqlite/DatabaseColumnAttribute.cs \