kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2024-12-14 06:10:31 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #4807 from Bnyro/master

Browse Source 
fix: default SponsorBlock categories are not being respected
This commit is contained in:
Bnyro 2023-09-18 09:12:47 +02:00 committed by GitHub
commit 86007d5998
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/com/github/libretube/helpers/PlayerHelper.kt
View File

@ -47,6 +47,15 @@ object PlayerHelper {
const val SPONSOR_HIGHLIGHT_CATEGORY = "poi_highlight" const val SPONSOR_HIGHLIGHT_CATEGORY = "poi_highlight"
const val ROLE_FLAG_AUTO_GEN_SUBTITLE = C.ROLE_FLAG_SUPPLEMENTARY const val ROLE_FLAG_AUTO_GEN_SUBTITLE = C.ROLE_FLAG_SUPPLEMENTARY
/**
* A list of all categories that are not disabled by default
* Also update `sponsorblock_settings.xml` when modifying this!
*/
private val sbDefaultValues = mapOf(
"sponsor" to SbSkipOptions.AUTOMATIC,
"selfpromo" to SbSkipOptions.AUTOMATIC
)
/** /**
* Create a base64 encoded DASH stream manifest * Create a base64 encoded DASH stream manifest
*/ */
@ -221,7 +230,7 @@ object PlayerHelper {
.roundToInt() .roundToInt()
.toLong() * 1000 .toLong() * 1000
val playbackSpeed: Float private val playbackSpeed: Float
get() = PreferenceHelper.getString( get() = PreferenceHelper.getString(
PreferenceKeys.PLAYBACK_SPEED, PreferenceKeys.PLAYBACK_SPEED,
"1" "1"
@ -456,11 +465,16 @@ object PlayerHelper {
for (category in LibreTubeApp.instance.resources.getStringArray( for (category in LibreTubeApp.instance.resources.getStringArray(
R.array.sponsorBlockSegments R.array.sponsorBlockSegments
)) { )) {
val state = PreferenceHelper.getString(category + "_category", "off").uppercase() val defaultCategoryValue = sbDefaultValues.getOrDefault(category, SbSkipOptions.OFF)
if (SbSkipOptions.valueOf(state) != SbSkipOptions.OFF) { val skipOption = PreferenceHelper
categories[category] = SbSkipOptions.valueOf(state) .getString("${category}_category", defaultCategoryValue.name)
.let { SbSkipOptions.valueOf(it.uppercase()) }
if (skipOption != SbSkipOptions.OFF) {
categories[category] = skipOption
} }
} }
// Add the highlights category to display in the chapters // Add the highlights category to display in the chapters
if (sponsorBlockHighlights) categories[SPONSOR_HIGHLIGHT_CATEGORY] = SbSkipOptions.OFF if (sponsorBlockHighlights) categories[SPONSOR_HIGHLIGHT_CATEGORY] = SbSkipOptions.OFF
return categories return categories

2
app/src/main/res/xml/sponsorblock_settings.xml
View File

@ -50,6 +50,8 @@
<PreferenceCategory app:title="@string/category_segments"> <PreferenceCategory app:title="@string/category_segments">
<!-- When changing default values, they must also be changed in the PlayerHelper.kt file! -->
<com.github.libretube.ui.views.SbSpinnerPreference <com.github.libretube.ui.views.SbSpinnerPreference
app:defaultValue="automatic" app:defaultValue="automatic"
app:key="sponsor_category" app:key="sponsor_category"