This commit is contained in:
Alex Kim
2024-12-08 07:44:35 +11:00
parent a4cd3ea600
commit de4f60f564
2 changed files with 109 additions and 39 deletions

View File

@@ -1,22 +1,22 @@
import {BaseItemDto} from "@jellyfin/sdk/lib/generated-client/models";
import {useEffect, useMemo} from "react";
import {TouchableOpacity, View} from "react-native";
import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
import { useEffect, useMemo } from "react";
import { TouchableOpacity, View } from "react-native";
import * as DropdownMenu from "zeego/dropdown-menu";
import {Text} from "../common/Text";
import { Text } from "../common/Text";
type Props = {
item: BaseItemDto;
seasons: BaseItemDto[];
initialSeasonIndex?: number;
state: SeasonIndexState;
onSelect: (season: BaseItemDto) => void
onSelect: (season: BaseItemDto) => void;
};
type SeasonKeys = {
id: keyof BaseItemDto,
title: keyof BaseItemDto,
index: keyof BaseItemDto
}
id: keyof BaseItemDto;
title: keyof BaseItemDto;
index: keyof BaseItemDto;
};
export type SeasonIndexState = {
[seriesId: string]: number | null | undefined;
@@ -27,19 +27,22 @@ export const SeasonDropdown: React.FC<Props> = ({
seasons,
initialSeasonIndex,
state,
onSelect
onSelect,
}) => {
const keys = useMemo<SeasonKeys>(() =>
item.Type === "Episode" ? {
id: "ParentId",
title: "SeasonName",
index: "ParentIndexNumber"
}
: {
id: "Id",
title: "Name",
index: "IndexNumber"
}, [item]
const keys = useMemo<SeasonKeys>(
() =>
item.Type === "Episode"
? {
id: "ParentId",
title: "SeasonName",
index: "ParentIndexNumber",
}
: {
id: "Id",
title: "Name",
index: "IndexNumber",
},
[item]
);
const seasonIndex = useMemo(() => state[item[keys.id] ?? ""], [state]);
@@ -62,28 +65,28 @@ export const SeasonDropdown: React.FC<Props> = ({
const season1 = seasons.find((season: any) => season[keys.index] === 1);
const season0 = seasons.find((season: any) => season[keys.index] === 0);
const firstSeason = season1 || season0 || seasons[0];
onSelect(firstSeason)
onSelect(firstSeason);
}
if (initialIndex !== undefined) {
const initialSeason = seasons.find((season: any) =>
season[keys.index] === initialIndex
)
const initialSeason = seasons.find(
(season: any) => season[keys.index] === initialIndex
);
if (initialSeason) onSelect(initialSeason!)
else throw Error("Initial index could not be found!")
if (initialSeason) onSelect(initialSeason!);
else throw Error("Initial index could not be found!");
}
}
}, [seasons, seasonIndex, item[keys.id], initialSeasonIndex]);
const sortByIndex = (a: BaseItemDto, b: BaseItemDto) => a[keys.index] - b[keys.index];
const sortByIndex = (a: BaseItemDto, b: BaseItemDto) =>
a[keys.index] - b[keys.index];
return (
<DropdownMenu.Root>
<DropdownMenu.Trigger>
<View className="flex flex-row px-4">
<TouchableOpacity
className="bg-neutral-900 rounded-2xl border-neutral-900 border px-3 py-2 flex flex-row items-center justify-between">
<TouchableOpacity className="bg-neutral-900 rounded-2xl border-neutral-900 border px-3 py-2 flex flex-row items-center justify-between">
<Text>Season {seasonIndex}</Text>
</TouchableOpacity>
</View>
@@ -103,7 +106,9 @@ export const SeasonDropdown: React.FC<Props> = ({
key={season[keys.title]}
onSelect={() => onSelect(season)}
>
<DropdownMenu.ItemTitle>{season[keys.title]}</DropdownMenu.ItemTitle>
<DropdownMenu.ItemTitle>
{season[keys.title]}
</DropdownMenu.ItemTitle>
</DropdownMenu.Item>
))}
</DropdownMenu.Content>

View File

@@ -2,7 +2,7 @@ import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
import { runtimeTicksToSeconds } from "@/utils/time";
import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
import { useQuery, useQueryClient } from "@tanstack/react-query";
import { useAtom } from "jotai";
import { atom, useAtom } from "jotai";
import { useEffect, useMemo, useState, useRef } from "react";
import { View, TouchableOpacity } from "react-native";
import { getTvShowsApi } from "@jellyfin/sdk/lib/utils/api";
@@ -21,35 +21,88 @@ import { router } from "expo-router";
import { getDefaultPlaySettings } from "@/utils/jellyfin/getDefaultPlaySettings";
import { getItemById } from "@/utils/jellyfin/user-library/getItemById";
import { useSettings } from "@/utils/atoms/settings";
import {
SeasonDropdown,
SeasonIndexState,
} from "@/components/series/SeasonDropdown";
import { Item } from "zeego/dropdown-menu";
type Props = {
item: BaseItemDto;
close: () => void;
};
export const seasonIndexAtom = atom<SeasonIndexState>({});
export const EpisodeList: React.FC<Props> = ({ item, close }) => {
const [api] = useAtom(apiAtom);
const [user] = useAtom(userAtom);
const scrollViewRef = useRef<HorizontalScrollRef>(null); // Reference to the HorizontalScroll
const insets = useSafeAreaInsets(); // Get safe area insets
const [settings] = useSettings();
const SeasonId = item.ParentId;
const [seasonIndexState, setSeasonIndexState] = useAtom(seasonIndexAtom);
const seasonIndex = seasonIndexState[item.Id ?? ""];
const [seriesItem, setSeriesItem] = useState<BaseItemDto | null>(null);
useEffect(() => {
if (item.SeriesId) {
getUserItemData({ api, userId: user?.Id, itemId: item.SeriesId }).then(
(res) => {
setSeriesItem(res);
}
);
}
}, [item.SeriesId]);
const { data: seasons } = useQuery({
queryKey: ["seasons", item.SeriesId],
queryFn: async () => {
console.log("Seasons", Boolean(api), user?.Id, item.SeriesId);
if (!api || !user?.Id || !item.SeriesId) return [];
console.log("Seasons", "Fetching");
const response = await api.axiosInstance.get(
`${api.basePath}/Shows/${item.SeriesId}/Seasons`,
{
params: {
userId: user?.Id,
itemId: item.SeriesId,
Fields:
"ItemCounts,PrimaryImageAspectRatio,CanDelete,MediaSourceCount",
},
headers: {
Authorization: `MediaBrowser DeviceId="${api.deviceInfo.id}", Token="${api.accessToken}"`,
},
}
);
console.log("Response", response.data.Items);
return response.data.Items;
},
enabled: !!api && !!user?.Id && !!item.SeasonId,
});
const selectedSeasonId: string | null = useMemo(
() =>
seasons?.find((season: any) => season.IndexNumber === seasonIndex)?.Id,
[seasons, seasonIndex]
);
const { data: episodes, isFetching } = useQuery({
queryKey: ["episodes", SeasonId],
queryKey: ["episodes", item.SeriesId, item.SeasonId],
queryFn: async () => {
if (!api || !user?.Id || !item.Id || !SeasonId) return [];
if (!api || !user?.Id || !item.Id || !item.SeasonId) return [];
const res = await getTvShowsApi(api).getEpisodes({
seriesId: item.Id,
seriesId: item.SeriesId || "",
userId: user.Id,
seasonId: SeasonId,
seasonId: item.SeasonId || undefined,
enableUserData: true,
fields: ["MediaSources", "MediaStreams", "Overview"],
});
return res.data.Items;
},
enabled: !!api && !!user?.Id && !!item.Id && !!SeasonId,
enabled: !!api && !!user?.Id && !!item.SeasonId,
});
const queryClient = useQueryClient();
@@ -146,6 +199,18 @@ export const EpisodeList: React.FC<Props> = ({ item, close }) => {
}}
className={`flex flex-row items-center space-x-2`}
>
<SeasonDropdown
item={seriesItem ?? item}
seasons={seasons}
initialSeasonIndex={1}
state={seasonIndexState}
onSelect={(season) => {
setSeasonIndexState((prev) => ({
...prev,
[item.SeasonId ?? ""]: season.IndexNumber,
}));
}}
/>
<TouchableOpacity
onPress={async () => {
close();
@@ -182,7 +247,7 @@ export const EpisodeList: React.FC<Props> = ({ item, close }) => {
<ContinueWatchingPoster
item={_item}
useEpisodePoster
showPlayButton={_item.id != item.Id}
showPlayButton={_item.id !== item.Id}
/>
</TouchableOpacity>
<View className="shrink">