fix: Images loaded from Jellyfin not showing up, some fixes regarding environment variables

Closes #66
This commit is contained in:
Aleksi Lassila
2023-08-15 17:57:15 +03:00
parent fd52073455
commit c1ba3efabf
11 changed files with 71 additions and 46 deletions

View File

@@ -1,20 +1,20 @@
import { env } from '$env/dynamic/public';
import type { components, paths } from '$lib/apis/jellyfin/jellyfin.generated';
import type { DeviceProfile } from '$lib/apis/jellyfin/playback-profiles';
import { JELLYFIN_API_KEY, JELLYFIN_BASE_URL } from '$lib/constants';
import createClient from 'openapi-fetch';
export type JellyfinItem = components['schemas']['BaseItemDto'];
export const jellyfinAvailable = !!env.PUBLIC_JELLYFIN_URL && !!env.PUBLIC_JELLYFIN_API_KEY;
export const jellyfinAvailable = !!JELLYFIN_BASE_URL && !!JELLYFIN_API_KEY;
export const JELLYFIN_DEVICE_ID = 'Reiverr Client';
export const JellyfinApi =
env.PUBLIC_JELLYFIN_URL && env.PUBLIC_JELLYFIN_API_KEY
JELLYFIN_BASE_URL && JELLYFIN_API_KEY
? createClient<paths>({
baseUrl: env.PUBLIC_JELLYFIN_URL,
baseUrl: JELLYFIN_BASE_URL,
headers: {
Authorization: `MediaBrowser DeviceId="${JELLYFIN_DEVICE_ID}", Token="${env.PUBLIC_JELLYFIN_API_KEY}"`
Authorization: `MediaBrowser DeviceId="${JELLYFIN_DEVICE_ID}", Token="${JELLYFIN_API_KEY}"`
}
})
: undefined;
@@ -88,7 +88,7 @@ export const getJellyfinItems = async () =>
// JellyfinApi.get('/Users/{userId}/Items', {
// params: {
// path: {
// userId: env.PUBLIC_JELLYFIN_USER_ID || ""
// userId: PUBLIC_JELLYFIN_USER_ID || ""
// },
// query: {
// hasTmdbId: true,
@@ -166,7 +166,7 @@ export const getJellyfinPlaybackInfo = async (
}).then((r) => ({
playbackUri:
r.data?.MediaSources?.[0]?.TranscodingUrl ||
`/Videos/${r.data?.MediaSources?.[0].Id}/stream.mp4?Static=true&mediaSourceId=${r.data?.MediaSources?.[0].Id}&deviceId=${JELLYFIN_DEVICE_ID}&api_key=${env.PUBLIC_JELLYFIN_API_KEY}&Tag=${r.data?.MediaSources?.[0].ETag}`,
`/Videos/${r.data?.MediaSources?.[0].Id}/stream.mp4?Static=true&mediaSourceId=${r.data?.MediaSources?.[0].Id}&deviceId=${JELLYFIN_DEVICE_ID}&api_key=${JELLYFIN_API_KEY}&Tag=${r.data?.MediaSources?.[0].ETag}`,
mediaSourceId: r.data?.MediaSources?.[0]?.Id,
playSessionId: r.data?.PlaySessionId,
directPlay:

View File

@@ -1,6 +1,6 @@
import { env } from '$env/dynamic/public';
import type { components, paths } from '$lib/apis/radarr/radarr.generated';
import { getTmdbMovie } from '$lib/apis/tmdb/tmdbApi';
import { RADARR_API_KEY, RADARR_BASE_URL } from '$lib/constants';
import { settings } from '$lib/stores/settings.store';
import { log } from '$lib/utils';
import createClient from 'openapi-fetch';
@@ -25,14 +25,14 @@ export interface RadarrMovieOptions {
searchNow?: boolean;
}
export const radarrAvailable = !!env.PUBLIC_RADARR_BASE_URL && !!env.PUBLIC_RADARR_API_KEY;
export const radarrAvailable = !!RADARR_BASE_URL && !!RADARR_API_KEY;
export const RadarrApi =
env.PUBLIC_RADARR_BASE_URL && env.PUBLIC_RADARR_API_KEY
RADARR_BASE_URL && RADARR_API_KEY
? createClient<paths>({
baseUrl: env.PUBLIC_RADARR_BASE_URL,
baseUrl: RADARR_BASE_URL,
headers: {
'X-Api-Key': env.PUBLIC_RADARR_API_KEY
'X-Api-Key': RADARR_API_KEY
}
})
: undefined;

View File

@@ -1,10 +1,10 @@
import { env } from '$env/dynamic/public';
import type { components, paths } from '$lib/apis/sonarr/sonarr.generated';
import { log } from '$lib/utils';
import createClient from 'openapi-fetch';
import { getTmdbSeries } from '../tmdb/tmdbApi';
import { get } from 'svelte/store';
import { settings } from '$lib/stores/settings.store';
import { SONARR_API_KEY, SONARR_BASE_URL } from '$lib/constants';
export type SonarrSeries = components['schemas']['SeriesResource'];
export type SonarrReleaseResource = components['schemas']['ReleaseResource'];
@@ -38,14 +38,14 @@ export interface SonarrSeriesOptions {
};
}
export const sonarrAvailable = !!env.PUBLIC_SONARR_BASE_URL && !!env.PUBLIC_SONARR_API_KEY;
export const sonarrAvailable = !!SONARR_BASE_URL && !!SONARR_API_KEY;
export const SonarrApi =
env.PUBLIC_SONARR_BASE_URL && env.PUBLIC_SONARR_API_KEY
SONARR_BASE_URL && SONARR_API_KEY
? createClient<paths>({
baseUrl: env.PUBLIC_SONARR_BASE_URL,
baseUrl: SONARR_BASE_URL,
headers: {
'X-Api-Key': env.PUBLIC_SONARR_API_KEY
'X-Api-Key': SONARR_API_KEY
}
})
: undefined;