Merge lp:~karni/ubuntuone-android-music/added-missing-dao into lp:ubuntuone-android-music/v2

[Michał Karnicki]

Added missing artist albums DAO.

Added missing artist albums DAO.

=== added file 'src/com/ubuntuone/android/music/provider/dao/ArtistAlbumDao.java'
--- src/com/ubuntuone/android/music/provider/dao/ArtistAlbumDao.java	1970-01-01 00:00:00 +0000
+++ src/com/ubuntuone/android/music/provider/dao/ArtistAlbumDao.java	2012-11-28 16:23:32 +0000
@@ -0,0 +1,102 @@
+package com.ubuntuone.android.music.provider.dao;
+
+import java.util.ArrayList;
+
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteStatement;
+import android.net.Uri;
+
+import com.ubuntuone.android.music.provider.MusicContentValues;
+import com.ubuntuone.android.music.provider.MusicContract.Albums;
+import com.ubuntuone.android.music.provider.MusicContract.ArtistAlbums;
+import com.ubuntuone.android.music.provider.MusicContract.Artists;
+import com.ubuntuone.android.music.provider.MusicDatabase;
+import com.ubuntuone.android.music.provider.MusicDatabase.Tables;
+import com.ubuntuone.android.music.provider.MusicProvider;
+import com.ubuntuone.api.music.model.U1Artist;
+
+public class ArtistAlbumDao extends Dao
+{
+	public ArtistAlbumDao() {
+	}
+	
+	/**
+	 * Updates the artists albums. If the artists albums don't exist, inserts artists albums.
+	 * Backed by {@link MusicProvider}.
+	 * 
+	 * @param resolver
+	 *            The content resolver.
+	 * @param artist
+	 *            The {@link U1Artist} whose albums to save.
+	 */
+	public void updateOrInsert(ContentResolver resolver, U1Artist artist) {
+		ArrayList<ContentValues> albumsValues = MusicContentValues.forArtistAlbums(artist);
+		for (ContentValues albumValues : albumsValues) {
+			Uri artistAlbumUri = Artists.buildAlbumUri(
+					artist.getId(), albumValues.getAsString(Albums.ALBUM_ID));
+			int count = resolver.update(artistAlbumUri, albumValues, null, null);
+			if (count == 0) {
+				resolver.insert(artistAlbumUri, albumValues);
+			}
+		}
+	}
+	
+	/**
+	 * Updates the artists albums. If the artists albums don't exist, inserts artists albums.
+	 * Backed by {@link MusicDatabase}.
+	 * 
+	 * @param db
+	 *            The {@link MusicDatabase} instance.
+	 * @param artist
+	 *            The {@link U1Artist} whose albums to save.
+	 * @return True if update or insert succeeded, false otherwise.
+	 */
+	public boolean updateOrInsert(SQLiteDatabase db, U1Artist artist) {
+		boolean isSuccess = true;
+		SQLiteStatement sqlUpdate = db.compileStatement(getUpdateSql());
+		SQLiteStatement sqlInsert = db.compileStatement(getInsertSql());
+		
+		final String artistId = artist.getId();
+		final ArrayList<String> albumIds = artist.getAlbumIds();
+		for (String albumId : albumIds) {
+			int i = 1; // Index to the parameter to bind.
+			sqlUpdate.clearBindings();
+			sqlUpdate.bindLong(i++, System.currentTimeMillis());
+			sqlUpdate.bindString(i++, artistId);
+			sqlUpdate.bindString(i++, albumId);
+			// Can't use executeUpdateDelete on API < 11
+			sqlUpdate.execute();
+			long rowsUpdated = getChanges(db);
+			if (rowsUpdated == 0L) {
+				i = 1;
+				sqlInsert.clearBindings();
+				sqlInsert.bindLong(i++, System.currentTimeMillis());
+				sqlInsert.bindString(i++, artistId);
+				sqlInsert.bindString(i++, albumId);
+				
+				long rowId = sqlInsert.executeInsert();
+				isSuccess = isSuccess && (rowId != -1);
+			} else {
+				isSuccess = isSuccess && (rowsUpdated == 1);
+			}
+		}
+		return isSuccess;
+	}
+
+	@Override
+	public String onGetInsertSql() {
+		return "INSERT INTO " + Tables.ARTISTS_ALBUMS + "(" +
+				ArtistAlbums.UPDATED + ", " +
+				ArtistAlbums.ARTIST_ID + ", " +
+				ArtistAlbums.ALBUM_ID +
+				") VALUES (?, ?, ?)";
+	}
+
+	@Override
+	public String onGetUpdateSql() {
+		return "UPDATE " + Tables.ARTISTS_ALBUMS + " SET " + ArtistAlbums.UPDATED + "=? " +
+				"WHERE " + ArtistAlbums.ARTIST_ID + "=? AND " + ArtistAlbums.ALBUM_ID + "=?";
+	}
+}

=== modified file 'src/com/ubuntuone/android/music/provider/dao/ArtistDao.java'
--- src/com/ubuntuone/android/music/provider/dao/ArtistDao.java	2012-11-21 15:11:58 +0000
+++ src/com/ubuntuone/android/music/provider/dao/ArtistDao.java	2012-11-28 16:23:32 +0000
@@ -1,7 +1,5 @@
 package com.ubuntuone.android.music.provider.dao;
 
-import java.util.ArrayList;
-
 import android.content.ContentResolver;
 import android.content.ContentValues;
 import android.database.sqlite.SQLiteDatabase;
@@ -9,8 +7,6 @@
 import android.net.Uri;
 
 import com.ubuntuone.android.music.provider.MusicContentValues;
-import com.ubuntuone.android.music.provider.MusicContract.Albums;
-import com.ubuntuone.android.music.provider.MusicContract.ArtistAlbums;
 import com.ubuntuone.android.music.provider.MusicContract.Artists;
 import com.ubuntuone.android.music.provider.MusicDatabase;
 import com.ubuntuone.android.music.provider.MusicDatabase.Tables;
@@ -39,16 +35,6 @@
 		if (count == 0) {
 			resolver.insert(Artists.CONTENT_URI, values);
 		}
-		// Insert artist albums.
-		ArrayList<ContentValues> albumsValues = MusicContentValues.forArtistAlbums(artist);
-		for (ContentValues albumValues : albumsValues) {
-			Uri artistAlbumUri = Artists.buildAlbumUri(
-					artist.getId(), albumValues.getAsString(Albums.ALBUM_ID));
-			int count2 = resolver.update(artistAlbumUri, albumValues, null, null);
-			if (count2 == 0) {
-				resolver.insert(artistAlbumUri, albumValues);
-			}
-		}
 	}
 	
 	/**
@@ -104,20 +90,6 @@
 		} else {
 			isSuccess = rowsUpdated == 1;
 		}
-		
-		// Insert artist albums.
-		sqlStmt = db.compileStatement(getSecondaryInsertSql());
-		final String artistId = artist.getId();
-		final ArrayList<String> albumIds = artist.getAlbumIds();
-		for (String albumId : albumIds) {
-			sqlStmt.clearBindings();
-			sqlStmt.bindLong(1, System.currentTimeMillis());
-			sqlStmt.bindString(2, artistId);
-			sqlStmt.bindString(3, albumId);
-			long rowId = sqlStmt.executeInsert();
-			isSuccess = isSuccess && (rowId != -1);
-		}
-		
 		return isSuccess;
 	}
 
@@ -140,17 +112,6 @@
 				"?, ?" +
 				")";
 	}
-	
-	@Override
-	public String onGetSecondaryInsertSql() {
-		return "INSERT INTO " + Tables.ARTISTS_ALBUMS + "(" +
-				
-				ArtistAlbums.UPDATED + ", " +
-				ArtistAlbums.ARTIST_ID + ", " +
-				ArtistAlbums.ALBUM_ID +
-				
-				") VALUES (?, ?, ?)";
-	}
 
 	@Override
 	public String onGetUpdateSql() {

=== modified file 'src/com/ubuntuone/android/music/provider/dao/Dao.java'
--- src/com/ubuntuone/android/music/provider/dao/Dao.java	2012-11-21 15:11:58 +0000
+++ src/com/ubuntuone/android/music/provider/dao/Dao.java	2012-11-28 16:23:32 +0000
@@ -6,7 +6,6 @@
 public abstract class Dao
 {
 	private String mInsertSql;
-	private String mSecondaryInsertSql;
 	private String mUdpateSql;
 	
 	/**
@@ -22,18 +21,6 @@
 	}
 	
 	/**
-	 * Performs a lazy initialization with {@code Dao#onGetSecondaryInsertSql()}.
-	 * 
-	 * @return The cached secondary SQL INSERT string.
-	 */
-	public String getSecondaryInsertSql() {
-		if (mSecondaryInsertSql == null) {
-			mSecondaryInsertSql = onGetSecondaryInsertSql();
-		}
-		return mSecondaryInsertSql;
-	}
-	
-	/**
 	 * Performs a lazy initialization with {@code Dao#onGetUpdateSql()}.
 	 * 
 	 * @return The cached SQL UPDATE string.
@@ -57,16 +44,6 @@
 	 */
 	public abstract String onGetInsertSql();
 	
-
-	/**
-	 * Override to return the secondary SQL INSERT string.
-	 * 
-	 * @return The secondary SQL INSERT string.
-	 */
-	public String onGetSecondaryInsertSql() {
-		return null;
-	}
-	
 	/**
 	 * Override to return the SQL UPDATE string.
 	 * 

=== modified file 'src/com/ubuntuone/android/music/service/SyncService.java'
--- src/com/ubuntuone/android/music/service/SyncService.java	2012-11-22 11:17:42 +0000
+++ src/com/ubuntuone/android/music/service/SyncService.java	2012-11-28 16:23:32 +0000
@@ -42,6 +42,7 @@
 import com.ubuntuone.android.music.provider.MusicDatabase;
 import com.ubuntuone.android.music.provider.MusicProviderUtils;
 import com.ubuntuone.android.music.provider.dao.AlbumDao;
+import com.ubuntuone.android.music.provider.dao.ArtistAlbumDao;
 import com.ubuntuone.android.music.provider.dao.ArtistDao;
 import com.ubuntuone.android.music.provider.dao.GenreDao;
 import com.ubuntuone.android.music.provider.dao.PlaylistDao;
@@ -180,6 +181,7 @@
 	private U1ArtistListener mArtistListener = new U1ArtistListener() {
 		private SQLiteDatabase db;
 		private ArtistDao artistDao = new ArtistDao();
+		private ArtistAlbumDao artistAlbumDao = new ArtistAlbumDao();
 		private Bundle progressBundle = new Bundle();
 		private Failure failure = null;
 		private int artistCount = 0;
@@ -198,9 +200,14 @@
 		public void onSuccess(U1Artist artist) {
 			artistCount++;
 			if (DIRECT_SQL) {
-				artistDao.updateOrInsert(db, artist);
+				if (artistDao.updateOrInsert(db, artist)) {
+					if (!artistAlbumDao.updateOrInsert(db, artist)) {
+						Log.w(TAG, "Artist album not inserted: " + artist.getId());
+					}
+				}
 			} else {
 				artistDao.updateOrInsert(mResolver, artist);
+				artistAlbumDao.updateOrInsert(mResolver, artist);
 			}
 			mReceiver.send(SYNC_PROGRESS, progressBundle);
 		}