mobile/NewPipe
mobile/NewPipe
1
0
Fork 0
mirror of https://github.com/TeamNewPipe/NewPipe synced 2024-07-09 04:15:59 +00:00
Code Issues Projects Releases Wiki Activity

Fix issue with background player

Browse Source
This commit is contained in:
Isira Seneviratne 2024-06-22 16:24:52 +05:30
parent 19c56f80d5
commit 8ecd6e6b98
9 changed files with 32 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/androidTest/java/org/schabi/newpipe/database/DatabaseMigrationTest.kt
View File

@ -129,7 +129,7 @@ class DatabaseMigrationTest {
) )
val migratedDatabaseV3 = getMigratedDatabase() val migratedDatabaseV3 = getMigratedDatabase()
val listFromDB = migratedDatabaseV3.streamDAO().all.blockingFirst() val listFromDB = migratedDatabaseV3.streamDAO().getAll().blockingFirst()
// Only expect 2, the one with the null url will be ignored // Only expect 2, the one with the null url will be ignored
assertEquals(2, listFromDB.size) assertEquals(2, listFromDB.size)
@ -217,7 +217,7 @@ class DatabaseMigrationTest {
) )
val migratedDatabaseV8 = getMigratedDatabase() val migratedDatabaseV8 = getMigratedDatabase()
val listFromDB = migratedDatabaseV8.searchHistoryDAO().all.blockingFirst() val listFromDB = migratedDatabaseV8.searchHistoryDAO().getAll().blockingFirst()
assertEquals(2, listFromDB.size) assertEquals(2, listFromDB.size)
assertEquals("abc", listFromDB[0].search) assertEquals("abc", listFromDB[0].search)
@ -283,8 +283,8 @@ class DatabaseMigrationTest {
) )
val migratedDatabaseV9 = getMigratedDatabase() val migratedDatabaseV9 = getMigratedDatabase()
var localListFromDB = migratedDatabaseV9.playlistDAO().all.blockingFirst() var localListFromDB = migratedDatabaseV9.playlistDAO().getAll().blockingFirst()
var remoteListFromDB = migratedDatabaseV9.playlistRemoteDAO().all.blockingFirst() var remoteListFromDB = migratedDatabaseV9.playlistRemoteDAO().getAll().blockingFirst()
assertEquals(1, localListFromDB.size) assertEquals(1, localListFromDB.size)
assertEquals(localUid2, localListFromDB[0].uid) assertEquals(localUid2, localListFromDB[0].uid)
@ -303,8 +303,8 @@ class DatabaseMigrationTest {
) )
) )
localListFromDB = migratedDatabaseV9.playlistDAO().all.blockingFirst() localListFromDB = migratedDatabaseV9.playlistDAO().getAll().blockingFirst()
remoteListFromDB = migratedDatabaseV9.playlistRemoteDAO().all.blockingFirst() remoteListFromDB = migratedDatabaseV9.playlistRemoteDAO().getAll().blockingFirst()
assertEquals(2, localListFromDB.size) assertEquals(2, localListFromDB.size)
assertEquals(localUid3, localListFromDB[1].uid) assertEquals(localUid3, localListFromDB[1].uid)
assertEquals(-1, localListFromDB[1].displayIndex) assertEquals(-1, localListFromDB[1].displayIndex)

16
app/src/androidTest/java/org/schabi/newpipe/local/history/HistoryRecordManagerTest.kt
View File

@ -41,7 +41,7 @@ class HistoryRecordManagerTest {
// For some reason the Flowable returned by getAll() never completes, so we can't assert // For some reason the Flowable returned by getAll() never completes, so we can't assert
// that the number of Lists it returns is exactly 1, we can only check if the first List is // that the number of Lists it returns is exactly 1, we can only check if the first List is
// correct. Why on earth has a Flowable been used instead of a Single for getAll()?!? // correct. Why on earth has a Flowable been used instead of a Single for getAll()?!?
val entities = database.searchHistoryDAO().all.blockingFirst() val entities = database.searchHistoryDAO().getAll().blockingFirst()
assertThat(entities).hasSize(1) assertThat(entities).hasSize(1)
assertThat(entities[0].id).isEqualTo(1) assertThat(entities[0].id).isEqualTo(1)
assertThat(entities[0].serviceId).isEqualTo(0) assertThat(entities[0].serviceId).isEqualTo(0)
@ -59,25 +59,25 @@ class HistoryRecordManagerTest {
// make sure all 4 were inserted // make sure all 4 were inserted
database.searchHistoryDAO().insertAll(entries) database.searchHistoryDAO().insertAll(entries)
assertThat(database.searchHistoryDAO().all.blockingFirst()).hasSameSizeAs(entries) assertThat(database.searchHistoryDAO().getAll().blockingFirst()).hasSameSizeAs(entries)
// try to delete only "A" entries, "B" entries should be untouched // try to delete only "A" entries, "B" entries should be untouched
manager.deleteSearchHistory("A").test().await().assertValue(2) manager.deleteSearchHistory("A").test().await().assertValue(2)
val entities = database.searchHistoryDAO().all.blockingFirst() val entities = database.searchHistoryDAO().getAll().blockingFirst()
assertThat(entities).hasSize(2) assertThat(entities).hasSize(2)
assertThat(entities).usingElementComparator { o1, o2 -> if (o1.hasEqualValues(o2)) 0 else 1 } assertThat(entities).usingElementComparator { o1, o2 -> if (o1.hasEqualValues(o2)) 0 else 1 }
.containsExactly(*entries.subList(2, 4).toTypedArray()) .containsExactly(*entries.subList(2, 4).toTypedArray())
// assert that nothing happens if we delete a search query that does exist in the db // assert that nothing happens if we delete a search query that does exist in the db
manager.deleteSearchHistory("A").test().await().assertValue(0) manager.deleteSearchHistory("A").test().await().assertValue(0)
val entities2 = database.searchHistoryDAO().all.blockingFirst() val entities2 = database.searchHistoryDAO().getAll().blockingFirst()
assertThat(entities2).hasSize(2) assertThat(entities2).hasSize(2)
assertThat(entities2).usingElementComparator { o1, o2 -> if (o1.hasEqualValues(o2)) 0 else 1 } assertThat(entities2).usingElementComparator { o1, o2 -> if (o1.hasEqualValues(o2)) 0 else 1 }
.containsExactly(*entries.subList(2, 4).toTypedArray()) .containsExactly(*entries.subList(2, 4).toTypedArray())
// delete all remaining entries // delete all remaining entries
manager.deleteSearchHistory("B").test().await().assertValue(2) manager.deleteSearchHistory("B").test().await().assertValue(2)
assertThat(database.searchHistoryDAO().all.blockingFirst()).isEmpty() assertThat(database.searchHistoryDAO().getAll().blockingFirst()).isEmpty()
} }
@Test @Test
@ -90,11 +90,11 @@ class HistoryRecordManagerTest {
// make sure all 3 were inserted // make sure all 3 were inserted
database.searchHistoryDAO().insertAll(entries) database.searchHistoryDAO().insertAll(entries)
assertThat(database.searchHistoryDAO().all.blockingFirst()).hasSameSizeAs(entries) assertThat(database.searchHistoryDAO().getAll().blockingFirst()).hasSameSizeAs(entries)
// should remove everything // should remove everything
manager.deleteCompleteSearchHistory().test().await().assertValue(entries.size) manager.deleteCompleteSearchHistory().test().await().assertValue(entries.size)
assertThat(database.searchHistoryDAO().all.blockingFirst()).isEmpty() assertThat(database.searchHistoryDAO().getAll().blockingFirst()).isEmpty()
} }
private fun insertShuffledRelatedSearches(relatedSearches: Collection<SearchHistoryEntry>) { private fun insertShuffledRelatedSearches(relatedSearches: Collection<SearchHistoryEntry>) {
@ -107,7 +107,7 @@ class HistoryRecordManagerTest {
// make sure all entries were inserted // make sure all entries were inserted
assertEquals( assertEquals(
relatedSearches.size, relatedSearches.size,
database.searchHistoryDAO().all.blockingFirst().size database.searchHistoryDAO().getAll().blockingFirst().size
) )
} }

2
app/src/androidTest/java/org/schabi/newpipe/local/playlist/LocalPlaylistManagerTest.kt
View File

@ -72,6 +72,6 @@ class LocalPlaylistManagerTest {
val result = manager.createPlaylist("name", listOf(stream, upserted)) val result = manager.createPlaylist("name", listOf(stream, upserted))
result.test().await().assertComplete() result.test().await().assertComplete()
database.streamDAO().all.test().awaitCount(1).assertValue(listOf(stream, upserted)) database.streamDAO().getAll().test().awaitCount(1).assertValue(listOf(stream, upserted))
} }
} }

2
app/src/main/java/org/schabi/newpipe/database/BasicDAO.kt
View File

@ -28,5 +28,5 @@ interface BasicDAO<Entity> {
/* Updates */ /* Updates */
@Update @Update
suspend fun update(entity: Entity): Int fun update(entity: Entity): Int
} }

21
app/src/main/java/org/schabi/newpipe/database/stream/dao/StreamDAO.kt
View File

@ -34,10 +34,7 @@ interface StreamDAO : BasicDAO<StreamEntity> {
fun setUploaderUrl(serviceId: Long, url: String, uploaderUrl: String): Completable fun setUploaderUrl(serviceId: Long, url: String, uploaderUrl: String): Completable
@Insert(onConflict = OnConflictStrategy.IGNORE) @Insert(onConflict = OnConflictStrategy.IGNORE)
suspend fun silentInsertInternal(stream: StreamEntity): Long fun silentInsertInternal(stream: StreamEntity): Long
@Insert(onConflict = OnConflictStrategy.IGNORE)
suspend fun silentInsertAllInternal(streams: List<StreamEntity>): List<Long>
@Query("SELECT COUNT(*) != 0 FROM streams WHERE url = :url AND service_id = :serviceId") @Query("SELECT COUNT(*) != 0 FROM streams WHERE url = :url AND service_id = :serviceId")
suspend fun exists(serviceId: Int, url: String): Boolean suspend fun exists(serviceId: Int, url: String): Boolean
@ -48,10 +45,10 @@ interface StreamDAO : BasicDAO<StreamEntity> {
FROM streams WHERE url = :url AND service_id = :serviceId FROM streams WHERE url = :url AND service_id = :serviceId
""" """
) )
suspend fun getMinimalStreamForCompare(serviceId: Int, url: String): StreamCompareFeed? fun getMinimalStreamForCompare(serviceId: Int, url: String): StreamCompareFeed?
@Transaction @Transaction
suspend fun upsert(newerStream: StreamEntity): Long { fun upsert(newerStream: StreamEntity): Long {
val uid = silentInsertInternal(newerStream) val uid = silentInsertInternal(newerStream)
if (uid != -1L) { if (uid != -1L) {
@ -65,20 +62,12 @@ interface StreamDAO : BasicDAO<StreamEntity> {
return newerStream.uid return newerStream.uid
} }
fun upsertBlocking(newerStream: StreamEntity) = runBlocking {
upsert(newerStream)
}
@Transaction @Transaction
suspend fun upsertAll(streams: List<StreamEntity>): List<Long> { fun upsertAll(streams: List<StreamEntity>): List<Long> {
return streams.map { upsert(it) } return streams.map { upsert(it) }
} }
fun upsertAllBlocking(streams: List<StreamEntity>) = runBlocking { private fun compareAndUpdateStream(newerStream: StreamEntity) {
upsertAll(streams)
}
private suspend fun compareAndUpdateStream(newerStream: StreamEntity) {
val existentMinimalStream = getMinimalStreamForCompare(newerStream.serviceId, newerStream.url) val existentMinimalStream = getMinimalStreamForCompare(newerStream.serviceId, newerStream.url)
?: throw IllegalStateException("Stream cannot be null just after insertion.") ?: throw IllegalStateException("Stream cannot be null just after insertion.")
newerStream.uid = existentMinimalStream.uid newerStream.uid = existentMinimalStream.uid

12
app/src/main/java/org/schabi/newpipe/local/history/HistoryRecordManager.java
View File

@ -110,10 +110,10 @@ public class HistoryRecordManager {
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.blockingGet(); .blockingGet();
duration = completeInfo.getDuration(); duration = completeInfo.getDuration();
streamId = streamTable.upsertBlocking(new StreamEntity(completeInfo)); streamId = streamTable.upsert(new StreamEntity(completeInfo));
} else { } else {
duration = info.getDuration(); duration = info.getDuration();
streamId = streamTable.upsertBlocking(new StreamEntity(info)); streamId = streamTable.upsert(new StreamEntity(info));
} }
// Update the stream progress to the full duration of the video // Update the stream progress to the full duration of the video
@ -141,7 +141,7 @@ public class HistoryRecordManager {
final OffsetDateTime currentTime = OffsetDateTime.now(ZoneOffset.UTC); final OffsetDateTime currentTime = OffsetDateTime.now(ZoneOffset.UTC);
return Maybe.fromCallable(() -> database.runInTransaction(() -> { return Maybe.fromCallable(() -> database.runInTransaction(() -> {
final long streamId = streamTable.upsertBlocking(new StreamEntity(info)); final long streamId = streamTable.upsert(new StreamEntity(info));
final StreamHistoryEntity latestEntry = streamHistoryTable.getLatestEntry(streamId); final StreamHistoryEntity latestEntry = streamHistoryTable.getLatestEntry(streamId);
if (latestEntry != null) { if (latestEntry != null) {
@ -236,7 +236,7 @@ public class HistoryRecordManager {
public Maybe<StreamStateEntity> loadStreamState(final PlayQueueItem queueItem) { public Maybe<StreamStateEntity> loadStreamState(final PlayQueueItem queueItem) {
return queueItem.getStream() return queueItem.getStream()
.map(info -> streamTable.upsertBlocking(new StreamEntity(info))) .map(info -> streamTable.upsert(new StreamEntity(info)))
.flatMapPublisher(streamStateTable::getState) .flatMapPublisher(streamStateTable::getState)
.firstElement() .firstElement()
.flatMap(list -> list.isEmpty() ? Maybe.empty() : Maybe.just(list.get(0))) .flatMap(list -> list.isEmpty() ? Maybe.empty() : Maybe.just(list.get(0)))
@ -245,7 +245,7 @@ public class HistoryRecordManager {
} }
public Maybe<StreamStateEntity> loadStreamState(final StreamInfo info) { public Maybe<StreamStateEntity> loadStreamState(final StreamInfo info) {
return Single.fromCallable(() -> streamTable.upsertBlocking(new StreamEntity(info))) return Single.fromCallable(() -> streamTable.upsert(new StreamEntity(info)))
.flatMapPublisher(streamStateTable::getState) .flatMapPublisher(streamStateTable::getState)
.firstElement() .firstElement()
.flatMap(list -> list.isEmpty() ? Maybe.empty() : Maybe.just(list.get(0))) .flatMap(list -> list.isEmpty() ? Maybe.empty() : Maybe.just(list.get(0)))
@ -255,7 +255,7 @@ public class HistoryRecordManager {
public Completable saveStreamState(@NonNull final StreamInfo info, final long progressMillis) { public Completable saveStreamState(@NonNull final StreamInfo info, final long progressMillis) {
return Completable.fromAction(() -> database.runInTransaction(() -> { return Completable.fromAction(() -> database.runInTransaction(() -> {
final long streamId = streamTable.upsertBlocking(new StreamEntity(info)); final long streamId = streamTable.upsert(new StreamEntity(info));
final StreamStateEntity state = new StreamStateEntity(streamId, progressMillis); final StreamStateEntity state = new StreamStateEntity(streamId, progressMillis);
if (state.isValid(info.getDuration())) { if (state.isValid(info.getDuration())) {
streamStateTable.upsert(state); streamStateTable.upsert(state);

4
app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistManager.java
View File

@ -46,7 +46,7 @@ public class LocalPlaylistManager {
// Make sure the new playlist is always on the top of bookmark. // Make sure the new playlist is always on the top of bookmark.
// The index will be reassigned to non-negative number in BookmarkFragment. // The index will be reassigned to non-negative number in BookmarkFragment.
return Maybe.fromCallable(() -> database.runInTransaction(() -> { return Maybe.fromCallable(() -> database.runInTransaction(() -> {
final List<Long> streamIds = streamTable.upsertAllBlocking(streams); final List<Long> streamIds = streamTable.upsertAll(streams);
final PlaylistEntity newPlaylist = new PlaylistEntity(name, false, final PlaylistEntity newPlaylist = new PlaylistEntity(name, false,
streamIds.get(0), -1); streamIds.get(0), -1);
@ -61,7 +61,7 @@ public class LocalPlaylistManager {
return playlistStreamTable.getMaximumIndexOf(playlistId) return playlistStreamTable.getMaximumIndexOf(playlistId)
.firstElement() .firstElement()
.map(maxJoinIndex -> database.runInTransaction(() -> { .map(maxJoinIndex -> database.runInTransaction(() -> {
final List<Long> streamIds = streamTable.upsertAllBlocking(streams); final List<Long> streamIds = streamTable.upsertAll(streams);
return insertJoinEntities(playlistId, streamIds, maxJoinIndex + 1); return insertJoinEntities(playlistId, streamIds, maxJoinIndex + 1);
} }
)).subscribeOn(Schedulers.io()); )).subscribeOn(Schedulers.io());

4
app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionManager.kt
View File

@ -81,7 +81,7 @@ class SubscriptionManager(context: Context) {
info.description, info.description,
info.subscriberCount info.subscriberCount
) )
runBlocking { subscriptionTable.update(it) } subscriptionTable.update(it)
} }
} }
@ -90,7 +90,7 @@ class SubscriptionManager(context: Context) {
.flatMapCompletable { entity: SubscriptionEntity -> .flatMapCompletable { entity: SubscriptionEntity ->
Completable.fromAction { Completable.fromAction {
entity.notificationMode = mode entity.notificationMode = mode
runBlocking { subscriptionTable().update(entity) } subscriptionTable().update(entity)
}.apply { }.apply {
if (mode != NotificationMode.DISABLED) { if (mode != NotificationMode.DISABLED) {
// notifications have just been enabled, mark all streams as "old" // notifications have just been enabled, mark all streams as "old"

2
app/src/main/java/org/schabi/newpipe/util/SparseItemUtil.java
View File

@ -108,7 +108,7 @@ public final class SparseItemUtil {
.subscribe(result -> { .subscribe(result -> {
// save to database in the background (not on main thread) // save to database in the background (not on main thread)
Completable.fromAction(() -> NewPipeDatabase.getInstance(context) Completable.fromAction(() -> NewPipeDatabase.getInstance(context)
.streamDAO().upsertBlocking(new StreamEntity(result))) .streamDAO().upsert(new StreamEntity(result)))
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(Schedulers.io()) .observeOn(Schedulers.io())
.doOnError(throwable -> .doOnError(throwable ->