Skip to content

Commit

Permalink
Scene queue autoplay (#4428)
Browse files Browse the repository at this point in the history 
* Remove unnecessary undefined checks
* Respect autostartVideoOnPlaySelected in scene queue
  • Loading branch information
@DingDongSoLong4
DingDongSoLong4 authored Jan 8, 2024
1 parent b968aa3 commit 5b9a96b
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 57 deletions.
8 changes: 4 additions & 4 deletions ui/v2.5/src/components/Scenes/SceneDetails/QueueViewer.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { objectTitle } from "src/core/files";
import { QueuedScene } from "src/models/sceneQueue";

export interface IPlaylistViewer {
scenes?: QueuedScene[];
scenes: QueuedScene[];
currentID?: string;
start?: number;
continue?: boolean;
Expand Down Expand Up @@ -47,7 +47,7 @@ export const QueueViewer: React.FC<IPlaylistViewer> = ({
const [lessLoading, setLessLoading] = useState(false);
const [moreLoading, setMoreLoading] = useState(false);

const currentIndex = scenes?.findIndex((s) => s.id === currentID) ?? 0;
const currentIndex = scenes.findIndex((s) => s.id === currentID);

useEffect(() => {
setLessLoading(false);
Expand Down Expand Up @@ -130,7 +130,7 @@ export const QueueViewer: React.FC<IPlaylistViewer> = ({
) : (
""
)}
{currentIndex < (scenes ?? []).length - 1 || hasMoreScenes ? (
{currentIndex < scenes.length - 1 || hasMoreScenes ? (
<Button
className="minimal"
variant="secondary"
Expand Down Expand Up @@ -162,7 +162,7 @@ export const QueueViewer: React.FC<IPlaylistViewer> = ({
</Button>
</div>
) : undefined}
<ol start={start}>{(scenes ?? []).map(renderPlaylistEntry)}</ol>
<ol start={start}>{scenes.map(renderPlaylistEntry)}</ol>
{hasMoreScenes ? (
<div className="d-flex justify-content-center">
<Button onClick={() => moreClicked()} disabled={moreLoading}>
Expand Down
100 changes: 49 additions & 51 deletions ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@ interface IProps {
onQueueNext: () => void;
onQueuePrevious: () => void;
onQueueRandom: () => void;
onQueueSceneClicked: (sceneID: string) => void;
onDelete: () => void;
continuePlaylist: boolean;
loadScene: (sceneID: string) => void;
queueHasMoreScenes: boolean;
onQueueMoreScenes: () => void;
onQueueLessScenes: () => void;
Expand All @@ -104,9 +104,9 @@ const ScenePage: React.FC<IProps> = ({
onQueueNext,
onQueuePrevious,
onQueueRandom,
onQueueSceneClicked,
onDelete,
continuePlaylist,
loadScene,
queueHasMoreScenes,
onQueueMoreScenes,
onQueueLessScenes,
Expand Down Expand Up @@ -359,7 +359,7 @@ const ScenePage: React.FC<IProps> = ({
<FormattedMessage id="details" />
</Nav.Link>
</Nav.Item>
{(queueScenes ?? []).length > 0 ? (
{queueScenes.length > 0 ? (
<Nav.Item>
<Nav.Link eventKey="scene-queue-panel">
<FormattedMessage id="queue" />
Expand Down Expand Up @@ -445,7 +445,7 @@ const ScenePage: React.FC<IProps> = ({
currentID={scene.id}
continue={continuePlaylist}
setContinue={setContinuePlaylist}
onSceneClicked={loadScene}
onSceneClicked={onQueueSceneClicked}
onNext={onQueueNext}
onPrevious={onQueuePrevious}
onRandom={onQueueRandom}
Expand Down Expand Up @@ -594,8 +594,11 @@ const SceneLoader: React.FC<RouteComponentProps<ISceneParams>> = ({
const [queueStart, setQueueStart] = useState(1);

const autoplay = queryParams.get("autoplay") === "true";
const autoPlayOnSelected =
configuration?.interface.autostartVideoOnPlaySelected ?? false;

const currentQueueIndex = useMemo(
() => (queueScenes ? queueScenes.findIndex((s) => s.id === id) : -1),
() => queueScenes.findIndex((s) => s.id === id),
[queueScenes, id]
);

Expand Down Expand Up @@ -692,61 +695,46 @@ const SceneLoader: React.FC<RouteComponentProps<ISceneParams>> = ({
history.replace(sceneLink);
}

function onDelete() {
if (
continuePlaylist &&
queueScenes &&
currentQueueIndex >= 0 &&
currentQueueIndex < queueScenes.length - 1
) {
loadScene(queueScenes[currentQueueIndex + 1].id);
} else {
history.push("/scenes");
}
}

async function onQueueNext() {
if (!queueScenes) return;
async function queueNext(autoPlay: boolean) {
if (currentQueueIndex === -1) return;

if (currentQueueIndex >= 0 && currentQueueIndex < queueScenes.length - 1) {
loadScene(queueScenes[currentQueueIndex + 1].id, true);
if (currentQueueIndex < queueScenes.length - 1) {
loadScene(queueScenes[currentQueueIndex + 1].id, autoPlay);
} else {
// if we're at the end of the queue, load more scenes
if (
currentQueueIndex >= 0 &&
currentQueueIndex === queueScenes.length - 1 &&
queueHasMoreScenes
) {
if (currentQueueIndex === queueScenes.length - 1 && queueHasMoreScenes) {
const loadedScenes = await onQueueMoreScenes();
if (loadedScenes && loadedScenes.length > 0) {
// set the page to the next page
const newPage = (sceneQueue.query?.currentPage ?? 0) + 1;
loadScene(loadedScenes[0].id, true, newPage);
loadScene(loadedScenes[0].id, autoPlay, newPage);
}
}
}
}

async function onQueuePrevious() {
if (!queueScenes) return;
async function queuePrevious(autoPlay: boolean) {
if (currentQueueIndex === -1) return;

if (currentQueueIndex > 0) {
loadScene(queueScenes[currentQueueIndex - 1].id, true);
loadScene(queueScenes[currentQueueIndex - 1].id, autoPlay);
} else {
// if we're at the beginning of the queue, load the previous page
if (currentQueueIndex === 0 && queueStart > 1) {
if (queueStart > 1) {
const loadedScenes = await onQueueLessScenes();
if (loadedScenes && loadedScenes.length > 0) {
const newPage = (sceneQueue.query?.currentPage ?? 0) - 1;
loadScene(loadedScenes[loadedScenes.length - 1].id, true, newPage);
loadScene(
loadedScenes[loadedScenes.length - 1].id,
autoPlay,
newPage
);
}
}
}
}

async function onQueueRandom() {
if (!queueScenes) return;

async function queueRandom(autoPlay: boolean) {
if (sceneQueue.query) {
const { query } = sceneQueue;
const pages = Math.ceil(queueTotal / query.itemsPerPage);
Expand All @@ -760,20 +748,30 @@ const SceneLoader: React.FC<RouteComponentProps<ISceneParams>> = ({
if (queryResults.data.findScenes.scenes.length > index) {
const { id: sceneID } = queryResults.data.findScenes.scenes[index];
// navigate to the image player page
loadScene(sceneID, undefined, page);
loadScene(sceneID, autoPlay, page);
}
} else {
} else if (queueTotal !== 0) {
const index = Math.floor(Math.random() * queueTotal);
loadScene(queueScenes[index].id);
loadScene(queueScenes[index].id, autoPlay);
}
}

function onComplete() {
if (!queueScenes) return;

// load the next scene if we're continuing
if (continuePlaylist) {
onQueueNext();
queueNext(true);
}
}

function onDelete() {
if (
continuePlaylist &&
currentQueueIndex >= 0 &&
currentQueueIndex < queueScenes.length - 1
) {
loadScene(queueScenes[currentQueueIndex + 1].id);
} else {
history.push("/scenes");
}
}

Expand All @@ -789,8 +787,8 @@ const SceneLoader: React.FC<RouteComponentProps<ISceneParams>> = ({
return Math.floor((index + queueStart - 1) / perPage) + 1;
}

function onSceneClicked(sceneID: string) {
loadScene(sceneID, true, getScenePage(sceneID));
function onQueueSceneClicked(sceneID: string) {
loadScene(sceneID, autoPlayOnSelected, getScenePage(sceneID));
}

if (!scene) {
Expand All @@ -804,14 +802,14 @@ const SceneLoader: React.FC<RouteComponentProps<ISceneParams>> = ({
<ScenePage
scene={scene}
setTimestamp={setTimestamp}
queueScenes={queueScenes ?? []}
queueScenes={queueScenes}
queueStart={queueStart}
onDelete={onDelete}
onQueueNext={onQueueNext}
onQueuePrevious={onQueuePrevious}
onQueueRandom={onQueueRandom}
onQueueNext={() => queueNext(autoPlayOnSelected)}
onQueuePrevious={() => queuePrevious(autoPlayOnSelected)}
onQueueRandom={() => queueRandom(autoPlayOnSelected)}
onQueueSceneClicked={onQueueSceneClicked}
continuePlaylist={continuePlaylist}
loadScene={onSceneClicked}
queueHasMoreScenes={queueHasMoreScenes}
onQueueLessScenes={onQueueLessScenes}
onQueueMoreScenes={onQueueMoreScenes}
Expand All @@ -829,8 +827,8 @@ const SceneLoader: React.FC<RouteComponentProps<ISceneParams>> = ({
initialTimestamp={initialTimestamp}
sendSetTimestamp={getSetTimestamp}
onComplete={onComplete}
onNext={onQueueNext}
onPrevious={onQueuePrevious}
onNext={() => queueNext(true)}
onPrevious={() => queuePrevious(true)}
/>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions ui/v2.5/src/models/sceneQueue.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ export class SceneQueue {
let params = [
this.makeQueryParameters(options.sceneIndex, options.newPage),
];
if (options.autoPlay !== undefined) {
params.push("autoplay=" + options.autoPlay);
if (options.autoPlay) {
params.push("autoplay=true");
}
if (options.continue !== undefined) {
params.push("continue=" + options.continue);
Expand Down

0 comments on commit 5b9a96b

Please sign in to comment.