Skip to content

Migrate transcoding page to React #6770

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Migrate transcoding page to React #6770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
113 changes: 113 additions & 0 deletions src/apps/dashboard/features/playback/constants/codecs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
/** List of codecs and their supported hardware acceleration types */
export const CODECS = [
{
name: 'H264',
codec: 'h264',
types: [
'amf',
'nvenc',
'qsv',
'vaapi',
'rkmpp',
'videotoolbox',
'v4l2m2m'
]
},
{
name: 'HEVC',
codec: 'hevc',
types: [
'amf',
'nvenc',
'qsv',
'vaapi',
'rkmpp',
'videotoolbox'
]
},
{
name: 'MPEG1',
codec: 'mpeg1video',
types: [ 'rkmpp' ]
},
{
name: 'MPEG2',
codec: 'mpeg2video',
types: [
'amf',
'nvenc',
'qsv',
'vaapi',
'rkmpp'
]
},
{
name: 'MPEG4',
codec: 'mpeg4',
types: [
'nvenc',
'rkmpp'
]
},
{
name: 'VC1',
codec: 'vc1',
types: [
'amf',
'nvenc',
'qsv',
'vaapi'
]
},
{
name: 'VP8',
codec: 'vp8',
types: [
'nvenc',
'qsv',
'vaapi',
'rkmpp',
'videotoolbox'
]
},
{
name: 'VP9',
codec: 'vp9',
types: [
'amf',
'nvenc',
'qsv',
'vaapi',
'rkmpp',
'videotoolbox'
]
},
{
name: 'AV1',
codec: 'av1',
types: [
'amf',
'nvenc',
'qsv',
'vaapi',
'rkmpp',
'videotoolbox'
]
}
];

/** Hardware decoders which support 10-bit HEVC & VP9 */
export const HEVC_VP9_HW_DECODING_TYPES = [
'amf',
'nvenc',
'qsv',
'vaapi',
'rkmpp'
];

/** Hardware decoders which support HEVC RExt */
export const HEVC_REXT_DECODING_TYPES = [
'nvenc',
'qsv',
'vaapi'
];
1 change: 1 addition & 0 deletions src/apps/dashboard/routes/_asyncRoutes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export const ASYNC_ADMIN_ROUTES: AsyncRoute[] = [
{ path: 'logs/:file', page: 'logs/file', type: AppType.Dashboard },
{ path: 'playback/resume', type: AppType.Dashboard },
{ path: 'playback/streaming', type: AppType.Dashboard },
{ path: 'playback/transcoding', type: AppType.Dashboard },
{ path: 'playback/trickplay', type: AppType.Dashboard },
{ path: 'plugins/:pluginId', page: 'plugins/plugin', type: AppType.Dashboard },
{ path: 'tasks', type: AppType.Dashboard },
Expand Down
7 changes: 0 additions & 7 deletions src/apps/dashboard/routes/_legacyRoutes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,6 @@ export const LEGACY_ADMIN_ROUTES: LegacyRoute[] = [
controller: 'library',
view: 'library.html'
}
}, {
path: 'playback/transcoding',
pageProps: {
appType: AppType.Dashboard,
controller: 'encodingsettings',
view: 'encodingsettings.html'
}
}, {
path: 'plugins/catalog',
pageProps: {
Expand Down
7 changes: 4 additions & 3 deletions src/apps/dashboard/routes/libraries/display.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,13 @@ import Loading from 'components/loading/LoadingComponent';
import Page from 'components/Page';
import { getConfigurationApi } from '@jellyfin/sdk/lib/utils/api/configuration-api';
import { QUERY_KEY as CONFIG_QUERY_KEY, useConfiguration } from 'hooks/useConfiguration';
import { QUERY_KEY as NAMED_CONFIG_QUERY_KEY, NamedConfiguration, useNamedConfiguration } from 'hooks/useNamedConfiguration';
import { QUERY_KEY as NAMED_CONFIG_QUERY_KEY, useNamedConfiguration } from 'hooks/useNamedConfiguration';
import globalize from 'lib/globalize';
import { ServerConnections } from 'lib/jellyfin-apiclient';
import { type ActionFunctionArgs, Form, useActionData, useNavigation } from 'react-router-dom';
import { ActionData } from 'types/actionData';
import { queryClient } from 'utils/query/queryClient';
import type { MetadataConfiguration } from '@jellyfin/sdk/lib/generated-client/models/metadata-configuration';

const CONFIG_KEY = 'metadata';

Expand All @@ -32,7 +33,7 @@ export const action = async ({ request }: ActionFunctionArgs) => {

const { data: config } = await getConfigurationApi(api).getConfiguration();

const metadataConfig: NamedConfiguration = {
const metadataConfig: MetadataConfiguration = {
UseFileCreationTimeForDateAdded: data.DateAddedBehavior.toString() === '1'
};

Expand Down Expand Up @@ -70,7 +71,7 @@ export const Component = () => {
data: namedConfig,
isPending: isNamedConfigPending,
isError: isNamedConfigError
} = useNamedConfiguration(CONFIG_KEY);
} = useNamedConfiguration<MetadataConfiguration>(CONFIG_KEY);

const navigation = useNavigation();
const actionData = useActionData() as ActionData | undefined;
Expand Down
23 changes: 7 additions & 16 deletions src/apps/dashboard/routes/libraries/nfo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,25 +21,18 @@ import React, { useCallback, useState } from 'react';
import { type ActionFunctionArgs, Form, useActionData, useNavigation } from 'react-router-dom';
import { ActionData } from 'types/actionData';
import { queryClient } from 'utils/query/queryClient';
import type { XbmcMetadataOptions } from '@jellyfin/sdk/lib/generated-client/models/xbmc-metadata-options';

const CONFIG_KEY = 'xbmcmetadata';

interface NFOSettingsConfig {
UserId?: string;
EnableExtraThumbsDuplication?: boolean;
EnablePathSubstitution?: boolean;
ReleaseDateFormat?: string;
SaveImagePathsInNfo?: boolean;
};

export const action = async ({ request }: ActionFunctionArgs) => {
const api = ServerConnections.getCurrentApi();
if (!api) throw new Error('No Api instance available');

const formData = await request.formData();
const data = Object.fromEntries(formData);

const newConfig: NFOSettingsConfig = {
const newConfig: XbmcMetadataOptions = {
UserId: data.UserId?.toString(),
ReleaseDateFormat: 'yyyy-MM-dd',
SaveImagePathsInNfo: data.SaveImagePathsInNfo?.toString() === 'on',
Expand All @@ -64,7 +57,7 @@ export const Component = () => {
data: config,
isPending: isConfigPending,
isError: isConfigError
} = useNamedConfiguration(CONFIG_KEY);
} = useNamedConfiguration<XbmcMetadataOptions>(CONFIG_KEY);
const {
data: users,
isPending: isUsersPending,
Expand All @@ -75,8 +68,6 @@ export const Component = () => {
const isSubmitting = navigation.state === 'submitting';
const [isAlertOpen, setIsAlertOpen] = useState(false);

const nfoConfig = config as NFOSettingsConfig;

const onAlertClose = useCallback(() => {
setIsAlertOpen(false);
}, []);
Expand Down Expand Up @@ -117,7 +108,7 @@ export const Component = () => {
<TextField
name={'UserId'}
label={globalize.translate('LabelKodiMetadataUser')}
defaultValue={nfoConfig.UserId || ''}
defaultValue={config.UserId || ''}
select
helperText={globalize.translate('LabelKodiMetadataUserHelp')}
slotProps={{
Expand All @@ -141,7 +132,7 @@ export const Component = () => {
control={
<Checkbox
name={'SaveImagePathsInNfo'}
defaultChecked={nfoConfig.SaveImagePathsInNfo}
defaultChecked={config.SaveImagePathsInNfo}
/>
}
label={globalize.translate('LabelKodiMetadataSaveImagePaths')}
Expand All @@ -154,7 +145,7 @@ export const Component = () => {
control={
<Checkbox
name={'EnablePathSubstitution'}
defaultChecked={nfoConfig.EnablePathSubstitution}
defaultChecked={config.EnablePathSubstitution}
/>
}
label={globalize.translate('LabelKodiMetadataEnablePathSubstitution')}
Expand All @@ -167,7 +158,7 @@ export const Component = () => {
control={
<Checkbox
name={'EnableExtraThumbsDuplication'}
defaultChecked={nfoConfig.EnableExtraThumbsDuplication}
defaultChecked={config.EnableExtraThumbsDuplication}
/>
}
label={globalize.translate('LabelKodiMetadataEnableExtraThumbs')}
Expand Down
2 changes: 1 addition & 1 deletion src/apps/dashboard/routes/playback/resume.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export const Component = () => {
<Box className='content-primary'>
<Form method='POST'>
<Stack spacing={3}>
<Typography variant='h2'>
<Typography variant='h1'>
{globalize.translate('ButtonResume')}
</Typography>

Expand Down
2 changes: 1 addition & 1 deletion src/apps/dashboard/routes/playback/streaming.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export const Component = () => {
<Box className='content-primary'>
<Form method='POST'>
<Stack spacing={3}>
<Typography variant='h2'>
<Typography variant='h1'>
{globalize.translate('TabStreaming')}
</Typography>

Expand Down
Loading
Loading