Added persistence to seektime for playing songs

app/src/main/java/ch/blinkenlights/android/medialibrary/MediaLibrary.java

@@ -382,6 +382,115 @@ public static void updateSongPlayCounts(Context context, long id, boolean played
 		getBackend(context).execSQL("UPDATE "+MediaLibrary.TABLE_SONGS+" SET "+column+"="+column+"+1 WHERE "+selection);
 	}
 
+	/**
+	 * Updates the timestamp of a played song
+	 *
+	 * @param context the context to use
+	 * @param id the song id to update
+	 * @param timestamp the timestamp
+	 */
+	public static void updateSongTimestamp(Context context, long id, int timestamp) {
+		String selection = MediaLibrary.SongColumns._ID+"="+id;
+		getBackend(context).execSQL("UPDATE "+MediaLibrary.TABLE_SONGS+" SET "+SongColumns.TIMESTAMP_LAST_PLAY+"="+timestamp+" WHERE "+selection);
+	}
+
+	/**
+	 * Get the timestamp of a played song
+	 *
+	 * @param context the context to use
+	 * @param id the song id to update
+	 * @return the timestamp
+	 */
+	public static int getSongTimestamp(Context context, long id) {
+
+		String[] projection = {SongColumns._ID, SongColumns.TIMESTAMP_LAST_PLAY};
+		String selection = SongColumns._ID + " = ?";
+		String[] selectionArgs = { String.valueOf(id) };
+
+		Cursor cursor = MediaLibrary.queryLibrary(context, MediaLibrary.TABLE_SONGS, projection, selection, selectionArgs, null);
+
+		int timestamp=-1;
+		if (cursor != null) {
+			if (cursor.moveToFirst()) {
+				timestamp = cursor.getInt(1);
+			}
+			cursor.close();
+		}
+		return timestamp;
+	}
+
+	/**
+	 * Updates the timestamp of a played song
+	 *
+	 * @param context the context to use
+	 * @param songId the song id
+	 * @param albumId the album id to update
+	 */
+	public static void updateAlbumLastSong(Context context, long songId, long albumId) {
+		String selection = MediaLibrary.AlbumColumns._ID+"="+albumId;
+		getBackend(context).execSQL("UPDATE "+MediaLibrary.TABLE_ALBUMS+" SET "+AlbumColumns.LAST_TRACK_PLAYED+"="+songId+" WHERE "+selection);
+	}
+
+	/**
+	 * Get the last played song of an album
+	 *
+	 * @param context the context to use
+	 * @param id the song id to update
+	 * @return the songid
+	 */
+	public static long getAlbumLastSong(Context context, long id) {
+
+		String[] projection = {AlbumColumns._ID, AlbumColumns.LAST_TRACK_PLAYED};
+		String selection = AlbumColumns._ID + " = ?";
+		String[] selectionArgs = { String.valueOf(id) };
+
+		Cursor cursor = MediaLibrary.queryLibrary(context, MediaLibrary.TABLE_ALBUMS, projection, selection, selectionArgs, null);
+
+		long timestamp=-1;
+		if (cursor != null) {
+			if (cursor.moveToFirst()) {
+				timestamp = cursor.getLong(1);
+			}
+			cursor.close();
+		}
+		return timestamp;
+	}
+
+	/**
+	 * Sets the state if the album should use the last played timestamp on playstart
+	 *
+	 * @param context the context to use
+	 * @param albumId the album id to update
+	 * @param startAtTimestamp the album id to update
+	 */
+	public static void updateAlbumUseSongTimestamp(Context context, long albumId, boolean startAtTimestamp) {
+		int state = 0;
+		if(startAtTimestamp){
+			state = 1;
+		}
+
+		String selection = MediaLibrary.AlbumColumns._ID+"="+albumId;
+		getBackend(context).execSQL("UPDATE "+MediaLibrary.TABLE_ALBUMS+" SET "+AlbumColumns.START_AT_TRACKTIMESTAMP+"="+state+" WHERE "+selection);
+	}
+
+	public static int getAlbumUseSongTimestamp(Context context, long id) {
+
+		String[] projection = {AlbumColumns._ID, AlbumColumns.START_AT_TRACKTIMESTAMP};
+		String selection = AlbumColumns._ID + " = ?";
+		String[] selectionArgs = { String.valueOf(id) };
+
+		Cursor cursor = MediaLibrary.queryLibrary(context, MediaLibrary.TABLE_ALBUMS, projection, selection, selectionArgs, null);
+
+		int state=-1;
+		if (cursor != null) {
+			if (cursor.moveToFirst()) {
+				state = cursor.getInt(1);
+			}
+			cursor.close();
+		}
+		return state;
+	}
+
 	/**
 	 * Creates a new empty playlist
 	 *
@@ -653,6 +762,11 @@ public interface SongColumns {
 		 * Various flags of this entry, see SONG_FLAG...
 		 */
 		String FLAGS = "_flags";
+		/**
+		 * Contains the last known timestamp of the song.
+		 * This is important for audiobooks/podcasts
+		 */
+		String TIMESTAMP_LAST_PLAY = "timestamp_last_play";
 	}
 
 	// Columns of Album entries
@@ -681,6 +795,14 @@ public interface AlbumColumns {
 		 * The mtime of this item
 		 */
 		String MTIME = "mtime";
+		/**
+		 * The id of the last played song from this album
+		 */
+		String LAST_TRACK_PLAYED = "last_track_played";
+		/**
+		 * The id of the last played song from this album
+		 */
+		String START_AT_TRACKTIMESTAMP = "start_at_tracktimestamp";
 	}
 
 	// Columns of Contributors entries

app/src/main/java/ch/blinkenlights/android/medialibrary/MediaLibraryBackend.java

@@ -35,7 +35,7 @@ public class MediaLibraryBackend extends SQLiteOpenHelper {
 	/**
 	 * The database version we are using
 	 */
-	private static final int DATABASE_VERSION = 20190210;
+	private static final int DATABASE_VERSION = 20190228;
 	/**
 	 * on-disk file to store the database
 	 */

app/src/main/java/ch/blinkenlights/android/medialibrary/MediaMigrations.java

@@ -49,4 +49,19 @@ static void migrate_to_20180416(SQLiteDatabase dbh, String fromDb, String toDb)
 		cursor.close();
 	}
 
+	/**
+	 * Migrate to 20190228
+	 * Add fields for track-timestamp and albumposition
+	 *
+	 * @param dbh the database to work on
+	 **/
+	static void migrate_to_20190228(SQLiteDatabase dbh) {
+		Log.v("VanillaMusic", "migrate_to_20190228");
+		dbh.execSQL("ALTER TABLE "+MediaLibrary.TABLE_ALBUMS+" ADD COLUMN "+MediaLibrary.AlbumColumns.LAST_TRACK_PLAYED+" INTEGER;");
+		dbh.execSQL("ALTER TABLE "+MediaLibrary.TABLE_ALBUMS+" ADD COLUMN "+MediaLibrary.AlbumColumns.START_AT_TRACKTIMESTAMP+" INTEGER DEFAULT -1;");
+		dbh.execSQL("ALTER TABLE "+MediaLibrary.TABLE_SONGS+" ADD COLUMN "+MediaLibrary.SongColumns.TIMESTAMP_LAST_PLAY+" INTEGER;");
+
+
+	}
+
 }

app/src/main/java/ch/blinkenlights/android/medialibrary/MediaSchema.java

@@ -24,31 +24,34 @@ public class MediaSchema {
 	 * SQL Schema of `songs' table
 	 */
 	private static final String DATABASE_CREATE_SONGS = "CREATE TABLE "+ MediaLibrary.TABLE_SONGS + " ("
-	  + MediaLibrary.SongColumns._ID          +" INTEGER PRIMARY KEY, "
-	  + MediaLibrary.SongColumns.TITLE        +" TEXT NOT NULL, "
-	  + MediaLibrary.SongColumns.TITLE_SORT   +" VARCHAR(64) NOT NULL, "
-	  + MediaLibrary.SongColumns.SONG_NUMBER  +" INTEGER, "
-	  + MediaLibrary.SongColumns.DISC_NUMBER  +" INTEGER, "
-	  + MediaLibrary.SongColumns.YEAR         +" INTEGER, "
-	  + MediaLibrary.SongColumns.ALBUM_ID     +" INTEGER NOT NULL, "
-	  + MediaLibrary.SongColumns.PLAYCOUNT    +" INTEGER NOT NULL DEFAULT 0, "
-	  + MediaLibrary.SongColumns.SKIPCOUNT    +" INTEGER NOT NULL DEFAULT 0, "
-	  + MediaLibrary.SongColumns.MTIME        +" TIMESTAMP DEFAULT (strftime('%s', CURRENT_TIMESTAMP)), "
-	  + MediaLibrary.SongColumns.DURATION     +" INTEGER NOT NULL, "
-	  + MediaLibrary.SongColumns.PATH         +" VARCHAR(4096) NOT NULL, "
-	  + MediaLibrary.SongColumns.FLAGS        +" INTEGER NOT NULL DEFAULT 0 "
+	  + MediaLibrary.SongColumns._ID                +" INTEGER PRIMARY KEY, "
+	  + MediaLibrary.SongColumns.TITLE              +" TEXT NOT NULL, "
+	  + MediaLibrary.SongColumns.TITLE_SORT         +" VARCHAR(64) NOT NULL, "
+	  + MediaLibrary.SongColumns.SONG_NUMBER        +" INTEGER, "
+	  + MediaLibrary.SongColumns.DISC_NUMBER        +" INTEGER, "
+	  + MediaLibrary.SongColumns.YEAR               +" INTEGER, "
+	  + MediaLibrary.SongColumns.ALBUM_ID           +" INTEGER NOT NULL, "
+	  + MediaLibrary.SongColumns.PLAYCOUNT          +" INTEGER NOT NULL DEFAULT 0, "
+	  + MediaLibrary.SongColumns.SKIPCOUNT          +" INTEGER NOT NULL DEFAULT 0, "
+	  + MediaLibrary.SongColumns.MTIME              +" TIMESTAMP DEFAULT (strftime('%s', CURRENT_TIMESTAMP)), "
+	  + MediaLibrary.SongColumns.DURATION           +" INTEGER NOT NULL, "
+	  + MediaLibrary.SongColumns.TIMESTAMP_LAST_PLAY+" INTEGER, "
+	  + MediaLibrary.SongColumns.PATH               +" VARCHAR(4096) NOT NULL, "
+	  + MediaLibrary.SongColumns.FLAGS              +" INTEGER NOT NULL DEFAULT 0 "
 	  + ");";
 
 	/**
 	 * SQL Schema of `albums' table
 	 */
 	private static final String DATABASE_CREATE_ALBUMS = "CREATE TABLE "+ MediaLibrary.TABLE_ALBUMS + " ("
-	  + MediaLibrary.AlbumColumns._ID               +" INTEGER PRIMARY KEY, "
-	  + MediaLibrary.AlbumColumns.ALBUM             +" TEXT NOT NULL, "
-	  + MediaLibrary.AlbumColumns.ALBUM_SORT        +" VARCHAR(64) NOT NULL, "
-	  + MediaLibrary.AlbumColumns.PRIMARY_ALBUM_YEAR+" INTEGER, "
-	  + MediaLibrary.AlbumColumns.PRIMARY_ARTIST_ID +" INTEGER NOT NULL DEFAULT 0, "
-	  + MediaLibrary.AlbumColumns.MTIME             +" TIMESTAMP DEFAULT CURRENT_TIMESTAMP "
+	  + MediaLibrary.AlbumColumns._ID               	  +" INTEGER PRIMARY KEY, "
+	  + MediaLibrary.AlbumColumns.ALBUM             	  +" TEXT NOT NULL, "
+	  + MediaLibrary.AlbumColumns.ALBUM_SORT        	  +" VARCHAR(64) NOT NULL, "
+	  + MediaLibrary.AlbumColumns.PRIMARY_ALBUM_YEAR	  +" INTEGER, "
+	  + MediaLibrary.AlbumColumns.PRIMARY_ARTIST_ID 	  +" INTEGER NOT NULL DEFAULT 0, "
+	  + MediaLibrary.AlbumColumns.LAST_TRACK_PLAYED 	  +" INTEGER, "
+	  + MediaLibrary.AlbumColumns.START_AT_TRACKTIMESTAMP +" INTEGER DEFAULT -1, "
+	  + MediaLibrary.AlbumColumns.MTIME             	  +" TIMESTAMP DEFAULT CURRENT_TIMESTAMP "
 	  + ");";
 
 	/**
@@ -364,6 +367,10 @@ public static void upgradeDatabaseSchema(SQLiteDatabase dbh, int oldVersion) {
 		if (oldVersion < 20190210) {
 			dbh.execSQL(VIEW_CREATE_PLAYLISTS);
 		}
+
+		if(oldVersion < 20190228){
+			MediaMigrations.migrate_to_20190228(dbh);
+		}
 	}
 
 }