TeamPiped-mirror/Piped
1
0
Fork 0
mirror of https://github.com/TeamPiped/Piped.git synced 2024-08-14 23:57:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Implement show-only sponsor segments

Browse source 
Also add groundwork for manual skip
This commit is contained in:
photochlorination 2022-11-19 22:58:07 -08:00
parent fbc16e7d15
commit 90ef42abef
2 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/components/PreferencesPage.vue
View file

@ -188,6 +188,7 @@
<select id="chkSkipSponsors" v-model="skipSponsor" @change="onChange($event)"> <select id="chkSkipSponsors" v-model="skipSponsor" @change="onChange($event)">
<option value="off">Disable</option> <option value="off">Disable</option>
<option value="skip">Auto Skip</option> <option value="skip">Auto Skip</option>
<option value="manual">Manual Skip</option>
<option value="show">Show</option> <option value="show">Show</option>
</select> </select>
</label> </label>
@ -196,6 +197,7 @@
<select id="chkSkipIntro" v-model="skipIntro" @change="onChange($event)"> <select id="chkSkipIntro" v-model="skipIntro" @change="onChange($event)">
<option value="off">Disable</option> <option value="off">Disable</option>
<option value="skip">Auto Skip</option> <option value="skip">Auto Skip</option>
<option value="manual">Manual Skip</option>
<option value="show">Show</option> <option value="show">Show</option>
</select> </select>
</label> </label>
@ -204,6 +206,7 @@
<select id="chkSkipOutro" v-model="skipOutro" @change="onChange($event)"> <select id="chkSkipOutro" v-model="skipOutro" @change="onChange($event)">
<option value="off">Disable</option> <option value="off">Disable</option>
<option value="skip">Auto Skip</option> <option value="skip">Auto Skip</option>
<option value="manual">Manual Skip</option>
<option value="show">Show</option> <option value="show">Show</option>
</select> </select>
</label> </label>
@ -212,6 +215,7 @@
<select id="chkSkipPreview" v-model="skipPreview" @change="onChange($event)"> <select id="chkSkipPreview" v-model="skipPreview" @change="onChange($event)">
<option value="off">Disable</option> <option value="off">Disable</option>
<option value="skip">Auto Skip</option> <option value="skip">Auto Skip</option>
<option value="manual">Manual Skip</option>
<option value="show">Show</option> <option value="show">Show</option>
</select> </select>
</label> </label>
@ -220,6 +224,7 @@
<select id="chkSkipInteraction" v-model="skipInteraction" @change="onChange($event)"> <select id="chkSkipInteraction" v-model="skipInteraction" @change="onChange($event)">
<option value="off">Disable</option> <option value="off">Disable</option>
<option value="skip">Auto Skip</option> <option value="skip">Auto Skip</option>
<option value="manual">Manual Skip</option>
<option value="show">Show</option> <option value="show">Show</option>
</select> </select>
</label> </label>
@ -228,6 +233,7 @@
<select id="chkSkipSelfPromo" v-model="skipSelfPromo" @change="onChange($event)"> <select id="chkSkipSelfPromo" v-model="skipSelfPromo" @change="onChange($event)">
<option value="off">Disable</option> <option value="off">Disable</option>
<option value="skip">Auto Skip</option> <option value="skip">Auto Skip</option>
<option value="manual">Manual Skip</option>
<option value="show">Show</option> <option value="show">Show</option>
</select> </select>
</label> </label>
@ -236,6 +242,7 @@
<select id="chkSkipNonMusic" v-model="skipMusicOffTopic" @change="onChange($event)"> <select id="chkSkipNonMusic" v-model="skipMusicOffTopic" @change="onChange($event)">
<option value="off">Disable</option> <option value="off">Disable</option>
<option value="skip">Auto Skip</option> <option value="skip">Auto Skip</option>
<option value="manual">Manual Skip</option>
<option value="show">Show</option> <option value="show">Show</option>
</select> </select>
</label> </label>
@ -244,6 +251,7 @@
<select id="chkSkipHighlight" v-model="skipHighlight" @change="onChange($event)"> <select id="chkSkipHighlight" v-model="skipHighlight" @change="onChange($event)">
<option value="off">Disable</option> <option value="off">Disable</option>
<option value="skip">Auto Skip</option> <option value="skip">Auto Skip</option>
<option value="manual">Manual Skip</option>
<option value="show">Show</option> <option value="show">Show</option>
</select> </select>
</label> </label>
@ -252,6 +260,7 @@
<select id="chkSkipFiller" v-model="skipFiller" @change="onChange($event)"> <select id="chkSkipFiller" v-model="skipFiller" @change="onChange($event)">
<option value="off">Disable</option> <option value="off">Disable</option>
<option value="skip">Auto Skip</option> <option value="skip">Auto Skip</option>
<option value="manual">Manual Skip</option>
<option value="show">Show</option> <option value="show">Show</option>
</select> </select>
</label> </label>

10
src/components/VideoPlayer.vue
View file

@ -361,8 +361,14 @@ export default {
if (!segment.skipped || this.selectedAutoLoop) { if (!segment.skipped || this.selectedAutoLoop) {
const end = segment.segment[1]; const end = segment.segment[1];
if (time >= segment.segment[0] && time < end) { if (time >= segment.segment[0] && time < end) {
console.log("Skipped segment at " + time); switch (this.getPreferenceDict("selectedSkip")[segment.category]) {
videoEl.currentTime = end; case "skip":
console.log("Skipped segment at " + time);
videoEl.currentTime = end;
break;
// show and off cases are do-nothing
// TODO: Manual skip
}
segment.skipped = true; segment.skipped = true;
return; return;
} }