;
};
-export const useDependantRequest = Promise, A extends any[], S>(
- fn: P,
- store: Readable,
- subscribeFn: (store: S) => Parameters | undefined
-) => {
- const isLoading = writable(true);
- const r = useActionRequest(fn);
-
- store.subscribe(($data) => {
- const args = subscribeFn($data);
- if (!args) return;
- r.send(...args).finally(() => isLoading.set(false));
- });
-
- return {
- ...r,
- refresh: r.send,
- isLoading: {
- subscribe: isLoading.subscribe
- }
- };
-};
-
-export const useRequest = Promise, A extends any[]>(
- fn: P,
- ...args: Parameters
-) => {
- const isLoading = writable(true);
- const r = useActionRequest(fn);
-
- r.send(...args).finally(() => isLoading.set(false));
-
- return {
- ...r,
- refresh: r.send,
- isLoading: {
- subscribe: isLoading.subscribe
- }
- };
-};
-
-export const useActionRequest = Promise, A extends any[]>(
- fn: P
-) => {
- const request = writable>(undefined);
- const data = writable> | undefined>(undefined);
- const isFetching = writable(false);
-
- function send(...args: Parameters): ReturnType
{
- isFetching.set(true);
- // @ts-ignore
- const p: ReturnType
= fn(...args)
- .then((res) => {
- data.set(res);
- return res;
- })
- .finally(() => {
- isFetching.set(false);
- });
-
- request.set(p);
- return p;
- }
-
- return {
- promise: {
- subscribe: request.subscribe
- },
- data: {
- subscribe: data.subscribe
- },
-
- isFetching: {
- subscribe: isFetching.subscribe
- },
- send
- };
-};
-
-export function useRequest3(fn: () => Promise) {
+export function useRequest(fn: () => Promise) {
async function _createPromise() {
return awaitAppInitialization().then(() => fn());
}
@@ -142,7 +57,7 @@ export function useRequestsStore, TResponse>(
fn: (...args: TArgs) => Promise,
options: { persistant?: boolean } = {}
) {
- type Res = ReturnType>;
+ type Res = ReturnType>;
const requests: Map = new Map();
function subscribe(...args: TArgs): Res & { unsubscribe: () => void } {
@@ -150,7 +65,7 @@ export function useRequestsStore, TResponse>(
let request = requests.get(JSON.stringify(args))?.request;
if (!request) {
- request = useRequest3(() => fn(...args));
+ request = useRequest(() => fn(...args));
requests.set(JSON.stringify(args), {
subscribers: [id],
request
@@ -198,6 +113,9 @@ export function useRequestsStore, TResponse>(
export const tmdbMovieDataStore = useRequestsStore((id: number) => tmdbApi.getTmdbMovie(id));
export const tmdbSeriesDataStore = useRequestsStore((id: number) => tmdbApi.getTmdbSeries(id));
+export const tmdbEpisodeDataStore = useRequestsStore(
+ (tmdbId: number, season: number, episode: number) => tmdbApi.getEpisode(tmdbId, season, episode)
+);
export const movieUserDataStore = useRequestsStore((id: string) =>
reiverrApiNew.users.getMovieUserData(get(user)?.id as string, id).then((r) => r.data)
diff --git a/src/lib/stores/media-user-data.store.ts b/src/lib/stores/media-user-data.store.ts
index ee77d5f..481bc0f 100644
--- a/src/lib/stores/media-user-data.store.ts
+++ b/src/lib/stores/media-user-data.store.ts
@@ -226,6 +226,7 @@ export function useSeriesUserData(tmdbId: string) {
});
return {
+ tmdbSeries: tmdbSeriesRequest.promise,
...libraryStore,
...canStreamStore,
nextEpisode,