-
-
Notifications
You must be signed in to change notification settings - Fork 3.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #10470 from TeamNewPipe/release-0.26.0
Release 0.26.0
- Loading branch information
Showing
328 changed files
with
9,799 additions
and
3,570 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| # Add 'size/small' label to any changes with less than 50 lines | ||
| size/small: | ||
| max: 49 | ||
|
|
||
| # Add 'size/medium' label to any changes between 50 and 249 lines | ||
| size/medium: | ||
| min: 50 | ||
| max: 249 | ||
|
|
||
| # Add 'size/large' label to any changes between 250 and 749 lines | ||
| size/large: | ||
| min: 250 | ||
| max: 749 | ||
|
|
||
| # Add 'size/giant' label to any changes for more than 749 lines | ||
| size/giant: | ||
| min: 750 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| name: "PR size labeler" | ||
| on: [pull_request] | ||
| permissions: | ||
| contents: read | ||
| pull-requests: write | ||
|
|
||
| jobs: | ||
| changed-lines-count-labeler: | ||
| runs-on: ubuntu-latest | ||
| name: Automatically labelling pull requests based on the changed lines count | ||
| permissions: | ||
| pull-requests: write | ||
| steps: | ||
| - name: Set a label | ||
| uses: TeamNewPipe/changed-lines-count-labeler@main | ||
| with: | ||
| repo-token: ${{ secrets.GITHUB_TOKEN }} | ||
| configuration-path: .github/changed-lines-count-labeler.yml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
124 changes: 124 additions & 0 deletions
124
app/src/androidTest/java/org/schabi/newpipe/database/FeedDAOTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,124 @@ | ||
| package org.schabi.newpipe.database | ||
|
|
||
| import android.content.Context | ||
| import androidx.room.Room | ||
| import androidx.test.core.app.ApplicationProvider | ||
| import io.reactivex.rxjava3.core.Single | ||
| import org.junit.After | ||
| import org.junit.Assert.assertEquals | ||
| import org.junit.Assert.assertNotNull | ||
| import org.junit.Before | ||
| import org.junit.Test | ||
| import org.schabi.newpipe.database.feed.dao.FeedDAO | ||
| import org.schabi.newpipe.database.feed.model.FeedEntity | ||
| import org.schabi.newpipe.database.feed.model.FeedGroupEntity | ||
| import org.schabi.newpipe.database.stream.StreamWithState | ||
| import org.schabi.newpipe.database.stream.dao.StreamDAO | ||
| import org.schabi.newpipe.database.stream.model.StreamEntity | ||
| import org.schabi.newpipe.database.subscription.SubscriptionDAO | ||
| import org.schabi.newpipe.database.subscription.SubscriptionEntity | ||
| import org.schabi.newpipe.extractor.ServiceList | ||
| import org.schabi.newpipe.extractor.channel.ChannelInfo | ||
| import org.schabi.newpipe.extractor.stream.StreamType | ||
| import java.io.IOException | ||
| import java.time.OffsetDateTime | ||
| import kotlin.streams.toList | ||
|
|
||
| class FeedDAOTest { | ||
| private lateinit var db: AppDatabase | ||
| private lateinit var feedDAO: FeedDAO | ||
| private lateinit var streamDAO: StreamDAO | ||
| private lateinit var subscriptionDAO: SubscriptionDAO | ||
|
|
||
| private val serviceId = ServiceList.YouTube.serviceId | ||
|
|
||
| private val stream1 = StreamEntity(1, serviceId, "https://youtube.com/watch?v=1", "stream 1", StreamType.VIDEO_STREAM, 1000, "channel-1", "https://youtube.com/channel/1", "https://i.ytimg.com/vi/1/hqdefault.jpg", 100, "2023-01-01", OffsetDateTime.parse("2023-01-01T00:00:00Z")) | ||
| private val stream2 = StreamEntity(2, serviceId, "https://youtube.com/watch?v=2", "stream 2", StreamType.VIDEO_STREAM, 1000, "channel-1", "https://youtube.com/channel/1", "https://i.ytimg.com/vi/1/hqdefault.jpg", 100, "2023-01-02", OffsetDateTime.parse("2023-01-02T00:00:00Z")) | ||
| private val stream3 = StreamEntity(3, serviceId, "https://youtube.com/watch?v=3", "stream 3", StreamType.LIVE_STREAM, 1000, "channel-1", "https://youtube.com/channel/1", "https://i.ytimg.com/vi/1/hqdefault.jpg", 100, "2023-01-03", OffsetDateTime.parse("2023-01-03T00:00:00Z")) | ||
| private val stream4 = StreamEntity(4, serviceId, "https://youtube.com/watch?v=4", "stream 4", StreamType.VIDEO_STREAM, 1000, "channel-2", "https://youtube.com/channel/2", "https://i.ytimg.com/vi/1/hqdefault.jpg", 100, "2023-08-10", OffsetDateTime.parse("2023-08-10T00:00:00Z")) | ||
| private val stream5 = StreamEntity(5, serviceId, "https://youtube.com/watch?v=5", "stream 5", StreamType.VIDEO_STREAM, 1000, "channel-2", "https://youtube.com/channel/2", "https://i.ytimg.com/vi/1/hqdefault.jpg", 100, "2023-08-20", OffsetDateTime.parse("2023-08-20T00:00:00Z")) | ||
| private val stream6 = StreamEntity(6, serviceId, "https://youtube.com/watch?v=6", "stream 6", StreamType.VIDEO_STREAM, 1000, "channel-3", "https://youtube.com/channel/3", "https://i.ytimg.com/vi/1/hqdefault.jpg", 100, "2023-09-01", OffsetDateTime.parse("2023-09-01T00:00:00Z")) | ||
| private val stream7 = StreamEntity(7, serviceId, "https://youtube.com/watch?v=7", "stream 7", StreamType.VIDEO_STREAM, 1000, "channel-4", "https://youtube.com/channel/4", "https://i.ytimg.com/vi/1/hqdefault.jpg", 100, "2023-08-10", OffsetDateTime.parse("2023-08-10T00:00:00Z")) | ||
|
|
||
| private val allStreams = listOf( | ||
| stream1, stream2, stream3, stream4, stream5, stream6, stream7 | ||
| ) | ||
|
|
||
| @Before | ||
| fun createDb() { | ||
| val context = ApplicationProvider.getApplicationContext<Context>() | ||
| db = Room.inMemoryDatabaseBuilder( | ||
| context, AppDatabase::class.java | ||
| ).build() | ||
| feedDAO = db.feedDAO() | ||
| streamDAO = db.streamDAO() | ||
| subscriptionDAO = db.subscriptionDAO() | ||
| } | ||
|
|
||
| @After | ||
| @Throws(IOException::class) | ||
| fun closeDb() { | ||
| db.close() | ||
| } | ||
|
|
||
| @Test | ||
| fun testUnlinkStreamsOlderThan_KeepOne() { | ||
| setupUnlinkDelete("2023-08-15T00:00:00Z") | ||
| val streams = feedDAO.getStreams( | ||
| FeedGroupEntity.GROUP_ALL_ID, includePlayed = true, includePartiallyPlayed = true, null | ||
| ) | ||
| .blockingGet() | ||
| val allowedStreams = listOf(stream3, stream5, stream6, stream7) | ||
| assertEqual(streams, allowedStreams) | ||
| } | ||
|
|
||
| @Test | ||
| fun testUnlinkStreamsOlderThan_KeepMultiple() { | ||
| setupUnlinkDelete("2023-08-01T00:00:00Z") | ||
| val streams = feedDAO.getStreams( | ||
| FeedGroupEntity.GROUP_ALL_ID, includePlayed = true, includePartiallyPlayed = true, null | ||
| ) | ||
| .blockingGet() | ||
| val allowedStreams = listOf(stream3, stream4, stream5, stream6, stream7) | ||
| assertEqual(streams, allowedStreams) | ||
| } | ||
|
|
||
| private fun assertEqual(streams: List<StreamWithState>?, allowedStreams: List<StreamEntity>) { | ||
| assertNotNull(streams) | ||
| assertEquals(allowedStreams, streams!!.stream().map { it.stream }.toList().sortedBy { it.uid }) | ||
| } | ||
|
|
||
| private fun setupUnlinkDelete(time: String) { | ||
| clearAndFillTables() | ||
| Single.fromCallable { | ||
| feedDAO.unlinkStreamsOlderThan(OffsetDateTime.parse(time)) | ||
| }.blockingSubscribe() | ||
| Single.fromCallable { | ||
| streamDAO.deleteOrphans() | ||
| }.blockingSubscribe() | ||
| } | ||
|
|
||
| private fun clearAndFillTables() { | ||
| db.clearAllTables() | ||
| streamDAO.insertAll(allStreams) | ||
| subscriptionDAO.insertAll( | ||
| listOf( | ||
| SubscriptionEntity.from(ChannelInfo(serviceId, "1", "https://youtube.com/channel/1", "https://youtube.com/channel/1", "channel-1")), | ||
| SubscriptionEntity.from(ChannelInfo(serviceId, "2", "https://youtube.com/channel/2", "https://youtube.com/channel/2", "channel-2")), | ||
| SubscriptionEntity.from(ChannelInfo(serviceId, "3", "https://youtube.com/channel/3", "https://youtube.com/channel/3", "channel-3")), | ||
| SubscriptionEntity.from(ChannelInfo(serviceId, "4", "https://youtube.com/channel/4", "https://youtube.com/channel/4", "channel-4")), | ||
| ) | ||
| ) | ||
| feedDAO.insertAll( | ||
| listOf( | ||
| FeedEntity(1, 1), | ||
| FeedEntity(2, 1), | ||
| FeedEntity(3, 1), | ||
| FeedEntity(4, 2), | ||
| FeedEntity(5, 2), | ||
| FeedEntity(6, 3), | ||
| FeedEntity(7, 4), | ||
| ) | ||
| ) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.