Backup_Repos/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-09 18:04:33 +01:00
Code Issues Projects Releases Wiki Activity

Fix regression in marker title generation (#3141)

Browse source
This commit is contained in:
WithoutPants 2022-11-17 12:11:10 +11:00 committed by GitHub
parent f0bf780c2e
commit 2cce547986
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx
View file

@ -112,6 +112,24 @@ function handleHotkeys(player: VideoJsPlayer, event: videojs.KeyboardEvent) {
}
}
type MarkerFragment = Pick<GQL.SceneMarker, "title" | "seconds"> & {
primary_tag: Pick<GQL.Tag, "name">;
tags: Array<Pick<GQL.Tag, "name">>;
};
function getMarkerTitle(marker: MarkerFragment) {
if (marker.title) {
return marker.title;
}
let ret = marker.primary_tag.name;
if (marker.tags.length) {
ret += `, ${marker.tags.map((t) => t.name).join(", ")}`;
}
return ret;
}
interface IScenePlayerProps {
className?: string;
scene: GQL.SceneDataFragment | undefined | null;
@ -416,7 +434,7 @@ export const ScenePlayer: React.FC<IScenePlayerProps> = ({
markers.clearMarkers();
for (const marker of scene.scene_markers) {
markers.addMarker({
title: marker.title,
title: getMarkerTitle(marker),
time: marker.seconds,
});
}