mirror of
https://github.com/TeamPiped/Piped.git
synced 2024-08-30 18:43:17 +00:00
Clean up sponsorblock prefs
This commit is contained in:
novenary
parent
f03e323f90
commit
47c482a9cb
@ -184,73 +184,9 @@
|
|||||||
/>
|
/>
|
||||||
</label>
|
</label>
|
||||||
<div v-if="sponsorBlock">
|
<div v-if="sponsorBlock">
|
||||||
<label class="pref" for="ddlSkipSponsors">
|
<label v-for="[name, item] in skipOptions" class="pref" :for="'ddlSkip_' + name" :key="name">
|
||||||
<strong v-t="'actions.skip_sponsors'" />
|
<strong v-t="item.label" />
|
||||||
<select id="ddlSkipSponsors" v-model="skipSponsor" class="select w-auto" @change="onChange($event)">
|
<select :id="'ddlSkip_' + name" v-model="item.value" class="select w-auto" @change="onChange($event)">
|
||||||
<option v-t="'actions.no'" value="no" />
|
|
||||||
<option v-t="'actions.skip_button_only'" value="button" />
|
|
||||||
<option v-t="'actions.skip_automatically'" value="auto" />
|
|
||||||
</select>
|
|
||||||
</label>
|
|
||||||
<label class="pref" for="ddlSkipIntro">
|
|
||||||
<strong v-t="'actions.skip_intro'" />
|
|
||||||
<select id="ddlSkipIntro" v-model="skipIntro" class="select w-auto" @change="onChange($event)">
|
|
||||||
<option v-t="'actions.no'" value="no" />
|
|
||||||
<option v-t="'actions.skip_button_only'" value="button" />
|
|
||||||
<option v-t="'actions.skip_automatically'" value="auto" />
|
|
||||||
</select>
|
|
||||||
</label>
|
|
||||||
<label class="pref" for="ddlSkipOutro">
|
|
||||||
<strong v-t="'actions.skip_outro'" />
|
|
||||||
<select id="ddlSkipOutro" v-model="skipOutro" class="select w-auto" @change="onChange($event)">
|
|
||||||
<option v-t="'actions.no'" value="no" />
|
|
||||||
<option v-t="'actions.skip_button_only'" value="button" />
|
|
||||||
<option v-t="'actions.skip_automatically'" value="auto" />
|
|
||||||
</select>
|
|
||||||
</label>
|
|
||||||
<label class="pref" for="ddlSkipPreview">
|
|
||||||
<strong v-t="'actions.skip_preview'" />
|
|
||||||
<select id="ddlSkipPreview" v-model="skipPreview" class="select w-auto" @change="onChange($event)">
|
|
||||||
<option v-t="'actions.no'" value="no" />
|
|
||||||
<option v-t="'actions.skip_button_only'" value="button" />
|
|
||||||
<option v-t="'actions.skip_automatically'" value="auto" />
|
|
||||||
</select>
|
|
||||||
</label>
|
|
||||||
<label class="pref" for="ddlSkipInteraction">
|
|
||||||
<strong v-t="'actions.skip_interaction'" />
|
|
||||||
<select id="ddlSkipInteraction" v-model="skipInteraction" class="select w-auto" @change="onChange($event)">
|
|
||||||
<option v-t="'actions.no'" value="no" />
|
|
||||||
<option v-t="'actions.skip_button_only'" value="button" />
|
|
||||||
<option v-t="'actions.skip_automatically'" value="auto" />
|
|
||||||
</select>
|
|
||||||
</label>
|
|
||||||
<label class="pref" for="ddlSkipSelfPromo">
|
|
||||||
<strong v-t="'actions.skip_self_promo'" />
|
|
||||||
<select id="ddlSkipSelfPromo" v-model="skipSelfPromo" class="select w-auto" @change="onChange($event)">
|
|
||||||
<option v-t="'actions.no'" value="no" />
|
|
||||||
<option v-t="'actions.skip_button_only'" value="button" />
|
|
||||||
<option v-t="'actions.skip_automatically'" value="auto" />
|
|
||||||
</select>
|
|
||||||
</label>
|
|
||||||
<label class="pref" for="ddlSkipNonMusic">
|
|
||||||
<strong v-t="'actions.skip_non_music'" />
|
|
||||||
<select id="ddlSkipNonMusic" v-model="skipMusicOffTopic" class="select w-auto" @change="onChange($event)">
|
|
||||||
<option v-t="'actions.no'" value="no" />
|
|
||||||
<option v-t="'actions.skip_button_only'" value="button" />
|
|
||||||
<option v-t="'actions.skip_automatically'" value="auto" />
|
|
||||||
</select>
|
|
||||||
</label>
|
|
||||||
<label class="pref" for="ddlSkipHighlight">
|
|
||||||
<strong v-t="'actions.skip_highlight'" />
|
|
||||||
<select id="ddlSkipHighlight" v-model="skipHighlight" class="select w-auto" @change="onChange($event)">
|
|
||||||
<option v-t="'actions.no'" value="no" />
|
|
||||||
<option v-t="'actions.skip_button_only'" value="button" />
|
|
||||||
<option v-t="'actions.skip_automatically'" value="auto" />
|
|
||||||
</select>
|
|
||||||
</label>
|
|
||||||
<label class="pref" for="ddlSkipFiller">
|
|
||||||
<strong v-t="'actions.skip_filler_tangent'" />
|
|
||||||
<select id="ddlSkipFiller" v-model="skipFiller" class="select w-auto" @change="onChange($event)">
|
|
||||||
<option v-t="'actions.no'" value="no" />
|
<option v-t="'actions.no'" value="no" />
|
||||||
<option v-t="'actions.skip_button_only'" value="button" />
|
<option v-t="'actions.skip_button_only'" value="button" />
|
||||||
<option v-t="'actions.skip_automatically'" value="auto" />
|
<option v-t="'actions.skip_automatically'" value="auto" />
|
||||||
@ -395,15 +331,17 @@ export default {
|
|||||||
selectedAuthInstance: null,
|
selectedAuthInstance: null,
|
||||||
instances: [],
|
instances: [],
|
||||||
sponsorBlock: true,
|
sponsorBlock: true,
|
||||||
skipSponsor: "auto",
|
skipOptions: new Map([
|
||||||
skipIntro: "no",
|
["sponsor", { value: "auto", label: "actions.skip_sponsors" }],
|
||||||
skipOutro: "no",
|
["intro", { value: "no", label: "actions.skip_intro" }],
|
||||||
skipPreview: "no",
|
["outro", { value: "no", label: "actions.skip_outro" }],
|
||||||
skipInteraction: "auto",
|
["preview", { value: "no", label: "actions.skip_preview" }],
|
||||||
skipSelfPromo: "auto",
|
["interaction", { value: "auto", label: "actions.skip_interaction" }],
|
||||||
skipMusicOffTopic: "auto",
|
["selfpromo", { value: "auto", label: "actions.skip_self_promo" }],
|
||||||
skipHighlight: "no",
|
["music_offtopic", { value: "auto", label: "actions.skip_non_music" }],
|
||||||
skipFiller: "no",
|
["poi_highlight", { value: "no", label: "actions.skip_highlight" }],
|
||||||
|
["filler", { value: "no", label: "actions.skip_filler_tangent" }],
|
||||||
|
]),
|
||||||
showMarkers: true,
|
showMarkers: true,
|
||||||
minSegmentLength: 0,
|
minSegmentLength: 0,
|
||||||
selectedTheme: "dark",
|
selectedTheme: "dark",
|
||||||
@ -504,60 +442,18 @@ export default {
|
|||||||
this.sponsorBlock = this.getPreferenceBoolean("sponsorblock", true);
|
this.sponsorBlock = this.getPreferenceBoolean("sponsorblock", true);
|
||||||
var skipOptions, skipList;
|
var skipOptions, skipList;
|
||||||
if ((skipOptions = this.getPreferenceJSON("skipOptions")) !== undefined) {
|
if ((skipOptions = this.getPreferenceJSON("skipOptions")) !== undefined) {
|
||||||
if (skipOptions.sponsor !== undefined) this.skipSponsor = skipOptions.sponsor;
|
Object.entries(skipOptions).forEach(([key, value]) => {
|
||||||
if (skipOptions.intro !== undefined) this.skipIntro = skipOptions.intro;
|
var opt = this.skipOptions.get(key);
|
||||||
if (skipOptions.outro !== undefined) this.skipOutro = skipOptions.outro;
|
if (opt !== undefined) opt.value = value;
|
||||||
if (skipOptions.preview !== undefined) this.skipPreview = skipOptions.preview;
|
else console.log("Unknown sponsor type: " + key);
|
||||||
if (skipOptions.interaction !== undefined) this.skipInteraction = skipOptions.interaction;
|
});
|
||||||
if (skipOptions.selfpromo !== undefined) this.skipSelfPromo = skipOptions.selfpromo;
|
|
||||||
if (skipOptions.music_offtopic !== undefined) this.skipMusicOffTopic = skipOptions.music_offtopic;
|
|
||||||
if (skipOptions.poi_highlight !== undefined) this.skipHighlight = skipOptions.poi_highlight;
|
|
||||||
if (skipOptions.filler !== undefined) this.skipFiller = skipOptions.filler;
|
|
||||||
} else if ((skipList = this.getPreferenceString("selectedSkip")) !== undefined) {
|
} else if ((skipList = this.getPreferenceString("selectedSkip")) !== undefined) {
|
||||||
skipList = skipList.split(",");
|
skipList = skipList.split(",");
|
||||||
this.skipSponsor =
|
this.skipOptions.forEach(opt => (opt.value = "no"));
|
||||||
this.skipIntro =
|
|
||||||
this.skipOutro =
|
|
||||||
this.skipPreview =
|
|
||||||
this.skipInteraction =
|
|
||||||
this.skipSelfPromo =
|
|
||||||
this.skipMusicOffTopic =
|
|
||||||
this.skipHighlight =
|
|
||||||
this.skipFiller =
|
|
||||||
"no";
|
|
||||||
skipList.forEach(skip => {
|
skipList.forEach(skip => {
|
||||||
switch (skip) {
|
var opt = this.skipOptions.get(skip);
|
||||||
case "sponsor":
|
if (opt !== undefined) opt.value = "auto";
|
||||||
this.skipSponsor = "auto";
|
else console.log("Unknown sponsor type: " + skip);
|
||||||
break;
|
|
||||||
case "intro":
|
|
||||||
this.skipIntro = "auto";
|
|
||||||
break;
|
|
||||||
case "outro":
|
|
||||||
this.skipOutro = "auto";
|
|
||||||
break;
|
|
||||||
case "preview":
|
|
||||||
this.skipPreview = "auto";
|
|
||||||
break;
|
|
||||||
case "interaction":
|
|
||||||
this.skipInteraction = "auto";
|
|
||||||
break;
|
|
||||||
case "selfpromo":
|
|
||||||
this.skipSelfPromo = "auto";
|
|
||||||
break;
|
|
||||||
case "music_offtopic":
|
|
||||||
this.skipMusicOffTopic = "auto";
|
|
||||||
break;
|
|
||||||
case "poi_highlight":
|
|
||||||
this.skipHighlight = "auto";
|
|
||||||
break;
|
|
||||||
case "filler":
|
|
||||||
this.skipFiller = "auto";
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
console.log("Unknown sponsor type: " + skip);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -611,17 +507,8 @@ export default {
|
|||||||
localStorage.setItem("auth_instance_url", this.selectedAuthInstance);
|
localStorage.setItem("auth_instance_url", this.selectedAuthInstance);
|
||||||
localStorage.setItem("sponsorblock", this.sponsorBlock);
|
localStorage.setItem("sponsorblock", this.sponsorBlock);
|
||||||
|
|
||||||
const skipOptions = {
|
var skipOptions = {};
|
||||||
sponsor: this.skipSponsor,
|
this.skipOptions.forEach((v, k) => (skipOptions[k] = v.value));
|
||||||
intro: this.skipIntro,
|
|
||||||
outro: this.skipOutro,
|
|
||||||
preview: this.skipPreview,
|
|
||||||
interaction: this.skipInteraction,
|
|
||||||
selfpromo: this.skipSelfPromo,
|
|
||||||
music_offtopic: this.skipMusicOffTopic,
|
|
||||||
poi_highlight: this.skipHighlight,
|
|
||||||
filler: this.skipFiller,
|
|
||||||
};
|
|
||||||
localStorage.setItem("skipOptions", JSON.stringify(skipOptions));
|
localStorage.setItem("skipOptions", JSON.stringify(skipOptions));
|
||||||
|
|
||||||
localStorage.setItem("showMarkers", this.showMarkers);
|
localStorage.setItem("showMarkers", this.showMarkers);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user