From aa96993584e6c278c7a062e2c7f7b9ef3ce5790a Mon Sep 17 00:00:00 2001 From: Prathamesh More Date: Mon, 16 May 2022 15:19:20 +0530 Subject: [PATCH] Removed Blacklist and Lyrics Room tables --- .../code/name/monkey/retromusic/MainModule.kt | 27 +------------------ .../monkey/retromusic/db/RetroDatabase.kt | 6 ++--- .../retromusic/repository/Repository.kt | 4 --- .../retromusic/repository/RoomRepository.kt | 27 +------------------ 4 files changed, 4 insertions(+), 60 deletions(-) diff --git a/app/src/main/java/code/name/monkey/retromusic/MainModule.kt b/app/src/main/java/code/name/monkey/retromusic/MainModule.kt index c1c58f3de..abad95853 100644 --- a/app/src/main/java/code/name/monkey/retromusic/MainModule.kt +++ b/app/src/main/java/code/name/monkey/retromusic/MainModule.kt @@ -1,12 +1,8 @@ package code.name.monkey.retromusic import androidx.room.Room -import androidx.room.RoomDatabase -import androidx.sqlite.db.SupportSQLiteDatabase import code.name.monkey.retromusic.auto.AutoMusicProvider import code.name.monkey.retromusic.cast.RetroWebServer -import code.name.monkey.retromusic.db.BlackListStoreDao -import code.name.monkey.retromusic.db.BlackListStoreEntity import code.name.monkey.retromusic.db.PlaylistWithSongs import code.name.monkey.retromusic.db.RetroDatabase import code.name.monkey.retromusic.fragments.LibraryViewModel @@ -20,10 +16,6 @@ import code.name.monkey.retromusic.network.provideLastFmRest import code.name.monkey.retromusic.network.provideLastFmRetrofit import code.name.monkey.retromusic.network.provideOkHttp import code.name.monkey.retromusic.repository.* -import code.name.monkey.retromusic.util.FilePathUtil -import kotlinx.coroutines.Dispatchers.IO -import kotlinx.coroutines.GlobalScope -import kotlinx.coroutines.launch import org.koin.android.ext.koin.androidContext import org.koin.androidx.viewmodel.dsl.viewModel import org.koin.dsl.bind @@ -50,31 +42,14 @@ private val roomModule = module { single { Room.databaseBuilder(androidContext(), RetroDatabase::class.java, "playlist.db") .allowMainThreadQueries() - .addCallback(object : RoomDatabase.Callback() { - override fun onOpen(db: SupportSQLiteDatabase) { - super.onOpen(db) - GlobalScope.launch(IO) { - FilePathUtil.blacklistFilePaths().map { - get().insertBlacklistPath(BlackListStoreEntity(it)) - } - } - } - }) .fallbackToDestructiveMigration() .build() } - factory { - get().lyricsDao() - } factory { get().playlistDao() } - factory { - get().blackListStore() - } - factory { get().playCountDao() } @@ -84,7 +59,7 @@ private val roomModule = module { } single { - RealRoomRepository(get(), get(), get(), get(), get()) + RealRoomRepository(get(), get(), get()) } bind RoomRepository::class } private val autoModule = module { diff --git a/app/src/main/java/code/name/monkey/retromusic/db/RetroDatabase.kt b/app/src/main/java/code/name/monkey/retromusic/db/RetroDatabase.kt index 804342126..6401766aa 100644 --- a/app/src/main/java/code/name/monkey/retromusic/db/RetroDatabase.kt +++ b/app/src/main/java/code/name/monkey/retromusic/db/RetroDatabase.kt @@ -18,14 +18,12 @@ import androidx.room.Database import androidx.room.RoomDatabase @Database( - entities = [PlaylistEntity::class, SongEntity::class, HistoryEntity::class, PlayCountEntity::class, BlackListStoreEntity::class, LyricsEntity::class], - version = 23, + entities = [PlaylistEntity::class, SongEntity::class, HistoryEntity::class, PlayCountEntity::class], + version = 24, exportSchema = false ) abstract class RetroDatabase : RoomDatabase() { abstract fun playlistDao(): PlaylistDao - abstract fun blackListStore(): BlackListStoreDao abstract fun playCountDao(): PlayCountDao abstract fun historyDao(): HistoryDao - abstract fun lyricsDao(): LyricsDao } diff --git a/app/src/main/java/code/name/monkey/retromusic/repository/Repository.kt b/app/src/main/java/code/name/monkey/retromusic/repository/Repository.kt index c2e67e584..fdbcb48e9 100644 --- a/app/src/main/java/code/name/monkey/retromusic/repository/Repository.kt +++ b/app/src/main/java/code/name/monkey/retromusic/repository/Repository.kt @@ -103,7 +103,6 @@ interface Repository { suspend fun clearSongHistory() suspend fun checkSongExistInPlayCount(songId: Long): List suspend fun playCountSongs(): List - suspend fun blackListPaths(): List suspend fun deleteSongs(songs: List) suspend fun contributor(): List suspend fun searchArtists(query: String): List @@ -345,9 +344,6 @@ class RealRepository( override suspend fun playCountSongs(): List = roomRepository.playCountSongs() - override suspend fun blackListPaths(): List = - roomRepository.blackListPaths() - override fun observableHistorySongs(): LiveData> = Transformations.map(roomRepository.observableHistorySongs()) { it.fromHistoryToSongs() diff --git a/app/src/main/java/code/name/monkey/retromusic/repository/RoomRepository.kt b/app/src/main/java/code/name/monkey/retromusic/repository/RoomRepository.kt index 2d6277322..e8b703497 100644 --- a/app/src/main/java/code/name/monkey/retromusic/repository/RoomRepository.kt +++ b/app/src/main/java/code/name/monkey/retromusic/repository/RoomRepository.kt @@ -16,7 +16,6 @@ import code.name.monkey.retromusic.util.PreferenceUtil interface RoomRepository { fun historySongs(): List fun favoritePlaylistLiveData(favorite: String): LiveData> - fun insertBlacklistPath(blackListStoreEntity: BlackListStoreEntity) fun observableHistorySongs(): LiveData> fun getSongs(playListId: Long): LiveData> suspend fun createPlaylist(playlistEntity: PlaylistEntity): Long @@ -42,11 +41,6 @@ interface RoomRepository { suspend fun clearSongHistory() suspend fun checkSongExistInPlayCount(songId: Long): List suspend fun playCountSongs(): List - suspend fun insertBlacklistPath(blackListStoreEntities: List) - suspend fun deleteBlacklistPath(blackListStoreEntity: BlackListStoreEntity) - suspend fun clearBlacklist() - suspend fun insertBlacklistPathAsync(blackListStoreEntity: BlackListStoreEntity) - suspend fun blackListPaths(): List suspend fun deleteSongs(songs: List) suspend fun isSongFavorite(context: Context, songId: Long): Boolean fun checkPlaylistExists(playListId: Long): LiveData @@ -54,10 +48,8 @@ interface RoomRepository { class RealRoomRepository( private val playlistDao: PlaylistDao, - private val blackListStoreDao: BlackListStoreDao, private val playCountDao: PlayCountDao, - private val historyDao: HistoryDao, - private val lyricsDao: LyricsDao + private val historyDao: HistoryDao ) : RoomRepository { @WorkerThread override suspend fun createPlaylist(playlistEntity: PlaylistEntity): Long = @@ -185,27 +177,10 @@ class RealRoomRepository( override suspend fun playCountSongs(): List = playCountDao.playCountSongs() - override fun insertBlacklistPath(blackListStoreEntity: BlackListStoreEntity) = - blackListStoreDao.insertBlacklistPath(blackListStoreEntity) - - override suspend fun insertBlacklistPath(blackListStoreEntities: List) = - blackListStoreDao.insertBlacklistPath(blackListStoreEntities) - - override suspend fun insertBlacklistPathAsync(blackListStoreEntity: BlackListStoreEntity) = - blackListStoreDao.insertBlacklistPath(blackListStoreEntity) - - override suspend fun blackListPaths(): List = - blackListStoreDao.blackListPaths() - override suspend fun deleteSongs(songs: List) = songs.forEach { playCountDao.deleteSong(it.id) } - override suspend fun deleteBlacklistPath(blackListStoreEntity: BlackListStoreEntity) = - blackListStoreDao.deleteBlacklistPath(blackListStoreEntity) - - override suspend fun clearBlacklist() = blackListStoreDao.clearBlacklist() - override suspend fun isSongFavorite(context: Context, songId: Long): Boolean { return playlistDao.isSongExistsInPlaylist( playlistDao.playlist(context.getString(R.string.favorites)).firstOrNull()?.playListId