kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2025-04-27 15:30:31 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #1681 from Bnyro/master

Browse Source 
cleanup sponsorblock
This commit is contained in:
Bnyro 2022-10-28 23:39:48 +02:00 committed by GitHub
commit 1ec41fa2ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/github/libretube/api/PipedApi.kt
View File

@ -9,7 +9,7 @@ import com.github.libretube.api.obj.Playlist
import com.github.libretube.api.obj.PlaylistId
import com.github.libretube.api.obj.Playlists
import com.github.libretube.api.obj.SearchResult
import com.github.libretube.api.obj.Segments
import com.github.libretube.api.obj.SegmentData
import com.github.libretube.api.obj.StreamItem
import com.github.libretube.api.obj.Streams
import com.github.libretube.api.obj.Subscribe
@ -36,7 +36,7 @@ interface PipedApi {
suspend fun getSegments(
@Path("videoId") videoId: String,
@Query("category") category: String
): Segments
): SegmentData
@GET("nextpage/comments/{videoId}")
suspend fun getCommentsNextPage(
@ -48,7 +48,7 @@ interface PipedApi {
suspend fun getSearchResults(
@Query("q") searchQuery: String,
@Query("filter") filter: String
): com.github.libretube.api.obj.SearchResult
): SearchResult
@GET("nextpage/search")
suspend fun getSearchResultsNextPage(

8
app/src/main/java/com/github/libretube/api/obj/Segment.kt
View File

@ -4,7 +4,13 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties
@JsonIgnoreProperties(ignoreUnknown = true)
data class Segment(
val UUID: String? = null,
val actionType: String? = null,
val category: String? = null,
val segment: List<Float>? = arrayListOf()
val description: String? = null,
val locked: Int? = null,
val segment: List<Double> = listOf(),
val userID: String? = null,
val videoDuration: Double? = null,
val votes: Int? = null
)

6
app/src/main/java/com/github/libretube/api/obj/Segments.kt → app/src/main/java/com/github/libretube/api/obj/SegmentData.kt
View File

@ -3,6 +3,8 @@ package com.github.libretube.api.obj
import com.fasterxml.jackson.annotation.JsonIgnoreProperties
@JsonIgnoreProperties(ignoreUnknown = true)
data class Segments(
val segments: MutableList<Segment> = arrayListOf()
data class SegmentData(
val hash: String? = null,
val segments: List<Segment> = listOf(),
val videoID: String? = null
)

6
app/src/main/java/com/github/libretube/services/BackgroundMode.kt
View File

@ -15,7 +15,7 @@ import com.fasterxml.jackson.databind.ObjectMapper
import com.github.libretube.R
import com.github.libretube.api.RetrofitInstance
import com.github.libretube.api.obj.Segment
import com.github.libretube.api.obj.Segments
import com.github.libretube.api.obj.SegmentData
import com.github.libretube.api.obj.Streams
import com.github.libretube.constants.BACKGROUND_CHANNEL_ID
import com.github.libretube.constants.IntentData
@ -72,7 +72,7 @@ class BackgroundMode : Service() {
/**
* SponsorBlock Segment data
*/
private var segmentData: Segments? = null
private var segmentData: SegmentData? = null
/**
* [Notification] for the player
@ -325,7 +325,7 @@ class BackgroundMode : Service() {
if (segmentData == null || segmentData!!.segments.isEmpty()) return
segmentData!!.segments.forEach { segment: Segment ->
val segmentStart = (segment.segment!![0] * 1000f).toLong()
val segmentStart = (segment.segment[0] * 1000f).toLong()
val segmentEnd = (segment.segment[1] * 1000f).toLong()
val currentPosition = player?.currentPosition
if (currentPosition in segmentStart until segmentEnd) {

8
app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
View File

@ -38,6 +38,8 @@ import com.github.libretube.R
import com.github.libretube.api.CronetHelper
import com.github.libretube.api.RetrofitInstance
import com.github.libretube.api.SubscriptionHelper
import com.github.libretube.api.obj.ChapterSegment
import com.github.libretube.api.obj.SegmentData
import com.github.libretube.constants.IntentData
import com.github.libretube.constants.PreferenceKeys
import com.github.libretube.constants.ShareObjectType
@ -139,8 +141,8 @@ class PlayerFragment : BaseFragment() {
*/
private lateinit var exoPlayer: ExoPlayer
private lateinit var trackSelector: DefaultTrackSelector
private lateinit var segmentData: com.github.libretube.api.obj.Segments
private lateinit var chapters: List<com.github.libretube.api.obj.ChapterSegment>
private lateinit var segmentData: SegmentData
private lateinit var chapters: List<ChapterSegment>
/**
* for the player view
@ -598,7 +600,7 @@ class PlayerFragment : BaseFragment() {
val currentPosition = exoPlayer.currentPosition
segmentData.segments.forEach { segment: com.github.libretube.api.obj.Segment ->
val segmentStart = (segment.segment!![0] * 1000f).toLong()
val segmentStart = (segment.segment[0] * 1000f).toLong()
val segmentEnd = (segment.segment[1] * 1000f).toLong()
// show the button to manually skip the segment

4
app/src/main/java/com/github/libretube/ui/views/MarkableTimeBar.kt
View File

@ -43,7 +43,7 @@ class MarkableTimeBar(
segments.forEach {
canvas.drawRect(
Rect(
(it.segment!!.first() + HORIZONTAL_OFFSET).toLength(),
(it.segment.first() + HORIZONTAL_OFFSET).toLength(),
marginY,
(it.segment.last() + HORIZONTAL_OFFSET).toLength(),
canvas.height - marginY - 1
@ -56,7 +56,7 @@ class MarkableTimeBar(
canvas.restore()
}
private fun Float.toLength(): Int {
private fun Double.toLength(): Int {
return (this * 1000 / player!!.duration * length).toInt()
}

1
app/src/main/java/com/github/libretube/util/LocaleHelper.kt
View File

@ -35,6 +35,7 @@ object LocaleHelper {
val dm = res.displayMetrics
val conf = res.configuration
conf.setLocale(locale)
@Suppress("DEPRECATION")
res.updateConfiguration(conf, dm)
}