-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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 #6196 from viown/prompt-to-skip
Add 'ask to skip' to media segments
- Loading branch information
Showing
10 changed files
with
277 additions
and
25 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,5 +3,6 @@ | |
| */ | ||
| export enum MediaSegmentAction { | ||
| None = 'None', | ||
| AskToSkip = 'AskToSkip', | ||
| Skip = 'Skip' | ||
| } | ||
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
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
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,32 @@ | ||
| .skip-button { | ||
| display: flex; | ||
| align-items: center; | ||
| position: fixed; | ||
| bottom: 18%; | ||
| right: 16%; | ||
| z-index: 10000; | ||
| padding: 12px 20px; | ||
| color: black; | ||
| border: none; | ||
| border-radius: 100px; | ||
| font-weight: bold; | ||
| font-size: 1.2em; | ||
| transition: opacity 200ms ease-out; | ||
| gap: 3px; | ||
| box-shadow: 7px 6px 15px -14px rgba(0, 0, 0, 0.65); | ||
| cursor: pointer; | ||
| } | ||
|
|
||
| @media (orientation: landscape) and (max-height: 500px) { | ||
| .skip-button { | ||
| bottom: 27%; | ||
| } | ||
| } | ||
|
|
||
| .no-transition { | ||
| transition: none; | ||
| } | ||
|
|
||
| .skip-button-hidden { | ||
| opacity: 0; | ||
| } |
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,170 @@ | ||
| import { PlaybackManager } from './playbackmanager'; | ||
| import { TICKS_PER_MILLISECOND, TICKS_PER_SECOND } from 'constants/time'; | ||
| import type { MediaSegmentDto } from '@jellyfin/sdk/lib/generated-client/models/media-segment-dto'; | ||
| import { PlaybackSubscriber } from 'apps/stable/features/playback/utils/playbackSubscriber'; | ||
| import { isInSegment } from 'apps/stable/features/playback/utils/mediaSegments'; | ||
| import Events, { type Event } from '../../utils/events'; | ||
| import { EventType } from 'types/eventType'; | ||
| import './skipbutton.scss'; | ||
| import dom from 'scripts/dom'; | ||
| import globalize from 'lib/globalize'; | ||
|
|
||
| interface ShowOptions { | ||
| animate?: boolean; | ||
| keep?: boolean; | ||
| } | ||
|
|
||
| class SkipSegment extends PlaybackSubscriber { | ||
| private skipElement: HTMLButtonElement | undefined; | ||
| private currentSegment: MediaSegmentDto | null | undefined; | ||
| private hideTimeout: ReturnType<typeof setTimeout> | null | undefined; | ||
|
|
||
| constructor(playbackManager: PlaybackManager) { | ||
| super(playbackManager); | ||
|
|
||
| this.onOsdChanged = this.onOsdChanged.bind(this); | ||
| } | ||
|
|
||
| onHideComplete() { | ||
| if (this.skipElement) { | ||
| this.skipElement.classList.add('hide'); | ||
| } | ||
| } | ||
|
|
||
| createSkipElement() { | ||
| if (!this.skipElement && this.currentSegment) { | ||
| const elem = document.createElement('button'); | ||
| elem.classList.add('skip-button'); | ||
| elem.classList.add('hide'); | ||
| elem.classList.add('skip-button-hidden'); | ||
|
|
||
| elem.addEventListener('click', () => { | ||
| const time = this.playbackManager.currentTime() * TICKS_PER_MILLISECOND; | ||
| if (this.currentSegment?.EndTicks) { | ||
| if (time < this.currentSegment.EndTicks - TICKS_PER_SECOND) { | ||
| this.playbackManager.seek(this.currentSegment.EndTicks); | ||
| } else { | ||
| this.hideSkipButton(); | ||
| } | ||
| } | ||
| }); | ||
|
|
||
| document.body.appendChild(elem); | ||
| this.skipElement = elem; | ||
| } | ||
| } | ||
|
|
||
| setButtonText() { | ||
| if (this.skipElement && this.currentSegment) { | ||
| this.skipElement.innerHTML = globalize.translate('MediaSegmentSkipPrompt', globalize.translate(`MediaSegmentType.${this.currentSegment.Type}`)); | ||
| this.skipElement.innerHTML += '<span class="material-icons skip_next" aria-hidden="true"></span>'; | ||
| } | ||
| } | ||
|
|
||
| showSkipButton(options: ShowOptions) { | ||
| const elem = this.skipElement; | ||
| if (elem) { | ||
| this.clearHideTimeout(); | ||
| dom.removeEventListener(elem, dom.whichTransitionEvent(), this.onHideComplete, { | ||
| once: true | ||
| }); | ||
| elem.classList.remove('hide'); | ||
| if (!options.animate) { | ||
| elem.classList.add('no-transition'); | ||
| } else { | ||
| elem.classList.remove('no-transition'); | ||
| } | ||
|
|
||
| void elem.offsetWidth; | ||
|
|
||
| requestAnimationFrame(() => { | ||
| elem.classList.remove('skip-button-hidden'); | ||
|
|
||
| if (!options.keep) { | ||
| this.hideTimeout = setTimeout(this.hideSkipButton.bind(this), 8000); | ||
| } | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| hideSkipButton() { | ||
| const elem = this.skipElement; | ||
| if (elem) { | ||
| elem.classList.remove('no-transition'); | ||
| void elem.offsetWidth; | ||
|
|
||
| requestAnimationFrame(() => { | ||
| elem.classList.add('skip-button-hidden'); | ||
|
|
||
| dom.addEventListener(elem, dom.whichTransitionEvent(), this.onHideComplete, { | ||
| once: true | ||
| }); | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| clearHideTimeout() { | ||
| if (this.hideTimeout) { | ||
| clearTimeout(this.hideTimeout); | ||
| this.hideTimeout = null; | ||
| } | ||
| } | ||
|
|
||
| onOsdChanged(_e: Event, isOpen: boolean) { | ||
| if (this.currentSegment) { | ||
| if (isOpen) { | ||
| this.showSkipButton({ | ||
| animate: false, | ||
| keep: true | ||
| }); | ||
| } else if (!this.hideTimeout) { | ||
| this.hideSkipButton(); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| onPromptSkip(e: Event, segment: MediaSegmentDto) { | ||
| if (this.player && segment.EndTicks != null | ||
| && segment.EndTicks >= this.playbackManager.currentItem(this.player).RunTimeTicks | ||
| && this.playbackManager.getNextItem() | ||
| ) { | ||
| // Don't display button when UpNextDialog is expected. | ||
| return; | ||
| } | ||
| if (!this.currentSegment) { | ||
| this.currentSegment = segment; | ||
|
|
||
| this.createSkipElement(); | ||
|
|
||
| this.setButtonText(); | ||
|
|
||
| this.showSkipButton({ animate: true }); | ||
| } | ||
| } | ||
|
|
||
| onPlayerTimeUpdate() { | ||
| if (this.currentSegment) { | ||
| const time = this.playbackManager.currentTime(this.player) * TICKS_PER_MILLISECOND; | ||
|
|
||
| if (!isInSegment(this.currentSegment, time)) { | ||
| this.currentSegment = null; | ||
| this.hideSkipButton(); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| onPlayerChange(): void { | ||
| if (this.playbackManager.getCurrentPlayer()) { | ||
| Events.off(document, EventType.SHOW_VIDEO_OSD, this.onOsdChanged); | ||
| Events.on(document, EventType.SHOW_VIDEO_OSD, this.onOsdChanged); | ||
| } | ||
| } | ||
|
|
||
| onPlaybackStop() { | ||
| this.currentSegment = null; | ||
| this.hideSkipButton(); | ||
| Events.off(document, EventType.SHOW_VIDEO_OSD, this.onOsdChanged); | ||
| } | ||
| } | ||
|
|
||
| export const bindSkipSegment = (playbackManager: PlaybackManager) => new SkipSegment(playbackManager); |
Oops, something went wrong.