Removed Blacklist and Lyrics Room tables

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<BlackListStoreDao>().insertBlacklistPath(BlackListStoreEntity(it))
-                        }
-                    }
-                }
-            })
             .fallbackToDestructiveMigration()
             .build()
     }
-    factory {
-        get<RetroDatabase>().lyricsDao()
-    }
 
     factory {
         get<RetroDatabase>().playlistDao()
     }
 
-    factory {
-        get<RetroDatabase>().blackListStore()
-    }
-
     factory {
         get<RetroDatabase>().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 {

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],
+    entities = [PlaylistEntity::class, SongEntity::class, HistoryEntity::class, PlayCountEntity::class],
-    version = 23,
+    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
 }

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<PlayCountEntity>
     suspend fun playCountSongs(): List<PlayCountEntity>
-    suspend fun blackListPaths(): List<BlackListStoreEntity>
     suspend fun deleteSongs(songs: List<Song>)
     suspend fun contributor(): List<Contributor>
     suspend fun searchArtists(query: String): List<Artist>
@@ -345,9 +344,6 @@ class RealRepository(
     override suspend fun playCountSongs(): List<PlayCountEntity> =
         roomRepository.playCountSongs()
 
-    override suspend fun blackListPaths(): List<BlackListStoreEntity> =
-        roomRepository.blackListPaths()
-
     override fun observableHistorySongs(): LiveData<List<Song>> =
         Transformations.map(roomRepository.observableHistorySongs()) {
             it.fromHistoryToSongs()

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<HistoryEntity>
     fun favoritePlaylistLiveData(favorite: String): LiveData<List<SongEntity>>
-    fun insertBlacklistPath(blackListStoreEntity: BlackListStoreEntity)
     fun observableHistorySongs(): LiveData<List<HistoryEntity>>
     fun getSongs(playListId: Long): LiveData<List<SongEntity>>
     suspend fun createPlaylist(playlistEntity: PlaylistEntity): Long
@@ -42,11 +41,6 @@ interface RoomRepository {
     suspend fun clearSongHistory()
     suspend fun checkSongExistInPlayCount(songId: Long): List<PlayCountEntity>
     suspend fun playCountSongs(): List<PlayCountEntity>
-    suspend fun insertBlacklistPath(blackListStoreEntities: List<BlackListStoreEntity>)
-    suspend fun deleteBlacklistPath(blackListStoreEntity: BlackListStoreEntity)
-    suspend fun clearBlacklist()
-    suspend fun insertBlacklistPathAsync(blackListStoreEntity: BlackListStoreEntity)
-    suspend fun blackListPaths(): List<BlackListStoreEntity>
     suspend fun deleteSongs(songs: List<Song>)
     suspend fun isSongFavorite(context: Context, songId: Long): Boolean
     fun checkPlaylistExists(playListId: Long): LiveData<Boolean>
@@ -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 historyDao: HistoryDao
-    private val lyricsDao: LyricsDao
 ) : RoomRepository {
     @WorkerThread
     override suspend fun createPlaylist(playlistEntity: PlaylistEntity): Long =
@@ -185,27 +177,10 @@ class RealRoomRepository(
     override suspend fun playCountSongs(): List<PlayCountEntity> =
         playCountDao.playCountSongs()
 
-    override fun insertBlacklistPath(blackListStoreEntity: BlackListStoreEntity) =
-        blackListStoreDao.insertBlacklistPath(blackListStoreEntity)
-
-    override suspend fun insertBlacklistPath(blackListStoreEntities: List<BlackListStoreEntity>) =
-        blackListStoreDao.insertBlacklistPath(blackListStoreEntities)
-
-    override suspend fun insertBlacklistPathAsync(blackListStoreEntity: BlackListStoreEntity) =
-        blackListStoreDao.insertBlacklistPath(blackListStoreEntity)
-
-    override suspend fun blackListPaths(): List<BlackListStoreEntity> =
-        blackListStoreDao.blackListPaths()
-
     override suspend fun deleteSongs(songs: List<Song>) = 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