diff --git a/src/controllers/dashboard/dlna/profile.html b/src/controllers/dashboard/dlna/profile.html
deleted file mode 100644
index 237874e156..0000000000
--- a/src/controllers/dashboard/dlna/profile.html
+++ /dev/null
@@ -1,584 +0,0 @@
-
diff --git a/src/controllers/dashboard/dlna/profile.js b/src/controllers/dashboard/dlna/profile.js
deleted file mode 100644
index 0f92a3200c..0000000000
--- a/src/controllers/dashboard/dlna/profile.js
+++ /dev/null
@@ -1,830 +0,0 @@
-import escapeHtml from 'escape-html';
-import 'jquery';
-import loading from '../../../components/loading/loading';
-import globalize from '../../../scripts/globalize';
-import '../../../elements/emby-select/emby-select';
-import '../../../elements/emby-button/emby-button';
-import '../../../elements/emby-input/emby-input';
-import '../../../elements/emby-checkbox/emby-checkbox';
-import '../../../components/listview/listview.scss';
-import Dashboard from '../../../utils/dashboard';
-import toast from '../../../components/toast/toast';
-import { getParameterByName } from '../../../utils/url.ts';
-
-function loadProfile(page) {
- loading.show();
- const promise1 = getProfile();
- const promise2 = ApiClient.getUsers();
- Promise.all([promise1, promise2]).then(function (responses) {
- currentProfile = responses[0];
- renderProfile(page, currentProfile, responses[1]);
- loading.hide();
- });
-}
-
-function getProfile() {
- const id = getParameterByName('id');
- const url = id ? 'Dlna/Profiles/' + id : 'Dlna/Profiles/Default';
- return ApiClient.getJSON(ApiClient.getUrl(url));
-}
-
-function renderProfile(page, profile, users) {
- $('#txtName', page).val(profile.Name);
- $('.chkMediaType', page).each(function () {
- this.checked = (profile.SupportedMediaTypes || '').split(',').indexOf(this.getAttribute('data-value')) != -1;
- });
- $('#chkEnableAlbumArtInDidl', page).prop('checked', profile.EnableAlbumArtInDidl);
- $('#chkEnableSingleImageLimit', page).prop('checked', profile.EnableSingleAlbumArtLimit);
- renderXmlDocumentAttributes(page, profile.XmlRootAttributes || []);
- const idInfo = profile.Identification || {};
- renderIdentificationHeaders(page, idInfo.Headers || []);
- renderSubtitleProfiles(page, profile.SubtitleProfiles || []);
- $('#txtInfoFriendlyName', page).val(profile.FriendlyName || '');
- $('#txtInfoModelName', page).val(profile.ModelName || '');
- $('#txtInfoModelNumber', page).val(profile.ModelNumber || '');
- $('#txtInfoModelDescription', page).val(profile.ModelDescription || '');
- $('#txtInfoModelUrl', page).val(profile.ModelUrl || '');
- $('#txtInfoManufacturer', page).val(profile.Manufacturer || '');
- $('#txtInfoManufacturerUrl', page).val(profile.ManufacturerUrl || '');
- $('#txtInfoSerialNumber', page).val(profile.SerialNumber || '');
- $('#txtIdFriendlyName', page).val(idInfo.FriendlyName || '');
- $('#txtIdModelName', page).val(idInfo.ModelName || '');
- $('#txtIdModelNumber', page).val(idInfo.ModelNumber || '');
- $('#txtIdModelDescription', page).val(idInfo.ModelDescription || '');
- $('#txtIdModelUrl', page).val(idInfo.ModelUrl || '');
- $('#txtIdManufacturer', page).val(idInfo.Manufacturer || '');
- $('#txtIdManufacturerUrl', page).val(idInfo.ManufacturerUrl || '');
- $('#txtIdSerialNumber', page).val(idInfo.SerialNumber || '');
- $('#txtIdDeviceDescription', page).val(idInfo.DeviceDescription || '');
- $('#txtAlbumArtPn', page).val(profile.AlbumArtPn || '');
- $('#txtAlbumArtMaxWidth', page).val(profile.MaxAlbumArtWidth || '');
- $('#txtAlbumArtMaxHeight', page).val(profile.MaxAlbumArtHeight || '');
- $('#txtIconMaxWidth', page).val(profile.MaxIconWidth || '');
- $('#txtIconMaxHeight', page).val(profile.MaxIconHeight || '');
- $('#chkIgnoreTranscodeByteRangeRequests', page).prop('checked', profile.IgnoreTranscodeByteRangeRequests);
- $('#txtMaxAllowedBitrate', page).val(profile.MaxStreamingBitrate || '');
- $('#txtMusicStreamingTranscodingBitrate', page).val(profile.MusicStreamingTranscodingBitrate || '');
- $('#chkRequiresPlainFolders', page).prop('checked', profile.RequiresPlainFolders);
- $('#chkRequiresPlainVideoItems', page).prop('checked', profile.RequiresPlainVideoItems);
- $('#txtProtocolInfo', page).val(profile.ProtocolInfo || '');
- $('#txtXDlnaCap', page).val(profile.XDlnaCap || '');
- $('#txtXDlnaDoc', page).val(profile.XDlnaDoc || '');
- $('#txtSonyAggregationFlags', page).val(profile.SonyAggregationFlags || '');
- profile.DirectPlayProfiles = profile.DirectPlayProfiles || [];
- profile.TranscodingProfiles = profile.TranscodingProfiles || [];
- profile.ContainerProfiles = profile.ContainerProfiles || [];
- profile.CodecProfiles = profile.CodecProfiles || [];
- profile.ResponseProfiles = profile.ResponseProfiles || [];
- const usersHtml = '
' + users.map(function (u) {
- return '
';
- }).join('');
- $('#selectUser', page).html(usersHtml).val(profile.UserId || '');
- renderSubProfiles(page, profile);
-}
-
-function renderIdentificationHeaders(page, headers) {
- let index = 0;
- const html = '
' + headers.map(function (h) {
- let li = '
';
- li += '
';
- li += '
';
- li += '
' + escapeHtml(h.Name + ': ' + (h.Value || '')) + '
';
- li += '
' + escapeHtml(h.Match || '') + '
';
- li += '
';
- li += '';
- li += '
';
- index++;
- return li;
- }).join('') + '
';
- const elem = $('.httpHeaderIdentificationList', page).html(html).trigger('create');
- $('.btnDeleteIdentificationHeader', elem).on('click', function () {
- const itemIndex = parseInt(this.getAttribute('data-index'), 10);
- currentProfile.Identification.Headers.splice(itemIndex, 1);
- renderIdentificationHeaders(page, currentProfile.Identification.Headers);
- });
-}
-
-function openPopup(elem) {
- elem.classList.remove('hide');
-}
-
-function closePopup(elem) {
- elem.classList.add('hide');
-}
-
-function editIdentificationHeader(page, header) {
- isSubProfileNew = header == null;
- header = header || {};
- currentSubProfile = header;
- const popup = $('#identificationHeaderPopup', page);
- $('#txtIdentificationHeaderName', popup).val(header.Name || '');
- $('#txtIdentificationHeaderValue', popup).val(header.Value || '');
- $('#selectMatchType', popup).val(header.Match || 'Equals');
- openPopup(popup[0]);
-}
-
-function saveIdentificationHeader(page) {
- currentSubProfile.Name = $('#txtIdentificationHeaderName', page).val();
- currentSubProfile.Value = $('#txtIdentificationHeaderValue', page).val();
- currentSubProfile.Match = $('#selectMatchType', page).val();
-
- if (isSubProfileNew) {
- currentProfile.Identification = currentProfile.Identification || {};
- currentProfile.Identification.Headers = currentProfile.Identification.Headers || [];
- currentProfile.Identification.Headers.push(currentSubProfile);
- }
-
- renderIdentificationHeaders(page, currentProfile.Identification.Headers);
- currentSubProfile = null;
- closePopup($('#identificationHeaderPopup', page)[0]);
-}
-
-function renderXmlDocumentAttributes(page, attribute) {
- const html = '
' + attribute.map(function (h) {
- let li = '
';
- li += '
';
- li += '
';
- li += '
' + escapeHtml(h.Name + ' = ' + (h.Value || '')) + '
';
- li += '';
- li += '
';
- li += '
';
- return li;
- }).join('') + '
';
- const elem = $('.xmlDocumentAttributeList', page).html(html).trigger('create');
- $('.btnDeleteXmlAttribute', elem).on('click', function () {
- const itemIndex = parseInt(this.getAttribute('data-index'), 10);
- currentProfile.XmlRootAttributes.splice(itemIndex, 1);
- renderXmlDocumentAttributes(page, currentProfile.XmlRootAttributes);
- });
-}
-
-function editXmlDocumentAttribute(page, attribute) {
- isSubProfileNew = attribute == null;
- attribute = attribute || {};
- currentSubProfile = attribute;
- const popup = $('#xmlAttributePopup', page);
- $('#txtXmlAttributeName', popup).val(attribute.Name || '');
- $('#txtXmlAttributeValue', popup).val(attribute.Value || '');
- openPopup(popup[0]);
-}
-
-function saveXmlDocumentAttribute(page) {
- currentSubProfile.Name = $('#txtXmlAttributeName', page).val();
- currentSubProfile.Value = $('#txtXmlAttributeValue', page).val();
-
- if (isSubProfileNew) {
- currentProfile.XmlRootAttributes.push(currentSubProfile);
- }
-
- renderXmlDocumentAttributes(page, currentProfile.XmlRootAttributes);
- currentSubProfile = null;
- closePopup($('#xmlAttributePopup', page)[0]);
-}
-
-function renderSubtitleProfiles(page, profiles) {
- let index = 0;
- const html = '
' + profiles.map(function (h) {
- let li = '
';
- li += '
';
- li += '
';
- li += '
' + escapeHtml(h.Format || '') + '
';
- li += '';
- li += '
';
- li += '
';
- index++;
- return li;
- }).join('') + '
';
- const elem = $('.subtitleProfileList', page).html(html).trigger('create');
- $('.btnDeleteProfile', elem).on('click', function () {
- const itemIndex = parseInt(this.getAttribute('data-index'), 10);
- currentProfile.SubtitleProfiles.splice(itemIndex, 1);
- renderSubtitleProfiles(page, currentProfile.SubtitleProfiles);
- });
- $('.lnkEditSubProfile', elem).on('click', function () {
- const itemIndex = parseInt(this.getAttribute('data-index'), 10);
- editSubtitleProfile(page, currentProfile.SubtitleProfiles[itemIndex]);
- });
-}
-
-function editSubtitleProfile(page, profile) {
- isSubProfileNew = profile == null;
- profile = profile || {};
- currentSubProfile = profile;
- const popup = $('#subtitleProfilePopup', page);
- $('#txtSubtitleProfileFormat', popup).val(profile.Format || '');
- $('#selectSubtitleProfileMethod', popup).val(profile.Method || '');
- $('#selectSubtitleProfileDidlMode', popup).val(profile.DidlMode || '');
- openPopup(popup[0]);
-}
-
-function saveSubtitleProfile(page) {
- currentSubProfile.Format = $('#txtSubtitleProfileFormat', page).val();
- currentSubProfile.Method = $('#selectSubtitleProfileMethod', page).val();
- currentSubProfile.DidlMode = $('#selectSubtitleProfileDidlMode', page).val();
-
- if (isSubProfileNew) {
- currentProfile.SubtitleProfiles.push(currentSubProfile);
- }
-
- renderSubtitleProfiles(page, currentProfile.SubtitleProfiles);
- currentSubProfile = null;
- closePopup($('#subtitleProfilePopup', page)[0]);
-}
-
-function renderSubProfiles(page, profile) {
- renderDirectPlayProfiles(page, profile.DirectPlayProfiles);
- renderTranscodingProfiles(page, profile.TranscodingProfiles);
- renderContainerProfiles(page, profile.ContainerProfiles);
- renderCodecProfiles(page, profile.CodecProfiles);
- renderResponseProfiles(page, profile.ResponseProfiles);
-}
-
-function saveDirectPlayProfile(page) {
- currentSubProfile.Type = $('#selectDirectPlayProfileType', page).val();
- currentSubProfile.Container = $('#txtDirectPlayContainer', page).val();
- currentSubProfile.AudioCodec = $('#txtDirectPlayAudioCodec', page).val();
- currentSubProfile.VideoCodec = $('#txtDirectPlayVideoCodec', page).val();
-
- if (isSubProfileNew) {
- currentProfile.DirectPlayProfiles.push(currentSubProfile);
- }
-
- renderSubProfiles(page, currentProfile);
- currentSubProfile = null;
- closePopup($('#popupEditDirectPlayProfile', page)[0]);
-}
-
-function renderDirectPlayProfiles(page, profiles) {
- let html = '';
- html += '
';
- let currentType;
-
- for (const [index, profile] of profiles.entries()) {
- if (profile.Type !== currentType) {
- html += '- ' + profile.Type + '
';
- currentType = profile.Type;
- }
-
- html += '';
- }
-
- html += '
';
- const elem = $('.directPlayProfiles', page).html(html).trigger('create');
- $('.btnDeleteProfile', elem).on('click', function () {
- const index = this.getAttribute('data-profileindex');
- deleteDirectPlayProfile(page, index);
- });
- $('.lnkEditSubProfile', elem).on('click', function () {
- const index = parseInt(this.getAttribute('data-profileindex'), 10);
- editDirectPlayProfile(page, currentProfile.DirectPlayProfiles[index]);
- });
-}
-
-function deleteDirectPlayProfile(page, index) {
- currentProfile.DirectPlayProfiles.splice(index, 1);
- renderDirectPlayProfiles(page, currentProfile.DirectPlayProfiles);
-}
-
-function editDirectPlayProfile(page, directPlayProfile) {
- isSubProfileNew = directPlayProfile == null;
- directPlayProfile = directPlayProfile || {};
- currentSubProfile = directPlayProfile;
- const popup = $('#popupEditDirectPlayProfile', page);
- $('#selectDirectPlayProfileType', popup).val(directPlayProfile.Type || 'Video').trigger('change');
- $('#txtDirectPlayContainer', popup).val(directPlayProfile.Container || '');
- $('#txtDirectPlayAudioCodec', popup).val(directPlayProfile.AudioCodec || '');
- $('#txtDirectPlayVideoCodec', popup).val(directPlayProfile.VideoCodec || '');
- openPopup(popup[0]);
-}
-
-function renderTranscodingProfiles(page, profiles) {
- let html = '';
- html += '
';
- let currentType;
-
- for (let i = 0, length = profiles.length; i < length; i++) {
- const profile = profiles[i];
-
- if (profile.Type !== currentType) {
- html += '- ' + profile.Type + '
';
- currentType = profile.Type;
- }
-
- html += '';
- }
-
- html += '
';
- const elem = $('.transcodingProfiles', page).html(html).trigger('create');
- $('.btnDeleteProfile', elem).on('click', function () {
- const index = this.getAttribute('data-profileindex');
- deleteTranscodingProfile(page, index);
- });
- $('.lnkEditSubProfile', elem).on('click', function () {
- const index = parseInt(this.getAttribute('data-profileindex'), 10);
- editTranscodingProfile(page, currentProfile.TranscodingProfiles[index]);
- });
-}
-
-function editTranscodingProfile(page, transcodingProfile) {
- isSubProfileNew = transcodingProfile == null;
- transcodingProfile = transcodingProfile || {};
- currentSubProfile = transcodingProfile;
- const popup = $('#transcodingProfilePopup', page);
- $('#selectTranscodingProfileType', popup).val(transcodingProfile.Type || 'Video').trigger('change');
- $('#txtTranscodingContainer', popup).val(transcodingProfile.Container || '');
- $('#txtTranscodingAudioCodec', popup).val(transcodingProfile.AudioCodec || '');
- $('#txtTranscodingVideoCodec', popup).val(transcodingProfile.VideoCodec || '');
- $('#selectTranscodingProtocol', popup).val(transcodingProfile.Protocol || 'Http');
- $('#chkEnableMpegtsM2TsMode', popup).prop('checked', transcodingProfile.EnableMpegtsM2TsMode || false);
- $('#chkEstimateContentLength', popup).prop('checked', transcodingProfile.EstimateContentLength || false);
- $('#chkReportByteRangeRequests', popup).prop('checked', transcodingProfile.TranscodeSeekInfo == 'Bytes');
- $('.radioTabButton:first', popup).trigger('click');
- openPopup(popup[0]);
-}
-
-function deleteTranscodingProfile(page, index) {
- currentProfile.TranscodingProfiles.splice(index, 1);
- renderTranscodingProfiles(page, currentProfile.TranscodingProfiles);
-}
-
-function saveTranscodingProfile(page) {
- currentSubProfile.Type = $('#selectTranscodingProfileType', page).val();
- currentSubProfile.Container = $('#txtTranscodingContainer', page).val();
- currentSubProfile.AudioCodec = $('#txtTranscodingAudioCodec', page).val();
- currentSubProfile.VideoCodec = $('#txtTranscodingVideoCodec', page).val();
- currentSubProfile.Protocol = $('#selectTranscodingProtocol', page).val();
- currentSubProfile.Context = 'Streaming';
- currentSubProfile.EnableMpegtsM2TsMode = $('#chkEnableMpegtsM2TsMode', page).is(':checked');
- currentSubProfile.EstimateContentLength = $('#chkEstimateContentLength', page).is(':checked');
- currentSubProfile.TranscodeSeekInfo = $('#chkReportByteRangeRequests', page).is(':checked') ? 'Bytes' : 'Auto';
-
- if (isSubProfileNew) {
- currentProfile.TranscodingProfiles.push(currentSubProfile);
- }
-
- renderSubProfiles(page, currentProfile);
- currentSubProfile = null;
- closePopup($('#transcodingProfilePopup', page)[0]);
-}
-
-function renderContainerProfiles(page, profiles) {
- let html = '';
- html += '
';
- let currentType;
-
- for (let i = 0, length = profiles.length; i < length; i++) {
- const profile = profiles[i];
-
- if (profile.Type !== currentType) {
- html += '- ' + profile.Type + '
';
- currentType = profile.Type;
- }
-
- html += '';
- }
-
- html += '
';
- const elem = $('.containerProfiles', page).html(html).trigger('create');
- $('.btnDeleteProfile', elem).on('click', function () {
- const index = this.getAttribute('data-profileindex');
- deleteContainerProfile(page, index);
- });
- $('.lnkEditSubProfile', elem).on('click', function () {
- const index = parseInt(this.getAttribute('data-profileindex'), 10);
- editContainerProfile(page, currentProfile.ContainerProfiles[index]);
- });
-}
-
-function deleteContainerProfile(page, index) {
- currentProfile.ContainerProfiles.splice(index, 1);
- renderContainerProfiles(page, currentProfile.ContainerProfiles);
-}
-
-function editContainerProfile(page, containerProfile) {
- isSubProfileNew = containerProfile == null;
- containerProfile = containerProfile || {};
- currentSubProfile = containerProfile;
- const popup = $('#containerProfilePopup', page);
- $('#selectContainerProfileType', popup).val(containerProfile.Type || 'Video').trigger('change');
- $('#txtContainerProfileContainer', popup).val(containerProfile.Container || '');
- $('.radioTabButton:first', popup).trigger('click');
- openPopup(popup[0]);
-}
-
-function saveContainerProfile(page) {
- currentSubProfile.Type = $('#selectContainerProfileType', page).val();
- currentSubProfile.Container = $('#txtContainerProfileContainer', page).val();
-
- if (isSubProfileNew) {
- currentProfile.ContainerProfiles.push(currentSubProfile);
- }
-
- renderSubProfiles(page, currentProfile);
- currentSubProfile = null;
- closePopup($('#containerProfilePopup', page)[0]);
-}
-
-function renderCodecProfiles(page, profiles) {
- let html = '';
- html += '
';
- let currentType;
-
- for (let i = 0, length = profiles.length; i < length; i++) {
- const profile = profiles[i];
- const type = profile.Type.replace('VideoAudio', 'Video Audio');
-
- if (type !== currentType) {
- html += '- ' + type + '
';
- currentType = type;
- }
-
- html += '';
- }
-
- html += '
';
- const elem = $('.codecProfiles', page).html(html).trigger('create');
- $('.btnDeleteProfile', elem).on('click', function () {
- const index = this.getAttribute('data-profileindex');
- deleteCodecProfile(page, index);
- });
- $('.lnkEditSubProfile', elem).on('click', function () {
- const index = parseInt(this.getAttribute('data-profileindex'), 10);
- editCodecProfile(page, currentProfile.CodecProfiles[index]);
- });
-}
-
-function deleteCodecProfile(page, index) {
- currentProfile.CodecProfiles.splice(index, 1);
- renderCodecProfiles(page, currentProfile.CodecProfiles);
-}
-
-function editCodecProfile(page, codecProfile) {
- isSubProfileNew = codecProfile == null;
- codecProfile = codecProfile || {};
- currentSubProfile = codecProfile;
- const popup = $('#codecProfilePopup', page);
- $('#selectCodecProfileType', popup).val(codecProfile.Type || 'Video').trigger('change');
- $('#txtCodecProfileCodec', popup).val(codecProfile.Codec || '');
- $('.radioTabButton:first', popup).trigger('click');
- openPopup(popup[0]);
-}
-
-function saveCodecProfile(page) {
- currentSubProfile.Type = $('#selectCodecProfileType', page).val();
- currentSubProfile.Codec = $('#txtCodecProfileCodec', page).val();
-
- if (isSubProfileNew) {
- currentProfile.CodecProfiles.push(currentSubProfile);
- }
-
- renderSubProfiles(page, currentProfile);
- currentSubProfile = null;
- closePopup($('#codecProfilePopup', page)[0]);
-}
-
-function renderResponseProfiles(page, profiles) {
- let html = '';
- html += '
';
- let currentType;
-
- for (let i = 0, length = profiles.length; i < length; i++) {
- const profile = profiles[i];
-
- if (profile.Type !== currentType) {
- html += '- ' + profile.Type + '
';
- currentType = profile.Type;
- }
-
- html += '';
- }
-
- html += '
';
- const elem = $('.mediaProfiles', page).html(html).trigger('create');
- $('.btnDeleteProfile', elem).on('click', function () {
- const index = this.getAttribute('data-profileindex');
- deleteResponseProfile(page, index);
- });
- $('.lnkEditSubProfile', elem).on('click', function () {
- const index = parseInt(this.getAttribute('data-profileindex'), 10);
- editResponseProfile(page, currentProfile.ResponseProfiles[index]);
- });
-}
-
-function deleteResponseProfile(page, index) {
- currentProfile.ResponseProfiles.splice(index, 1);
- renderResponseProfiles(page, currentProfile.ResponseProfiles);
-}
-
-function editResponseProfile(page, responseProfile) {
- isSubProfileNew = responseProfile == null;
- responseProfile = responseProfile || {};
- currentSubProfile = responseProfile;
- const popup = $('#responseProfilePopup', page);
- $('#selectResponseProfileType', popup).val(responseProfile.Type || 'Video').trigger('change');
- $('#txtResponseProfileContainer', popup).val(responseProfile.Container || '');
- $('#txtResponseProfileAudioCodec', popup).val(responseProfile.AudioCodec || '');
- $('#txtResponseProfileVideoCodec', popup).val(responseProfile.VideoCodec || '');
- $('.radioTabButton:first', popup).trigger('click');
- openPopup(popup[0]);
-}
-
-function saveResponseProfile(page) {
- currentSubProfile.Type = $('#selectResponseProfileType', page).val();
- currentSubProfile.Container = $('#txtResponseProfileContainer', page).val();
- currentSubProfile.AudioCodec = $('#txtResponseProfileAudioCodec', page).val();
- currentSubProfile.VideoCodec = $('#txtResponseProfileVideoCodec', page).val();
-
- if (isSubProfileNew) {
- currentProfile.ResponseProfiles.push(currentSubProfile);
- }
-
- renderSubProfiles(page, currentProfile);
- currentSubProfile = null;
- closePopup($('#responseProfilePopup', page)[0]);
-}
-
-function saveProfile(page, profile) {
- updateProfile(page, profile);
- const id = getParameterByName('id');
-
- if (id) {
- ApiClient.ajax({
- type: 'POST',
- url: ApiClient.getUrl('Dlna/Profiles/' + id),
- data: JSON.stringify(profile),
- contentType: 'application/json'
- }).then(function () {
- toast(globalize.translate('SettingsSaved'));
- }, Dashboard.processErrorResponse);
- } else {
- ApiClient.ajax({
- type: 'POST',
- url: ApiClient.getUrl('Dlna/Profiles'),
- data: JSON.stringify(profile),
- contentType: 'application/json'
- }).then(function () {
- Dashboard.navigate('dashboard/dlna/profiles');
- }, Dashboard.processErrorResponse);
- }
-
- loading.hide();
-}
-
-function updateProfile(page, profile) {
- profile.Name = $('#txtName', page).val();
- profile.EnableAlbumArtInDidl = $('#chkEnableAlbumArtInDidl', page).is(':checked');
- profile.EnableSingleAlbumArtLimit = $('#chkEnableSingleImageLimit', page).is(':checked');
- profile.SupportedMediaTypes = $('.chkMediaType:checked', page).get().map(function (c) {
- return c.getAttribute('data-value');
- }).join(',');
- profile.Identification = profile.Identification || {};
- profile.FriendlyName = $('#txtInfoFriendlyName', page).val();
- profile.ModelName = $('#txtInfoModelName', page).val();
- profile.ModelNumber = $('#txtInfoModelNumber', page).val();
- profile.ModelDescription = $('#txtInfoModelDescription', page).val();
- profile.ModelUrl = $('#txtInfoModelUrl', page).val();
- profile.Manufacturer = $('#txtInfoManufacturer', page).val();
- profile.ManufacturerUrl = $('#txtInfoManufacturerUrl', page).val();
- profile.SerialNumber = $('#txtInfoSerialNumber', page).val();
- profile.Identification.FriendlyName = $('#txtIdFriendlyName', page).val();
- profile.Identification.ModelName = $('#txtIdModelName', page).val();
- profile.Identification.ModelNumber = $('#txtIdModelNumber', page).val();
- profile.Identification.ModelDescription = $('#txtIdModelDescription', page).val();
- profile.Identification.ModelUrl = $('#txtIdModelUrl', page).val();
- profile.Identification.Manufacturer = $('#txtIdManufacturer', page).val();
- profile.Identification.ManufacturerUrl = $('#txtIdManufacturerUrl', page).val();
- profile.Identification.SerialNumber = $('#txtIdSerialNumber', page).val();
- profile.Identification.DeviceDescription = $('#txtIdDeviceDescription', page).val();
- profile.AlbumArtPn = $('#txtAlbumArtPn', page).val();
- profile.MaxAlbumArtWidth = $('#txtAlbumArtMaxWidth', page).val();
- profile.MaxAlbumArtHeight = $('#txtAlbumArtMaxHeight', page).val();
- profile.MaxIconWidth = $('#txtIconMaxWidth', page).val();
- profile.MaxIconHeight = $('#txtIconMaxHeight', page).val();
- profile.RequiresPlainFolders = $('#chkRequiresPlainFolders', page).is(':checked');
- profile.RequiresPlainVideoItems = $('#chkRequiresPlainVideoItems', page).is(':checked');
- profile.IgnoreTranscodeByteRangeRequests = $('#chkIgnoreTranscodeByteRangeRequests', page).is(':checked');
- profile.MaxStreamingBitrate = $('#txtMaxAllowedBitrate', page).val();
- profile.MusicStreamingTranscodingBitrate = $('#txtMusicStreamingTranscodingBitrate', page).val();
- profile.ProtocolInfo = $('#txtProtocolInfo', page).val();
- profile.XDlnaCap = $('#txtXDlnaCap', page).val();
- profile.XDlnaDoc = $('#txtXDlnaDoc', page).val();
- profile.SonyAggregationFlags = $('#txtSonyAggregationFlags', page).val();
- profile.UserId = $('#selectUser', page).val();
-}
-
-let currentProfile;
-let currentSubProfile;
-let isSubProfileNew;
-const allText = globalize.translate('All');
-
-$(document).on('pageinit', '#dlnaProfilePage', function () {
- const page = this;
- $('.radioTabButton', page).on('click', function () {
- $(this).siblings().removeClass('ui-btn-active');
- $(this).addClass('ui-btn-active');
- const value = this.tagName == 'A' ? this.getAttribute('data-value') : this.value;
- const elem = $('.' + value, page);
- elem.siblings('.tabContent').hide();
- elem.show();
- });
- $('#selectDirectPlayProfileType', page).on('change', function () {
- if (this.value == 'Video') {
- $('#fldDirectPlayVideoCodec', page).show();
- } else {
- $('#fldDirectPlayVideoCodec', page).hide();
- }
-
- if (this.value == 'Photo') {
- $('#fldDirectPlayAudioCodec', page).hide();
- } else {
- $('#fldDirectPlayAudioCodec', page).show();
- }
- });
- $('#selectTranscodingProfileType', page).on('change', function () {
- if (this.value == 'Video') {
- $('#fldTranscodingVideoCodec', page).show();
- $('#fldTranscodingProtocol', page).show();
- $('#fldEnableMpegtsM2TsMode', page).show();
- } else {
- $('#fldTranscodingVideoCodec', page).hide();
- $('#fldTranscodingProtocol', page).hide();
- $('#fldEnableMpegtsM2TsMode', page).hide();
- }
-
- if (this.value == 'Photo') {
- $('#fldTranscodingAudioCodec', page).hide();
- $('#fldEstimateContentLength', page).hide();
- $('#fldReportByteRangeRequests', page).hide();
- } else {
- $('#fldTranscodingAudioCodec', page).show();
- $('#fldEstimateContentLength', page).show();
- $('#fldReportByteRangeRequests', page).show();
- }
- });
- $('#selectResponseProfileType', page).on('change', function () {
- if (this.value == 'Video') {
- $('#fldResponseProfileVideoCodec', page).show();
- } else {
- $('#fldResponseProfileVideoCodec', page).hide();
- }
-
- if (this.value == 'Photo') {
- $('#fldResponseProfileAudioCodec', page).hide();
- } else {
- $('#fldResponseProfileAudioCodec', page).show();
- }
- });
- $('.btnAddDirectPlayProfile', page).on('click', function () {
- editDirectPlayProfile(page);
- });
- $('.btnAddTranscodingProfile', page).on('click', function () {
- editTranscodingProfile(page);
- });
- $('.btnAddContainerProfile', page).on('click', function () {
- editContainerProfile(page);
- });
- $('.btnAddCodecProfile', page).on('click', function () {
- editCodecProfile(page);
- });
- $('.btnAddResponseProfile', page).on('click', function () {
- editResponseProfile(page);
- });
- $('.btnAddIdentificationHttpHeader', page).on('click', function () {
- editIdentificationHeader(page);
- });
- $('.btnAddXmlDocumentAttribute', page).on('click', function () {
- editXmlDocumentAttribute(page);
- });
- $('.btnAddSubtitleProfile', page).on('click', function () {
- editSubtitleProfile(page);
- });
- $('.dlnaProfileForm').off('submit', DlnaProfilePage.onSubmit).on('submit', DlnaProfilePage.onSubmit);
- $('.editDirectPlayProfileForm').off('submit', DlnaProfilePage.onDirectPlayFormSubmit).on('submit', DlnaProfilePage.onDirectPlayFormSubmit);
- $('.transcodingProfileForm').off('submit', DlnaProfilePage.onTranscodingProfileFormSubmit).on('submit', DlnaProfilePage.onTranscodingProfileFormSubmit);
- $('.containerProfileForm').off('submit', DlnaProfilePage.onContainerProfileFormSubmit).on('submit', DlnaProfilePage.onContainerProfileFormSubmit);
- $('.codecProfileForm').off('submit', DlnaProfilePage.onCodecProfileFormSubmit).on('submit', DlnaProfilePage.onCodecProfileFormSubmit);
- $('.editResponseProfileForm').off('submit', DlnaProfilePage.onResponseProfileFormSubmit).on('submit', DlnaProfilePage.onResponseProfileFormSubmit);
- $('.identificationHeaderForm').off('submit', DlnaProfilePage.onIdentificationHeaderFormSubmit).on('submit', DlnaProfilePage.onIdentificationHeaderFormSubmit);
- $('.xmlAttributeForm').off('submit', DlnaProfilePage.onXmlAttributeFormSubmit).on('submit', DlnaProfilePage.onXmlAttributeFormSubmit);
- $('.subtitleProfileForm').off('submit', DlnaProfilePage.onSubtitleProfileFormSubmit).on('submit', DlnaProfilePage.onSubtitleProfileFormSubmit);
-}).on('pageshow', '#dlnaProfilePage', function () {
- const page = this;
- $('#radioInfo', page).trigger('click');
- loadProfile(page);
-});
-window.DlnaProfilePage = {
- onSubmit: function () {
- loading.show();
- saveProfile($(this).parents('.page'), currentProfile);
- return false;
- },
- onDirectPlayFormSubmit: function () {
- saveDirectPlayProfile($(this).parents('.page'));
- return false;
- },
- onTranscodingProfileFormSubmit: function () {
- saveTranscodingProfile($(this).parents('.page'));
- return false;
- },
- onContainerProfileFormSubmit: function () {
- saveContainerProfile($(this).parents('.page'));
- return false;
- },
- onCodecProfileFormSubmit: function () {
- saveCodecProfile($(this).parents('.page'));
- return false;
- },
- onResponseProfileFormSubmit: function () {
- saveResponseProfile($(this).parents('.page'));
- return false;
- },
- onIdentificationHeaderFormSubmit: function () {
- saveIdentificationHeader($(this).parents('.page'));
- return false;
- },
- onXmlAttributeFormSubmit: function () {
- saveXmlDocumentAttribute($(this).parents('.page'));
- return false;
- },
- onSubtitleProfileFormSubmit: function () {
- saveSubtitleProfile($(this).parents('.page'));
- return false;
- }
-};
-
diff --git a/src/controllers/dashboard/dlna/profiles.html b/src/controllers/dashboard/dlna/profiles.html
deleted file mode 100644
index f1696632c9..0000000000
--- a/src/controllers/dashboard/dlna/profiles.html
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
${HeaderSystemDlnaProfiles}
-
-
-
${SystemDlnaProfilesHelp}
-
-
-
-
-
-
diff --git a/src/controllers/dashboard/dlna/profiles.js b/src/controllers/dashboard/dlna/profiles.js
deleted file mode 100644
index f69a0c6bf0..0000000000
--- a/src/controllers/dashboard/dlna/profiles.js
+++ /dev/null
@@ -1,93 +0,0 @@
-import escapeHtml from 'escape-html';
-import 'jquery';
-import globalize from '../../../scripts/globalize';
-import loading from '../../../components/loading/loading';
-import libraryMenu from '../../../scripts/libraryMenu';
-import '../../../components/listview/listview.scss';
-import '../../../elements/emby-button/emby-button';
-import confirm from '../../../components/confirm/confirm';
-
-function loadProfiles(page) {
- loading.show();
- ApiClient.getJSON(ApiClient.getUrl('Dlna/ProfileInfos')).then(function (result) {
- renderUserProfiles(page, result);
- renderSystemProfiles(page, result);
- loading.hide();
- });
-}
-
-function renderUserProfiles(page, profiles) {
- renderProfiles(page, page.querySelector('.customProfiles'), profiles.filter(function (p) {
- return p.Type == 'User';
- }));
-}
-
-function renderSystemProfiles(page, profiles) {
- renderProfiles(page, page.querySelector('.systemProfiles'), profiles.filter(function (p) {
- return p.Type == 'System';
- }));
-}
-
-function renderProfiles(page, element, profiles) {
- let html = '';
-
- if (profiles.length) {
- html += '
';
- }
-
- for (let i = 0, length = profiles.length; i < length; i++) {
- const profile = profiles[i];
- html += '
';
- html += '
';
- html += '
';
-
- if (profile.Type == 'User') {
- html += '
';
- }
-
- html += '
';
- }
-
- if (profiles.length) {
- html += '
';
- }
-
- element.innerHTML = html;
- $('.btnDeleteProfile', element).on('click', function () {
- const id = this.getAttribute('data-profileid');
- deleteProfile(page, id);
- });
-}
-
-function deleteProfile(page, id) {
- confirm(globalize.translate('MessageConfirmProfileDeletion'), globalize.translate('HeaderConfirmProfileDeletion')).then(function () {
- loading.show();
- ApiClient.ajax({
- type: 'DELETE',
- url: ApiClient.getUrl('Dlna/Profiles/' + id)
- }).then(function () {
- loading.hide();
- loadProfiles(page);
- });
- });
-}
-
-function getTabs() {
- return [{
- href: '#/dashboard/dlna',
- name: globalize.translate('Settings')
- }, {
- href: '#/dashboard/dlna/profiles',
- name: globalize.translate('TabProfiles')
- }];
-}
-
-$(document).on('pageshow', '#dlnaProfilesPage', function () {
- libraryMenu.setTabs('dlna', 1, getTabs);
- loadProfiles(this);
-});
-
diff --git a/src/controllers/dashboard/dlna/settings.html b/src/controllers/dashboard/dlna/settings.html
deleted file mode 100644
index 4bf5ffc81c..0000000000
--- a/src/controllers/dashboard/dlna/settings.html
+++ /dev/null
@@ -1,69 +0,0 @@
-
diff --git a/src/controllers/dashboard/dlna/settings.js b/src/controllers/dashboard/dlna/settings.js
deleted file mode 100644
index d12b6744af..0000000000
--- a/src/controllers/dashboard/dlna/settings.js
+++ /dev/null
@@ -1,60 +0,0 @@
-import escapeHtml from 'escape-html';
-import 'jquery';
-import loading from '../../../components/loading/loading';
-import libraryMenu from '../../../scripts/libraryMenu';
-import globalize from '../../../scripts/globalize';
-import Dashboard from '../../../utils/dashboard';
-
-function loadPage(page, config, users) {
- page.querySelector('#chkEnablePlayTo').checked = config.EnablePlayTo;
- page.querySelector('#chkEnableDlnaDebugLogging').checked = config.EnableDebugLog;
- $('#txtClientDiscoveryInterval', page).val(config.ClientDiscoveryIntervalSeconds);
- $('#chkEnableServer', page).prop('checked', config.EnableServer);
- $('#chkBlastAliveMessages', page).prop('checked', config.BlastAliveMessages);
- $('#txtBlastInterval', page).val(config.BlastAliveMessageIntervalSeconds);
- const usersHtml = users.map(function (u) {
- return '
';
- }).join('');
- $('#selectUser', page).html(usersHtml).val(config.DefaultUserId || '');
- loading.hide();
-}
-
-function onSubmit() {
- loading.show();
- const form = this;
- ApiClient.getNamedConfiguration('dlna').then(function (config) {
- config.EnablePlayTo = form.querySelector('#chkEnablePlayTo').checked;
- config.EnableDebugLog = form.querySelector('#chkEnableDlnaDebugLogging').checked;
- config.ClientDiscoveryIntervalSeconds = $('#txtClientDiscoveryInterval', form).val();
- config.EnableServer = $('#chkEnableServer', form).is(':checked');
- config.BlastAliveMessages = $('#chkBlastAliveMessages', form).is(':checked');
- config.BlastAliveMessageIntervalSeconds = $('#txtBlastInterval', form).val();
- config.DefaultUserId = $('#selectUser', form).val();
- ApiClient.updateNamedConfiguration('dlna', config).then(Dashboard.processServerConfigurationUpdateResult);
- });
- return false;
-}
-
-function getTabs() {
- return [{
- href: '#/dashboard/dlna',
- name: globalize.translate('Settings')
- }, {
- href: '#/dashboard/dlna/profiles',
- name: globalize.translate('TabProfiles')
- }];
-}
-
-$(document).on('pageinit', '#dlnaSettingsPage', function () {
- $('.dlnaSettingsForm').off('submit', onSubmit).on('submit', onSubmit);
-}).on('pageshow', '#dlnaSettingsPage', function () {
- libraryMenu.setTabs('dlna', 0, getTabs);
- loading.show();
- const page = this;
- const promise1 = ApiClient.getNamedConfiguration('dlna');
- const promise2 = ApiClient.getUsers();
- Promise.all([promise1, promise2]).then(function (responses) {
- loadPage(page, responses[0], responses[1]);
- });
-});
-
diff --git a/src/controllers/session/addServer/index.js b/src/controllers/session/addServer/index.js
index be339ca978..47ebfc6af6 100644
--- a/src/controllers/session/addServer/index.js
+++ b/src/controllers/session/addServer/index.js
@@ -36,7 +36,7 @@ function handleConnectionResult(page, result) {
function submitServer(page) {
loading.show();
- const host = page.querySelector('#txtServerHost').value;
+ const host = page.querySelector('#txtServerHost').value.replace(/\/+$/, '');
ServerConnections.connectToAddress(host, {
enableAutoLogin: appSettings.enableAutoLogin()
}).then(function(result) {
diff --git a/src/elements/emby-itemrefreshindicator/RefreshIndicator.tsx b/src/elements/emby-itemrefreshindicator/RefreshIndicator.tsx
new file mode 100644
index 0000000000..8d2541f9e3
--- /dev/null
+++ b/src/elements/emby-itemrefreshindicator/RefreshIndicator.tsx
@@ -0,0 +1,92 @@
+import React, { type FC, useCallback, useEffect, useState } from 'react';
+import Events, { Event } from 'utils/events';
+import serverNotifications from 'scripts/serverNotifications';
+import classNames from 'classnames';
+
+import CircularProgress, {
+ CircularProgressProps
+} from '@mui/material/CircularProgress';
+import Typography from '@mui/material/Typography';
+import Box from '@mui/material/Box';
+import { toPercent } from 'utils/number';
+import { getCurrentDateTimeLocale } from 'scripts/globalize';
+import type { ItemDto } from 'types/base/models/item-dto';
+
+function CircularProgressWithLabel(
+ props: CircularProgressProps & { value: number }
+) {
+ return (
+
+
+
+
+ {toPercent(props.value / 100, getCurrentDateTimeLocale())}
+
+
+
+ );
+}
+
+interface RefreshIndicatorProps {
+ item: ItemDto;
+ className?: string;
+}
+
+const RefreshIndicator: FC
= ({ item, className }) => {
+ const [progress, setProgress] = useState(item.RefreshProgress || 0);
+
+ const onRefreshProgress = useCallback((_e: Event, apiClient, info) => {
+ if (info.ItemId === item?.Id) {
+ setProgress(parseFloat(info.Progress));
+ }
+ }, [item?.Id]);
+
+ const unbindEvents = useCallback(() => {
+ Events.off(serverNotifications, 'RefreshProgress', onRefreshProgress);
+ }, [onRefreshProgress]);
+
+ const bindEvents = useCallback(() => {
+ unbindEvents();
+
+ if (item?.Id) {
+ Events.on(serverNotifications, 'RefreshProgress', onRefreshProgress);
+ }
+ }, [item?.Id, onRefreshProgress, unbindEvents]);
+
+ useEffect(() => {
+ bindEvents();
+
+ return () => {
+ unbindEvents();
+ };
+ }, [bindEvents, item.Id, unbindEvents]);
+
+ const progressringClass = classNames(
+ 'progressring',
+ className,
+ { 'hide': !progress || progress >= 100 }
+ );
+
+ return (
+
+
+
+ );
+};
+
+export default RefreshIndicator;
diff --git a/src/elements/emby-itemscontainer/ItemsContainer.tsx b/src/elements/emby-itemscontainer/ItemsContainer.tsx
index bcbda52841..779e718271 100644
--- a/src/elements/emby-itemscontainer/ItemsContainer.tsx
+++ b/src/elements/emby-itemscontainer/ItemsContainer.tsx
@@ -1,13 +1,11 @@
import type {
- LibraryUpdateInfo,
- SeriesTimerInfoDto,
- TimerInfoDto,
- UserItemDataDto
+ LibraryUpdateInfo
} from '@jellyfin/sdk/lib/generated-client';
-import React, { FC, useCallback, useEffect, useRef } from 'react';
+import React, { type FC, useCallback, useEffect, useRef } from 'react';
import classNames from 'classnames';
-import { Box } from '@mui/material';
+import Box from '@mui/material/Box';
import Sortable from 'sortablejs';
+import { useQueryClient } from '@tanstack/react-query';
import { usePlaylistsMoveItemMutation } from 'hooks/useFetchItems';
import Events, { Event } from 'utils/events';
import serverNotifications from 'scripts/serverNotifications';
@@ -21,7 +19,7 @@ import itemShortcuts from 'components/shortcuts';
import MultiSelect from 'components/multiSelect/multiSelect';
import loading from 'components/loading/loading';
import focusManager from 'components/focusManager';
-import { ParentId } from 'types/library';
+import type { ParentId } from 'types/library';
function disableEvent(e: MouseEvent) {
e.preventDefault();
@@ -40,11 +38,11 @@ interface ItemsContainerProps {
isContextMenuEnabled?: boolean;
isMultiSelectEnabled?: boolean;
isDragreOrderEnabled?: boolean;
- dataMonitor?: string;
+ eventsToMonitor?: string[];
parentId?: ParentId;
reloadItems?: () => void;
getItemsHtml?: () => string;
- children?: React.ReactNode;
+ queryKey?: string[]
}
const ItemsContainer: FC = ({
@@ -52,12 +50,14 @@ const ItemsContainer: FC = ({
isContextMenuEnabled,
isMultiSelectEnabled,
isDragreOrderEnabled,
- dataMonitor,
+ eventsToMonitor = [],
parentId,
+ queryKey,
reloadItems,
getItemsHtml,
children
}) => {
+ const queryClient = useQueryClient();
const { mutateAsync: playlistsMoveItemMutation } = usePlaylistsMoveItemMutation();
const itemsContainerRef = useRef(null);
const multiSelectref = useRef(null);
@@ -172,6 +172,14 @@ const ItemsContainer: FC = ({
}
}, []);
+ const invalidateQueries = useCallback(async () => {
+ await queryClient.invalidateQueries({
+ queryKey,
+ type: 'all',
+ refetchType: 'active'
+ });
+ }, [queryClient, queryKey]);
+
const notifyRefreshNeeded = useCallback(
(isInForeground: boolean) => {
if (!reloadItems) return;
@@ -184,144 +192,37 @@ const ItemsContainer: FC = ({
[reloadItems]
);
- const getEventsToMonitor = useCallback(() => {
- const monitor = dataMonitor;
- if (monitor) {
- return monitor.split(',');
- }
-
- return [];
- }, [dataMonitor]);
-
- const onUserDataChanged = useCallback(
- (_e: Event, userData: UserItemDataDto) => {
- const itemsContainer = itemsContainerRef.current as HTMLDivElement;
-
- import('../../components/cardbuilder/cardBuilder')
- .then((cardBuilder) => {
- cardBuilder.onUserDataChanged(userData, itemsContainer);
- })
- .catch((err) => {
- console.error(
- '[onUserDataChanged] failed to load onUserData Changed',
- err
- );
- });
-
- const eventsToMonitor = getEventsToMonitor();
- if (
- eventsToMonitor.indexOf('markfavorite') !== -1
- || eventsToMonitor.indexOf('markplayed') !== -1
- ) {
- notifyRefreshNeeded(false);
- }
- },
- [getEventsToMonitor, notifyRefreshNeeded]
+ const onUserDataChanged = useCallback(async () => {
+ await invalidateQueries();
+ },
+ [invalidateQueries]
);
- const onTimerCreated = useCallback(
- (_e: Event, data: TimerInfoDto) => {
- const itemsContainer = itemsContainerRef.current as HTMLDivElement;
- const eventsToMonitor = getEventsToMonitor();
- if (eventsToMonitor.indexOf('timers') !== -1) {
- notifyRefreshNeeded(false);
- return;
- }
-
- const programId = data.ProgramId;
- // This could be null, not supported by all tv providers
- const newTimerId = data.Id;
- if (programId && newTimerId) {
- import('../../components/cardbuilder/cardBuilder')
- .then((cardBuilder) => {
- cardBuilder.onTimerCreated(
- programId,
- newTimerId,
- itemsContainer
- );
- })
- .catch((err) => {
- console.error(
- '[onTimerCreated] failed to load onTimer Created',
- err
- );
- });
- }
- },
- [getEventsToMonitor, notifyRefreshNeeded]
+ const onTimerCreated = useCallback(async () => {
+ await invalidateQueries();
+ },
+ [invalidateQueries]
);
- const onSeriesTimerCreated = useCallback(() => {
- const eventsToMonitor = getEventsToMonitor();
- if (eventsToMonitor.indexOf('seriestimers') !== -1) {
- notifyRefreshNeeded(false);
- }
- }, [getEventsToMonitor, notifyRefreshNeeded]);
+ const onSeriesTimerCreated = useCallback(async () => {
+ await invalidateQueries();
+ }, [invalidateQueries]);
- const onTimerCancelled = useCallback(
- (_e: Event, data: TimerInfoDto) => {
- const itemsContainer = itemsContainerRef.current as HTMLDivElement;
- const eventsToMonitor = getEventsToMonitor();
- if (eventsToMonitor.indexOf('timers') !== -1) {
- notifyRefreshNeeded(false);
- return;
- }
-
- const timerId = data.Id;
-
- if (timerId) {
- import('../../components/cardbuilder/cardBuilder')
- .then((cardBuilder) => {
- cardBuilder.onTimerCancelled(timerId, itemsContainer);
- })
- .catch((err) => {
- console.error(
- '[onTimerCancelled] failed to load onTimer Cancelled',
- err
- );
- });
- }
- },
- [getEventsToMonitor, notifyRefreshNeeded]
+ const onTimerCancelled = useCallback(async () => {
+ await invalidateQueries();
+ },
+ [invalidateQueries]
);
- const onSeriesTimerCancelled = useCallback(
- (_e: Event, data: SeriesTimerInfoDto) => {
- const itemsContainer = itemsContainerRef.current as HTMLDivElement;
- const eventsToMonitor = getEventsToMonitor();
- if (eventsToMonitor.indexOf('seriestimers') !== -1) {
- notifyRefreshNeeded(false);
- return;
- }
-
- const cancelledTimerId = data.Id;
-
- if (cancelledTimerId) {
- import('../../components/cardbuilder/cardBuilder')
- .then((cardBuilder) => {
- cardBuilder.onSeriesTimerCancelled(
- cancelledTimerId,
- itemsContainer
- );
- })
- .catch((err) => {
- console.error(
- '[onSeriesTimerCancelled] failed to load onSeriesTimer Cancelled',
- err
- );
- });
- }
- },
- [getEventsToMonitor, notifyRefreshNeeded]
+ const onSeriesTimerCancelled = useCallback(async () => {
+ await invalidateQueries();
+ },
+ [invalidateQueries]
);
const onLibraryChanged = useCallback(
- (_e: Event, data: LibraryUpdateInfo) => {
- const eventsToMonitor = getEventsToMonitor();
- if (
- eventsToMonitor.indexOf('seriestimers') !== -1
- || eventsToMonitor.indexOf('timers') !== -1
- ) {
+ (_e: Event, apiClient, data: LibraryUpdateInfo) => {
+ if (eventsToMonitor.includes('seriestimers') || eventsToMonitor.includes('timers')) {
// yes this is an assumption
return;
}
@@ -348,32 +249,31 @@ const ItemsContainer: FC = ({
notifyRefreshNeeded(false);
},
- [getEventsToMonitor, notifyRefreshNeeded, parentId]
+ [eventsToMonitor, notifyRefreshNeeded, parentId]
);
const onPlaybackStopped = useCallback(
- (_e: Event, stopInfo) => {
+ (_e: Event, apiClient, stopInfo) => {
const state = stopInfo.state;
- const eventsToMonitor = getEventsToMonitor();
if (
state.NowPlayingItem
&& state.NowPlayingItem.MediaType === 'Video'
) {
- if (eventsToMonitor.indexOf('videoplayback') !== -1) {
+ if (eventsToMonitor.includes('videoplayback')) {
notifyRefreshNeeded(true);
return;
}
} else if (
state.NowPlayingItem
&& state.NowPlayingItem.MediaType === 'Audio'
- && eventsToMonitor.indexOf('audioplayback') !== -1
+ && eventsToMonitor.includes('videoplayback')
) {
notifyRefreshNeeded(true);
return;
}
},
- [getEventsToMonitor, notifyRefreshNeeded]
+ [eventsToMonitor, notifyRefreshNeeded]
);
const setFocus = useCallback(
@@ -418,10 +318,9 @@ const ItemsContainer: FC = ({
if (getItemsHtml) {
itemsContainer.innerHTML = getItemsHtml();
+ imageLoader.lazyChildren(itemsContainer);
}
- imageLoader.lazyChildren(itemsContainer);
-
if (hasActiveElement) {
setFocus(itemsContainer, focusId);
}
diff --git a/src/elements/emby-playstatebutton/PlayedButton.tsx b/src/elements/emby-playstatebutton/PlayedButton.tsx
index 89f4052b11..6a15940686 100644
--- a/src/elements/emby-playstatebutton/PlayedButton.tsx
+++ b/src/elements/emby-playstatebutton/PlayedButton.tsx
@@ -1,5 +1,6 @@
-import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client';
-import React, { FC, useCallback } from 'react';
+import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
+import { useQueryClient } from '@tanstack/react-query';
+import React, { type FC, useCallback } from 'react';
import CheckIcon from '@mui/icons-material/Check';
import { IconButton } from '@mui/material';
import classNames from 'classnames';
@@ -10,28 +11,30 @@ interface PlayedButtonProps {
className?: string;
isPlayed : boolean | undefined;
itemId: string | null | undefined;
- itemType: string | null | undefined
+ itemType: string | null | undefined,
+ queryKey?: string[]
}
const PlayedButton: FC = ({
className,
isPlayed = false,
itemId,
- itemType
+ itemType,
+ queryKey
}) => {
+ const queryClient = useQueryClient();
const { mutateAsync: togglePlayedMutation } = useTogglePlayedMutation();
- const [playedState, setPlayedState] = React.useState(isPlayed);
const getTitle = useCallback(() => {
let buttonTitle;
if (itemType !== BaseItemKind.AudioBook) {
- buttonTitle = playedState ? globalize.translate('Watched') : globalize.translate('MarkPlayed');
+ buttonTitle = isPlayed ? globalize.translate('Watched') : globalize.translate('MarkPlayed');
} else {
- buttonTitle = playedState ? globalize.translate('Played') : globalize.translate('MarkPlayed');
+ buttonTitle = isPlayed ? globalize.translate('Played') : globalize.translate('MarkPlayed');
}
return buttonTitle;
- }, [playedState, itemType]);
+ }, [itemType, isPlayed]);
const onClick = useCallback(async () => {
try {
@@ -39,23 +42,29 @@ const PlayedButton: FC = ({
throw new Error('Item has no Id');
}
- const _isPlayed = await togglePlayedMutation({
+ await togglePlayedMutation({
itemId,
- playedState
- });
- setPlayedState(!!_isPlayed);
+ isPlayed
+ },
+ { onSuccess: async() => {
+ await queryClient.invalidateQueries({
+ queryKey,
+ type: 'all',
+ refetchType: 'active'
+ });
+ } });
} catch (e) {
console.error(e);
}
- }, [playedState, itemId, togglePlayedMutation]);
+ }, [itemId, togglePlayedMutation, isPlayed, queryClient, queryKey]);
const btnClass = classNames(
className,
- { 'playstatebutton-played': playedState }
+ { 'playstatebutton-played': isPlayed }
);
const iconClass = classNames(
- { 'playstatebutton-icon-played': playedState }
+ { 'playstatebutton-icon-played': isPlayed }
);
return (
= ({
+ pct,
+ dataAutoMode,
+ isRecording,
+ starTtime,
+ endTtime,
+ progressOptions
+}) => {
+ const [progress, setProgress] = useState(pct);
+ const timerRef = useRef | null>(null);
+ const theme = useTheme();
+
+ const onAutoTimeProgress = useCallback(() => {
+ const start = parseInt(starTtime.toString(), 10);
+ const end = parseInt(endTtime.toString(), 10);
+
+ const now = new Date().getTime();
+ const total = end - start;
+ let percentage = 100 * ((now - start) / total);
+
+ percentage = Math.min(100, percentage);
+ percentage = Math.max(0, percentage);
+
+ setProgress(percentage);
+ }, [endTtime, starTtime]);
+
+ useEffect(() => {
+ if (timerRef.current) {
+ clearInterval(timerRef.current);
+ }
+
+ if (dataAutoMode === 'time') {
+ timerRef.current = setInterval(onAutoTimeProgress, 60000);
+ }
+
+ return () => {
+ if (timerRef.current) {
+ clearInterval(timerRef.current);
+ timerRef.current = null;
+ }
+ };
+ }, [dataAutoMode, onAutoTimeProgress]);
+
+ const progressBarClass = classNames(
+ 'itemLinearProgress',
+ progressOptions?.containerClass
+ );
+
+ return (
+
+ );
+};
+
+export default AutoTimeProgressBar;
diff --git a/src/elements/emby-ratingbutton/FavoriteButton.tsx b/src/elements/emby-ratingbutton/FavoriteButton.tsx
index ebb662d37d..2bbdeef4ab 100644
--- a/src/elements/emby-ratingbutton/FavoriteButton.tsx
+++ b/src/elements/emby-ratingbutton/FavoriteButton.tsx
@@ -1,4 +1,5 @@
-import React, { FC, useCallback } from 'react';
+import React, { type FC, useCallback } from 'react';
+import { useQueryClient } from '@tanstack/react-query';
import FavoriteIcon from '@mui/icons-material/Favorite';
import { IconButton } from '@mui/material';
import classNames from 'classnames';
@@ -8,16 +9,18 @@ import globalize from 'scripts/globalize';
interface FavoriteButtonProps {
className?: string;
isFavorite: boolean | undefined;
- itemId: string | null | undefined
+ itemId: string | null | undefined;
+ queryKey?: string[]
}
const FavoriteButton: FC = ({
className,
isFavorite = false,
- itemId
+ itemId,
+ queryKey
}) => {
+ const queryClient = useQueryClient();
const { mutateAsync: toggleFavoriteMutation } = useToggleFavoriteMutation();
- const [favoriteState, setFavoriteState] = React.useState(isFavorite);
const onClick = useCallback(async () => {
try {
@@ -25,28 +28,34 @@ const FavoriteButton: FC = ({
throw new Error('Item has no Id');
}
- const _isFavorite = await toggleFavoriteMutation({
+ await toggleFavoriteMutation({
itemId,
- favoriteState
- });
- setFavoriteState(!!_isFavorite);
+ isFavorite
+ },
+ { onSuccess: async() => {
+ await queryClient.invalidateQueries({
+ queryKey,
+ type: 'all',
+ refetchType: 'active'
+ });
+ } });
} catch (e) {
console.error(e);
}
- }, [favoriteState, itemId, toggleFavoriteMutation]);
+ }, [isFavorite, itemId, queryClient, queryKey, toggleFavoriteMutation]);
const btnClass = classNames(
className,
- { 'ratingbutton-withrating': favoriteState }
+ { 'ratingbutton-withrating': isFavorite }
);
const iconClass = classNames(
- { 'ratingbutton-icon-withrating': favoriteState }
+ { 'ratingbutton-icon-withrating': isFavorite }
);
return (
fetchGetItemsViewByType(
@@ -526,17 +528,17 @@ export const useGetGroupsUpcomingEpisodes = (parentId: ParentId) => {
interface ToggleFavoriteMutationProp {
itemId: string;
- favoriteState: boolean
+ isFavorite: boolean
}
const fetchUpdateFavoriteStatus = async (
currentApi: JellyfinApiContext,
itemId: string,
- favoriteState: boolean
+ isFavorite: boolean
) => {
const { api, user } = currentApi;
if (api && user?.Id) {
- if (favoriteState) {
+ if (isFavorite) {
const response = await getUserLibraryApi(api).unmarkFavoriteItem({
userId: user.Id,
itemId: itemId
@@ -555,24 +557,24 @@ const fetchUpdateFavoriteStatus = async (
export const useToggleFavoriteMutation = () => {
const currentApi = useApi();
return useMutation({
- mutationFn: ({ itemId, favoriteState }: ToggleFavoriteMutationProp) =>
- fetchUpdateFavoriteStatus(currentApi, itemId, favoriteState )
+ mutationFn: ({ itemId, isFavorite }: ToggleFavoriteMutationProp) =>
+ fetchUpdateFavoriteStatus(currentApi, itemId, isFavorite )
});
};
interface TogglePlayedMutationProp {
itemId: string;
- playedState: boolean
+ isPlayed: boolean
}
const fetchUpdatePlayedState = async (
currentApi: JellyfinApiContext,
itemId: string,
- playedState: boolean
+ isPlayed: boolean
) => {
const { api, user } = currentApi;
if (api && user?.Id) {
- if (playedState) {
+ if (isPlayed) {
const response = await getPlaystateApi(api).markUnplayedItem({
userId: user.Id,
itemId: itemId
@@ -591,8 +593,8 @@ const fetchUpdatePlayedState = async (
export const useTogglePlayedMutation = () => {
const currentApi = useApi();
return useMutation({
- mutationFn: ({ itemId, playedState }: TogglePlayedMutationProp) =>
- fetchUpdatePlayedState(currentApi, itemId, playedState )
+ mutationFn: ({ itemId, isPlayed }: TogglePlayedMutationProp) =>
+ fetchUpdatePlayedState(currentApi, itemId, isPlayed )
});
};
@@ -676,7 +678,7 @@ const fetchGetTimers = async (
export const useGetTimers = (isUpcomingRecordingsEnabled: boolean, indexByDate?: boolean) => {
const currentApi = useApi();
return useQuery({
- queryKey: ['Timers', isUpcomingRecordingsEnabled, indexByDate],
+ queryKey: ['Timers', { isUpcomingRecordingsEnabled, indexByDate }],
queryFn: ({ signal }) =>
isUpcomingRecordingsEnabled ? fetchGetTimers(currentApi, indexByDate, { signal }) : []
});
@@ -830,7 +832,7 @@ const fetchGetSectionItems = async (
],
parentId: parentId ?? undefined,
imageTypeLimit: 1,
- enableImageTypes: [ImageType.Primary],
+ enableImageTypes: [ImageType.Primary, ImageType.Thumb],
...section.parametersOptions
},
{
@@ -882,19 +884,15 @@ const getSectionsWithItems = async (
const updatedSectionWithItems: SectionWithItems[] = [];
for (const section of sections) {
- try {
- const items = await fetchGetSectionItems(
- currentApi, parentId, section, options
- );
+ const items = await fetchGetSectionItems(
+ currentApi, parentId, section, options
+ );
- if (items && items.length > 0) {
- updatedSectionWithItems.push({
- section,
- items
- });
- }
- } catch (error) {
- console.error(`Error occurred for section ${section.type}: ${error}`);
+ if (items && items.length > 0) {
+ updatedSectionWithItems.push({
+ section,
+ items
+ });
}
}
@@ -908,7 +906,7 @@ export const useGetSuggestionSectionsWithItems = (
const currentApi = useApi();
const sections = getSuggestionSections();
return useQuery({
- queryKey: ['SuggestionSectionWithItems', suggestionSectionType],
+ queryKey: ['SuggestionSectionWithItems', { suggestionSectionType }],
queryFn: ({ signal }) =>
getSectionsWithItems(currentApi, parentId, sections, suggestionSectionType, { signal }),
enabled: !!parentId
@@ -922,9 +920,8 @@ export const useGetProgramsSectionsWithItems = (
const currentApi = useApi();
const sections = getProgramSections();
return useQuery({
- queryKey: ['ProgramSectionWithItems', programSectionType],
- queryFn: ({ signal }) =>
- getSectionsWithItems(currentApi, parentId, sections, programSectionType, { signal })
+ queryKey: ['ProgramSectionWithItems', { programSectionType }],
+ queryFn: ({ signal }) => getSectionsWithItems(currentApi, parentId, sections, programSectionType, { signal })
+
});
};
-
diff --git a/src/scripts/browserDeviceProfile.js b/src/scripts/browserDeviceProfile.js
index 81c6627d57..fb42980fa7 100644
--- a/src/scripts/browserDeviceProfile.js
+++ b/src/scripts/browserDeviceProfile.js
@@ -194,7 +194,8 @@ function supportsHdr10(options) {
|| browser.web0s
|| browser.safari && ((browser.iOS && browser.iOSVersion >= 11) || browser.osx)
// Chrome mobile and Firefox have no client side tone-mapping
- // Edge Chromium on Nvidia is known to have color issues on 10-bit video
+ // Edge Chromium 121+ fixed the tone-mapping color issue on Nvidia
+ || browser.edgeChromium && (browser.versionMajor >= 121)
|| browser.chrome && !browser.mobile
);
}
@@ -394,8 +395,7 @@ export function canPlaySecondaryAudio(videoTestElement) {
&& !browser.firefox
// It seems to work on Tizen 5.5+ (2020, Chrome 69+). See https://developer.tizen.org/forums/web-application-development/video-tag-not-work-audiotracks
&& (browser.tizenVersion >= 5.5 || !browser.tizen)
- // Assume webOS 5+ (2020, Chrome 68+) supports secondary audio like Tizen 5.5+
- && (browser.web0sVersion >= 5.0 || !browser.web0sVersion);
+ && (browser.web0sVersion >= 4.0 || !browser.web0sVersion);
}
export default function (options) {
@@ -573,8 +573,8 @@ export default function (options) {
const hlsInFmp4VideoCodecs = [];
if (canPlayAv1(videoTestElement)
- && !browser.mobile && (browser.edgeChromium || browser.firefox || browser.chrome)) {
- // disable av1 on mobile since it can be very slow software decoding
+ && (browser.safari || (!browser.mobile && (browser.edgeChromium || browser.firefox || browser.chrome)))) {
+ // disable av1 on non-safari mobile browsers since it can be very slow software decoding
hlsInFmp4VideoCodecs.push('av1');
}
@@ -591,11 +591,7 @@ export default function (options) {
}
if (canPlayHevc(videoTestElement, options)) {
- // safari is lying on HDR and 60fps videos, use fMP4 instead
- if (!browser.safari) {
- mp4VideoCodecs.push('hevc');
- }
-
+ mp4VideoCodecs.push('hevc');
if (browser.tizen || browser.web0s) {
hlsInTsVideoCodecs.push('hevc');
}
@@ -619,12 +615,20 @@ export default function (options) {
if (canPlayVp9) {
mp4VideoCodecs.push('vp9');
- webmVideoCodecs.push('vp9');
+ // webm support is unreliable on safari 17
+ if (!browser.safari
+ || (browser.safari && browser.versionMajor >= 15 && browser.versionMajor < 17)) {
+ webmVideoCodecs.push('vp9');
+ }
}
if (canPlayAv1(videoTestElement)) {
mp4VideoCodecs.push('av1');
- webmVideoCodecs.push('av1');
+ // webm support is unreliable on safari 17
+ if (!browser.safari
+ || (browser.safari && browser.versionMajor >= 15 && browser.versionMajor < 17)) {
+ webmVideoCodecs.push('av1');
+ }
}
if (canPlayVp8 || browser.tizen) {
@@ -1106,6 +1110,25 @@ export default function (options) {
});
}
+ // Safari quirks for HEVC direct-play
+ if (browser.safari) {
+ // Only hvc1 & dvh1 tags are supported
+ hevcCodecProfileConditions.push({
+ Condition: 'EqualsAny',
+ Property: 'VideoCodecTag',
+ Value: 'hvc1|dvh1',
+ IsRequired: true
+ });
+
+ // Framerate above 60fps is not supported
+ hevcCodecProfileConditions.push({
+ Condition: 'LessThanEqual',
+ Property: 'VideoFramerate',
+ Value: '60',
+ IsRequired: true
+ });
+ }
+
// On iOS 12.x, for TS container max h264 level is 4.2
if (browser.iOS && browser.iOSVersion < 13) {
const codecProfile = {
diff --git a/src/strings/ar.json b/src/strings/ar.json
index f46da16a21..b4f60f92e4 100644
--- a/src/strings/ar.json
+++ b/src/strings/ar.json
@@ -1722,5 +1722,6 @@
"LabelEnableAudioVbrHelp": "معدل البِت المتغير ينتج على جودة أفضل مقارنة بمعدل البت المتوسط، ولكن في بعض الحالات النادرة قد يسبب مشاكل في التخزين المؤقت والتوافق.",
"LabelSegmentKeepSecondsHelp": "الزمن بالثواني الذي يجب الاحتفاظ به للشرائح قبل أن يتم الكتابة فوقها. يجب أن يكون أكبر من \"بعد الخنق\". يعمل هذا ألأعداد فقط إذا كان حذف الشرائح مفعلًا.",
"AiTranslated": "مترجمة من قبل ذكاء اسطناعي",
- "SelectAudioNormalizationHelp": "كسب الالبوم-تعديل الصوت لكل مسار لكي يعملون بنفس مستوى- كسب الالبوم- تعديل مستوى الصوت لكل المسارات في البوم واحد مع ابقاء على النطاق الديناميكي للألبوم."
+ "SelectAudioNormalizationHelp": "كسب الالبوم-تعديل الصوت لكل مسار لكي يعملون بنفس مستوى- كسب الالبوم- تعديل مستوى الصوت لكل المسارات في البوم واحد مع ابقاء على النطاق الديناميكي للألبوم.",
+ "ButtonEditUser": "تعديل مستخدم"
}
diff --git a/src/strings/bg-bg.json b/src/strings/bg-bg.json
index 7a7b75de42..5329f5bb02 100644
--- a/src/strings/bg-bg.json
+++ b/src/strings/bg-bg.json
@@ -231,7 +231,7 @@
"LabelCollection": "Поредица",
"LabelCommunityRating": "Обществена оценка",
"LabelContentType": "Тип на съдържанието",
- "LabelCountry": "Държава",
+ "LabelCountry": "Държава/Регион",
"LabelCriticRating": "Оценка на критиците",
"LabelCurrentPassword": "Текуща парола",
"LabelCustomCertificatePath": "Ръчно задаване на пътя към SSL сертификата",
@@ -1464,7 +1464,7 @@
"LabelMaxDaysForNextUpHelp": "Задайте максималния брой дни, през които едно шоу би трябвало да остане в списъка „Next Up“, без да го гледате.",
"LabelEnableAudioVbr": "Разреши VBR звуково кодиране",
"HeaderPerformance": "Производителност",
- "LabelChapterImageResolutionHelp": "Резолюцията на извлечените снимки към раздела.",
+ "LabelChapterImageResolutionHelp": "Резолюцията на извлечените снимки към раздела. Промяна в тези настройки няма да повлияе на съществуващите тестови раздели.",
"AllowCollectionManagement": "Позволи този потребител да управлява колекции",
"LabelDummyChapterDuration": "Интервал",
"LabelDummyChapterCount": "Граница",
@@ -1488,5 +1488,19 @@
"LabelDeveloper": "Програмист",
"LabelDate": "Дата",
"GridView": "Грид изглед",
- "HeaderRecordingMetadataSaving": "Запис на Мета-данни"
+ "HeaderRecordingMetadataSaving": "Запис на Мета-данни",
+ "ButtonEditUser": "Редактиране на потребител",
+ "ChannelResolutionSD": "SD",
+ "ChannelResolutionHD": "Висока резолюция",
+ "ChannelResolutionFullHD": "Пълна висока резолюция",
+ "ChannelResolutionUHD4K": "4К Резолюция",
+ "HeaderDummyChapter": "Кадъри от видео сегмент",
+ "HeaderEpisodesStatus": "Статус на епизод",
+ "LabelMediaDetails": "Детайли на медия",
+ "HeaderAllRecordings": "Всички записи",
+ "LabelLevel": "Ниво",
+ "LabelSelectAudioNormalization": "Аудио нормализация",
+ "LabelBuildVersion": "Софтуерна версия",
+ "LabelEnableLUFSScanHelp": "Нормализаране на силата на звука на всички аудио файлове. Това ще увеличи времети за сканиране на библиотеката и ще използва допъкнителни ресурси.",
+ "HeaderGuestCast": "Гостуващи актьори"
}
diff --git a/src/strings/cs.json b/src/strings/cs.json
index bcb9f12675..f7f6bb1bc9 100644
--- a/src/strings/cs.json
+++ b/src/strings/cs.json
@@ -1318,8 +1318,8 @@
"LabelSyncPlayTimeOffset": "Časový rozdíl mezi serverem:",
"HeaderSyncPlayEnabled": "Synchronizace přehrávání povolena",
"HeaderSyncPlaySelectGroup": "Připojit ke skupině",
- "EnableDetailsBannerHelp": "Zobrazí obrázek ve vrchní části detailu položky.",
- "EnableDetailsBanner": "Obrázek detailu",
+ "EnableDetailsBannerHelp": "Zobrazí banner v horní části stránky s detailem položky.",
+ "EnableDetailsBanner": "Zobrazit banner na stránce s detailem",
"ShowMore": "Zobrazit více",
"ShowLess": "Zobrazit méně",
"EnableBlurHashHelp": "Obrázky, které se ještě načítají, budou zobrazeny pomocí jedinečných zástupných obrázků.",
@@ -1785,5 +1785,12 @@
"HeaderAllRecordings": "Všechny nahrávky",
"LabelBuildVersion": "Verze sestavení",
"LabelServerVersion": "Verze serveru",
- "LabelWebVersion": "Verze webu"
+ "LabelWebVersion": "Verze webu",
+ "ButtonEditUser": "Upravit uživatele",
+ "DlnaMovedMessage": "Funkce DLNA byla přesunuta do zásuvného modulu.",
+ "ChannelResolutionSD": "SD",
+ "ChannelResolutionSDPAL": "SD (PAL)",
+ "ChannelResolutionHD": "HD",
+ "ChannelResolutionFullHD": "Full HD",
+ "ChannelResolutionUHD4K": "UHD (4K)"
}
diff --git a/src/strings/da.json b/src/strings/da.json
index 86af18d6f0..276aff793d 100644
--- a/src/strings/da.json
+++ b/src/strings/da.json
@@ -346,7 +346,7 @@
"LabelCollection": "Samling",
"LabelCommunityRating": "Fællesskabsvurdering",
"LabelContentType": "Indholdstype",
- "LabelCountry": "Land",
+ "LabelCountry": "Land/Region",
"LabelCriticRating": "Kritiker bedømmelse",
"LabelCurrentPassword": "Nuværende kode",
"LabelCustomCertificatePath": "Brugerdefineret SSL certifikat sti",
@@ -1754,5 +1754,12 @@
"LabelLevel": "Niveau",
"LabelMediaDetails": "Media detaljer",
"MenuClose": "Luk menu",
- "MediaInfoDvBlSignalCompatibilityId": "DV bl signals kompatibilitets id"
+ "MediaInfoDvBlSignalCompatibilityId": "DV bl signals kompatibilitets id",
+ "ButtonEditUser": "Rediger bruger",
+ "HeaderAllRecordings": "alle optagelser",
+ "ListView": "liste udsigt",
+ "LabelVppTonemappingContrastHelp": "Tilføj kontrastere",
+ "LogLevel.Trace": "Spore",
+ "LabelServerVersion": "server version",
+ "LabelWebVersion": "Web version"
}
diff --git a/src/strings/de.json b/src/strings/de.json
index f9bab17e3e..40cecfc975 100644
--- a/src/strings/de.json
+++ b/src/strings/de.json
@@ -1761,7 +1761,7 @@
"LabelThrottleDelaySeconds": "Drosseln nach",
"LabelThrottleDelaySecondsHelp": "Zeit in Sekunden, nach der die Transkodierung gedrosselt wird. Muss groß genug sein, damit der Client einen gesunden Puffer aufrechterhalten kann. Funktioniert nur wenn \"Transkodierung drosseln\" aktiviert ist.",
"LabelSegmentKeepSeconds": "Zeit, wie lange Segmente behalten werden",
- "LabelSegmentKeepSecondsHelp": "Zeit in Sekunden, in der Segmente nicht überschrieben werden dürfen. Muss größer sein als \"Drosseln nach\". Funktioniert nur wenn \"Segmente löschen\" aktiviert ist.",
+ "LabelSegmentKeepSecondsHelp": "Zeit in Sekunden, für die Segmente behalten werden sollen, bevor sie überschrieben werden. Muss größer sein als \"Drosseln nach\". Funktioniert nur wenn \"Segmente löschen\" aktiviert ist.",
"LogoScreensaver": "Logo Bildschirmschoner",
"UnknownError": "Ein unbekannter Fehler trat auf.",
"GridView": "Kachelansicht",
@@ -1779,11 +1779,13 @@
"LabelBackdropScreensaverIntervalHelp": "Die Zeit in Sekunden zwischen dem Wechsel verschiedener Hintergrundbilder im Bildschirmschoner.",
"SearchResultsEmpty": "Entschuldigung! Es konnten keine Ergebnisse für „{0}“ gefunden werden",
"LabelTrackGain": "Titel Gain",
- "SelectAudioNormalizationHelp": "Track Gain - passt die Lautstärke der einzelnen Tracks an, so dass sie mit der gleichen Lautstärke wiedergegeben werden. Albumverstärkung - passt die Lautstärke aller Titel eines Albums an, wobei der Dynamikbereich des Albums erhalten bleibt.",
+ "SelectAudioNormalizationHelp": "Track Gain - passt die Lautstärke der einzelnen Tracks an, sodass sie mit der gleichen Lautstärke wiedergegeben werden. Albumverstärkung - passt die Lautstärke aller Titel eines Albums an, wobei der Dynamikbereich des Albums erhalten bleibt.",
"LabelAlbumGain": "Albumlautstärke",
"LabelSelectAudioNormalization": "Audio Normalisierung",
"HeaderAllRecordings": "Alle Aufnahmen",
"LabelBuildVersion": "Build-Version",
"LabelServerVersion": "Server-Version",
- "LabelWebVersion": "Web-Version"
+ "LabelWebVersion": "Web-Version",
+ "ButtonEditUser": "Editiere Benutzer",
+ "DlnaMovedMessage": "Die DLNA-Funktion wurde in ein Plugin verschoben."
}
diff --git a/src/strings/en-gb.json b/src/strings/en-gb.json
index 6849dc19f4..e4e9e77c1f 100644
--- a/src/strings/en-gb.json
+++ b/src/strings/en-gb.json
@@ -1782,5 +1782,9 @@
"SearchResultsEmpty": "Sorry! No results found for \"{0}\"",
"LabelSelectAudioNormalization": "Audio Normalisation",
"LabelTrackGain": "Track Gain",
- "HeaderAllRecordings": "All Recordings"
+ "HeaderAllRecordings": "All Recordings",
+ "ButtonEditUser": "Edit user",
+ "LabelBuildVersion": "Build version",
+ "LabelServerVersion": "Server version",
+ "LabelWebVersion": "Web version"
}
diff --git a/src/strings/es.json b/src/strings/es.json
index 09b8745099..26333bf443 100644
--- a/src/strings/es.json
+++ b/src/strings/es.json
@@ -1782,5 +1782,6 @@
"LabelAlbumGain": "Ganancia de Álbum",
"LabelSelectAudioNormalization": "Normalización de audio",
"LabelTrackGain": "Ganancia de pista",
- "HeaderAllRecordings": "Todas las grabaciones"
+ "HeaderAllRecordings": "Todas las grabaciones",
+ "ButtonEditUser": "Editar usuario"
}
diff --git a/src/strings/fi.json b/src/strings/fi.json
index e14e3259dc..e137647a52 100644
--- a/src/strings/fi.json
+++ b/src/strings/fi.json
@@ -12,7 +12,7 @@
"FileReadCancelled": "Tiedoston luku on peruutettu.",
"FileReadError": "Virhe tiedostoa luettaessa.",
"LabelAudioLanguagePreference": "Ensisijainen äänen kieli",
- "LabelCountry": "Maa",
+ "LabelCountry": "Maa/Alue",
"LabelCurrentPassword": "Nykyinen salasana",
"LabelFinish": "Valmis",
"LabelLanguage": "Kieli",
@@ -1780,5 +1780,12 @@
"LabelSelectAudioNormalization": "Äänenvoimakkuuden normalisointi",
"LabelTrackGain": "Kappelkohtainen vahvistus",
"SearchResultsEmpty": "Pahoittelut! Haku \"{0}\" ei tuottanut tuloksia",
- "HeaderAllRecordings": "Kaikki tallenteet"
+ "HeaderAllRecordings": "Kaikki tallenteet",
+ "ButtonEditUser": "Muokkaa käyttäjää",
+ "ChannelResolutionSD": "peruslaatu",
+ "ChannelResolutionHD": "teräväpiirto",
+ "DlnaMovedMessage": "DLNA-ominaisuus on siirtynyt lisäosaan.",
+ "LabelBuildVersion": "Käännetty versio",
+ "LabelServerVersion": "Palvelimen versio",
+ "LabelWebVersion": "Verkko versio"
}
diff --git a/src/strings/fr.json b/src/strings/fr.json
index 8ec284a83c..c84e93a812 100644
--- a/src/strings/fr.json
+++ b/src/strings/fr.json
@@ -1785,5 +1785,12 @@
"HeaderAllRecordings": "Tous les enregistrements",
"LabelBuildVersion": "Numéro de build",
"LabelServerVersion": "Version du serveur",
- "LabelWebVersion": "Version web"
+ "LabelWebVersion": "Version web",
+ "ButtonEditUser": "Modifier l'utilisateur",
+ "DlnaMovedMessage": "La fonctionnalité DLNA a été déplacée vers un plugin.",
+ "ChannelResolutionSD": "SD",
+ "ChannelResolutionSDPAL": "SD (PAL)",
+ "ChannelResolutionHD": "HD",
+ "ChannelResolutionFullHD": "Full HD",
+ "ChannelResolutionUHD4K": "UHD (4K)"
}
diff --git a/src/strings/hi-in.json b/src/strings/hi-in.json
index 7901b4c5ee..d4fff81e4e 100644
--- a/src/strings/hi-in.json
+++ b/src/strings/hi-in.json
@@ -56,7 +56,7 @@
"UnsupportedPlayback": "Jellyfin DRM द्वारा संरक्षित सामग्री को डिक्रिप्ट नहीं कर सकता है, लेकिन सभी सामग्री की परवाह किए बिना, संरक्षित शीर्षकों सहित प्रयास किया जाएगा। एन्क्रिप्शन या अन्य असमर्थित सुविधाओं जैसे इंटरेक्टिव शीर्षक के कारण कुछ फाइलें पूरी तरह से काली दिखाई दे सकती हैं।",
"BoxRear": "बॉक्स (पीछे)",
"Box": "बॉक्स",
- "Books": "पुस्तकों",
+ "Books": "पुस्तकें",
"BookLibraryHelp": "ऑडियो और पाठ्य पुस्तकें समर्थित हैं। {0} पुस्तक नामकरण गाइड {1} की समीक्षा करें।",
"Blacklist": "काला सूची में डालना",
"BirthPlaceValue": "जन्म स्थान: {0}",
@@ -72,7 +72,7 @@
"AskAdminToCreateLibrary": "लाइब्रेरी बनाने के लिए किसी व्यवस्थापक से पूछें।",
"Ascending": "आरोही",
"AsManyAsPossible": "जितने अधिक संभव हों",
- "Artists": "कलाकारों",
+ "Artists": "कलाकार",
"Artist": "कलाकार",
"Art": "कला",
"AroundTime": "लगभग {0}",
@@ -80,10 +80,10 @@
"AnyLanguage": "कोई भी भाषा",
"AlwaysPlaySubtitlesHelp": "भाषा की वरीयता से मेल खाने वाले उपशीर्षक ऑडियो भाषा की परवाह किए बिना लोड किए जाएंगे।",
"AlwaysPlaySubtitles": "हमेशा खेलो",
- "AllowedRemoteAddressesHelp": "कोमा ने नेटवर्क के लिए आईपी पते या आईपी / नेटमास्क प्रविष्टियों की सूची को अलग कर दिया है जिन्हें दूरस्थ रूप से कनेक्ट करने की अनुमति दी जाएगी। यदि खाली छोड़ दिया जाता है, तो सभी दूरस्थ पते की अनुमति दी जाएगी।",
+ "AllowedRemoteAddressesHelp": "नेटवर्क के लिए आईपी पतों आईपी/नेटमास्क एंट्रीज़ की कॉमा विभाजित सूची जो रिमोट रूप से कनेक्ट करने की अनुमति देगा। यदि खाली छोड़ा गया है, तो सभी रिमोट पतों को अनुमति दी जाएगी।",
"AllowRemoteAccessHelp": "अनियंत्रित होने पर, सभी दूरस्थ कनेक्शन अवरुद्ध हो जाएंगे।",
"AllowRemoteAccess": "इस सर्वर को असमीप संपर्क की अनुमति दें",
- "AllowFfmpegThrottlingHelp": "जब एक ट्रांसकोड या रीमूक्स वर्तमान प्लेबैक स्थिति से काफी आगे हो जाता है, तो प्रक्रिया को रोकें ताकि यह कम संसाधनों का उपभोग करेगा। अक्सर मांग किए बिना देखने पर यह सबसे उपयोगी है। यदि आप प्लेबैक समस्याओं का अनुभव करते हैं तो इसे बंद कर दें।",
+ "AllowFfmpegThrottlingHelp": "जब कोई ट्रांसकोड या रीमक्स वर्तमान प्लेबैक स्थिति से काफी आगे निकल जाता है, तो प्रक्रिया को रोक दें ताकि यह कम संसाधनों का उपभोग करे। अक्सर बिना खोजे देखते समय यह सबसे उपयोगी होता है। यदि आप प्लेबैक समस्याओं का अनुभव करते हैं तो इसे बंद कर दें।",
"AllowFfmpegThrottling": "थ्रोटल ट्रांसकोड",
"AllowOnTheFlySubtitleExtractionHelp": "वीडियो ट्रांसकोडिंग को रोकने में मदद करने के लिए एंबेडेड सबटाइटल वीडियो से निकाले जा सकते हैं और सादे पाठ में ग्राहकों तक पहुंचाए जाते हैं। कुछ प्रणालियों पर यह एक लंबा समय ले सकता है और निष्कर्षण प्रक्रिया के दौरान वीडियो प्लेबैक को स्टाल करने का कारण बन सकता है। जब वे क्लाइंट डिवाइस द्वारा मूल रूप से समर्थित नहीं होते हैं, तो वीडियो ट्रांसकोडिंग के साथ जले हुए एम्बेडेड उपशीर्षक को अक्षम करें।",
"AlbumArtist": "एल्बम कलाकार",
@@ -96,13 +96,13 @@
"BurnSubtitlesHelp": "निर्धारित करता है कि वीडियो ट्रांसकोडिंग करते समय सर्वर को उपशीर्षक बर्न-इन करना चाहिए। इससे बचने से प्रदर्शन में बहुत सुधार होगा। छवि आधारित उपशीर्षक (VOBSUB, PGS, SUB, IDX, …) एवं ASS अथवा SSA जैसे उपशीर्षक बर्न-इन करने के लिए ऑटो का चयन करें।",
"ButtonRemove": "हटाना",
"ButtonOpen": "खोलो",
- "HeaderContinueWatching": "देखते रहिए",
+ "HeaderContinueWatching": "देखना जारी रखें",
"HeaderAlbumArtists": "एल्बम कलाकार",
- "Genres": "शैली",
- "Folders": "फ़ोल्डरें",
+ "Genres": "शैलियां",
+ "Folders": "फ़ोल्डर",
"Favorites": "पसंदीदा",
"Default": "प्राथमिक",
- "Collections": "संग्रहों",
+ "Collections": "संग्रह",
"Channels": "चैनल",
"Movies": "फ़िल्म",
"ButtonActivate": "सक्रिय",
@@ -151,9 +151,11 @@
"Shows": "शो",
"ValueSpecialEpisodeName": "विशेष - {0}",
"Sync": "समाकलयति",
- "AllowCollectionManagement": "इस यूजर को कलेक्शन परिवर्तन करने की अनुमति दें",
+ "AllowCollectionManagement": "इस यूजर को संग्रह प्रबंधित करने की अनुमति दें",
"AllowSegmentDeletion": "खंड हटाएँ",
"AllowSegmentDeletionHelp": "क्लाइंट को भेजे जाने के बाद पुराने सेगमेंट हटा दें। यह संपूर्ण ट्रांसकोड की गई फ़ाइल को डिस्क पर स्टोर करने से रोकता है। केवल थ्रॉटलिंग सक्षम होने पर ही काम करेगा। यदि आप प्लेबैक समस्याओं का अनुभव करते हैं तो इसे बंद कर दें।",
"LabelThrottleDelaySeconds": "थ्रॉटर बाद",
- "LabelSegmentKeepSeconds": "सेगमेंट रखने का समय"
+ "LabelSegmentKeepSeconds": "सेगमेंट रखने का समय",
+ "LabelThrottleDelaySecondsHelp": "सेकंड में समय जिसके बाद ट्रांसकोडर को थ्रॉटल कर दिया जाएगा। क्लाइंट के लिए स्वस्थ बफ़र बनाए रखने के लिए पर्याप्त बड़ा होना चाहिए। केवल तभी काम करता है जब थ्रॉटलिंग सक्रिय हो।",
+ "LabelSegmentKeepSecondsHelp": "किन खंडों को अधिलेखित करने से पहले रखा जाना चाहिए, इसका समय सेकंड में। \"थ्रोटल आफ्टर\" से बड़ा होना चाहिए। केवल तभी काम करता है जब खंड हटाना सक्रिय हो।"
}
diff --git a/src/strings/it.json b/src/strings/it.json
index 4dddc27c07..f983f90c5c 100644
--- a/src/strings/it.json
+++ b/src/strings/it.json
@@ -53,7 +53,7 @@
"ButtonBack": "Indietro",
"ButtonCancel": "Annulla",
"ButtonChangeServer": "Cambia Server",
- "ButtonEditOtherUserPreferences": "Modifica questo utente di profilo, l'immagine e le preferenze personali.",
+ "ButtonEditOtherUserPreferences": "Modifica il profilo, l'immagine e le preferenze personali di questo utente.",
"ButtonForgotPassword": "Password Dimenticata",
"ButtonFullscreen": "Schermo Intero",
"ButtonGotIt": "Ho capito",
@@ -74,16 +74,16 @@
"ButtonResume": "Riprendi",
"ButtonRevoke": "Revoca",
"ButtonScanAllLibraries": "Scansiona Tutte le Librerie",
- "ButtonSelectDirectory": "Seleziona cartella",
+ "ButtonSelectDirectory": "Seleziona Cartella",
"ButtonSelectView": "Seleziona vista",
"ButtonSend": "Invia",
"ButtonShutdown": "Arresta Server",
"ButtonSignIn": "Accedi",
"ButtonSignOut": "Esci",
- "ButtonStart": "Avvio",
+ "ButtonStart": "Avvia",
"ButtonSubmit": "Invia",
"ButtonUninstall": "Disinstalla",
- "ButtonWebsite": "Web",
+ "ButtonWebsite": "Sito Web",
"CancelRecording": "Annulla la registrazione",
"CancelSeries": "Annulla Serie TV",
"Categories": "Categorie",
@@ -1114,7 +1114,7 @@
"Box": "Scatola",
"ButtonInfo": "Info",
"ButtonOk": "Ok",
- "ButtonStop": "Stop",
+ "ButtonStop": "Ferma",
"ButtonTrailer": "Trailer",
"ChangingMetadataImageSettingsNewContent": "I cambiamenti alle impostazioni dei download dei metadati verranno applicati solamente ai nuovi contenuti aggiunti alla libreria. Per applicare i cambiamenti ai titoli già esistenti devi ricaricare i metadati manualmente.",
"DownloadsValue": "{0} scaricati",
@@ -1785,5 +1785,6 @@
"HeaderAllRecordings": "Tutte le registrazioni",
"LabelBuildVersion": "Versione Compilata",
"LabelServerVersion": "Versione server",
- "LabelWebVersion": "Versione web"
+ "LabelWebVersion": "Versione web",
+ "ButtonEditUser": "Modifica utente"
}
diff --git a/src/strings/ja.json b/src/strings/ja.json
index f86941322d..46f5e3202a 100644
--- a/src/strings/ja.json
+++ b/src/strings/ja.json
@@ -729,7 +729,7 @@
"LabelCollection": "コレクション",
"LabelCommunityRating": "コミュニティ評価",
"LabelContentType": "コンテンツタイプ",
- "LabelCountry": "国",
+ "LabelCountry": "国/地域",
"LabelDashboardTheme": "サーバーダッシュボードテーマ",
"LabelPublicHttpsPortHelp": "公開ポート番号はローカルHTTPSポートにマッピングしてください。",
"LabelAlbumArtMaxWidth": "アルバムアート最大高さ",
@@ -1338,7 +1338,7 @@
"QuickConnectDescription": "クイックコネクトでサインインする場合、ログインするデバイスのクイックコネクトボタンを選択して以下のコードを入力します。",
"QuickConnectDeactivated": "ログインのリクエストが承認される前にクイックコネクトが無効化されました",
"QuickConnectAuthorizeFail": "不明なクイックコネクトコードです",
- "QuickConnectAuthorizeSuccess": "リクエストが承認されました",
+ "QuickConnectAuthorizeSuccess": "デバイスの認証に成功しました！",
"QuickConnectAuthorizeCode": "コード {0} を入力してログイン",
"QuickConnectActivationSuccessful": "有効化に成功しました",
"QuickConnect": "クイックコネクト",
@@ -1429,7 +1429,7 @@
"DeleteAll": "すべて削除",
"EnableFallbackFontHelp": "カスタム代替フォントの有効にする。これにより間違った字幕レンダリングの問題を回避することができます。",
"EnableFallbackFont": "代替フォントを有効化",
- "LabelFallbackFontPathHelp": "ASS/SSA字幕レンダリングのための代替フォントを含むパスを指定してください。フォントファイルサイズは最大20MBです。woff2のような軽量でweb向けのフォントフォーマットが推奨です。",
+ "LabelFallbackFontPathHelp": "これらのフォントは、一部のクライアントによって字幕を表示するために使用されます。詳細については、ドキュメントを参照してください。",
"LabelFallbackFontPath": "代替フォントフォルダパス",
"HeaderSelectFallbackFontPathHelp": "ASS/SSA字幕レンダリングに使用する代替フォントフォルダパスを参照/入力。",
"HeaderSelectFallbackFontPath": "代替フォントフォルダパスを選択",
@@ -1624,7 +1624,7 @@
"LabelRemuxingInfo": "リミキシング情報",
"LabelOriginalMediaInfo": "オリジナルメディア情報",
"PreferFmp4HlsContainer": "fMP4-HLSメディアコンテナを優先する",
- "PreferFmp4HlsContainerHelp": "HLSのデフォルトコンテナとしてfMP4を優先的に使用し、対応デバイスでHEVCコンテンツのダイレクトストリーミングを可能にします。",
+ "PreferFmp4HlsContainerHelp": "HLSのデフォルトコンテナとしてfMP4を優先的に使用し、対応デバイスでHEVCとAV1コンテンツのダイレクトストリーミングを可能にします。",
"AllowHevcEncoding": "HEVCフォーマットでのエンコードを可能にする",
"LabelAllowedAudioChannels": "最大許容オーディオチャンネル数",
"LabelSelectAudioChannels": "チャンネル",
@@ -1731,7 +1731,7 @@
"LogLevel.Warning": "警告",
"LogLevel.None": "なし",
"LabelEnableLUFSScan": "LUFS解析を有効",
- "LabelEnableLUFSScanHelp": "音楽用のLUFS解析を有効(より時間とリソースを要します)。",
+ "LabelEnableLUFSScanHelp": "クライアントはオーディオ再生を正規化して、トラック間で等しい大きさを実現できます。これにより、ライブラリのスキャン時間が長くなり、より多くのリソースを消費します。",
"MenuClose": "メニューを閉じる",
"Notifications": "通知",
"NotificationsMovedMessage": "通知機能はWebhookプラグインに移行されました。",
@@ -1765,5 +1765,23 @@
"LogoScreensaver": "ロゴスクリーンセーバー",
"AiTranslated": "AI翻訳",
"MachineTranslated": "機械翻訳",
- "BackdropScreensaver": "背景スクリーンセーバー"
+ "BackdropScreensaver": "背景スクリーンセーバー",
+ "ButtonEditUser": "ユーザーを編集",
+ "SearchResultsEmpty": "申し訳ありません！「{0}」に対する結果が見つかりませんでした",
+ "LabelAlbumGain": "アルバムゲイン",
+ "HearingImpairedShort": "HI/SDH",
+ "LabelIsHearingImpaired": "聴覚障害者向け（SDH）",
+ "GridView": "グリッドビュー",
+ "ListView": "リスト表示",
+ "LabelBackdropScreensaverInterval": "バックドロップスクリーンセーバー間隔",
+ "LabelBackdropScreensaverIntervalHelp": "バックドロップスクリーンセーバーを使用時に異なるバックドロップ間での秒数。",
+ "HeaderAllRecordings": "すべての録音",
+ "SelectAudioNormalizationHelp": "トラックゲイン - 各トラックの音量を調整して、同じ大きさで再生されるようにします。アルバムゲイン - アルバム内の全てのトラックの音量を調整し、アルバムのダイナミックレンジを保持します。",
+ "LabelSelectAudioNormalization": "音量正規化",
+ "LabelBuildVersion": "ビルドバージョン",
+ "LabelServerVersion": "サーバーバージョン",
+ "LabelWebVersion": "ウェブバージョン",
+ "LabelTrackGain": "トラックゲイン",
+ "ForeignPartsOnly": "強制/外国語パートのみ",
+ "HeaderGuestCast": "ゲストスター"
}
diff --git a/src/strings/nb.json b/src/strings/nb.json
index cc80ede636..1a6187b5de 100644
--- a/src/strings/nb.json
+++ b/src/strings/nb.json
@@ -1781,5 +1781,6 @@
"LabelAlbumGain": "Albumjustering",
"LabelSelectAudioNormalization": "Lydnormalisering",
"LabelTrackGain": "Sporjustering",
- "HeaderAllRecordings": "Alle opptak"
+ "HeaderAllRecordings": "Alle opptak",
+ "ButtonEditUser": "Rediger bruker"
}
diff --git a/src/strings/nl.json b/src/strings/nl.json
index 5c5757bddb..5c98ff7971 100644
--- a/src/strings/nl.json
+++ b/src/strings/nl.json
@@ -1784,5 +1784,12 @@
"HeaderAllRecordings": "Alle opnamen",
"LabelBuildVersion": "Buildversie",
"LabelServerVersion": "Serverversie",
- "LabelWebVersion": "Webversie"
+ "LabelWebVersion": "Webversie",
+ "ButtonEditUser": "Gebruiker bewerken",
+ "DlnaMovedMessage": "De DLNA-functionaliteit is verplaatst naar een plug-in.",
+ "ChannelResolutionSD": "SD",
+ "ChannelResolutionSDPAL": "SD (PAL)",
+ "ChannelResolutionHD": "HD",
+ "ChannelResolutionFullHD": "Full HD",
+ "ChannelResolutionUHD4K": "UHD (4K)"
}
diff --git a/src/strings/pl.json b/src/strings/pl.json
index b0436984d0..82f523c25a 100644
--- a/src/strings/pl.json
+++ b/src/strings/pl.json
@@ -1786,5 +1786,11 @@
"LabelBuildVersion": "Wersja kompilacji",
"LabelServerVersion": "Wersja serwera",
"LabelWebVersion": "Wersja sieciowa",
- "ButtonEditUser": "Edytuj użytkownika"
+ "ButtonEditUser": "Edytuj użytkownika",
+ "DlnaMovedMessage": "Funkcjonalność DLNA została przeniesiona do wtyczki.",
+ "ChannelResolutionSD": "SD",
+ "ChannelResolutionSDPAL": "SD (PAL)",
+ "ChannelResolutionHD": "HD",
+ "ChannelResolutionFullHD": "Full HD",
+ "ChannelResolutionUHD4K": "UHD (4K)"
}
diff --git a/src/strings/pt-br.json b/src/strings/pt-br.json
index ea9da6111c..51b0db327e 100644
--- a/src/strings/pt-br.json
+++ b/src/strings/pt-br.json
@@ -1779,5 +1779,15 @@
"LabelAlbumGain": "Nivelar volume do álbum",
"LabelSelectAudioNormalization": "Normalização de áudio",
"LabelTrackGain": "Nivelação de volume de faixa",
- "HeaderAllRecordings": "Todas as Gravações"
+ "HeaderAllRecordings": "Todas as Gravações",
+ "ButtonEditUser": "Editar usuário",
+ "ChannelResolutionSD": "SD",
+ "ChannelResolutionSDPAL": "SD (PAL)",
+ "ChannelResolutionHD": "HD",
+ "ChannelResolutionFullHD": "Full HD",
+ "ChannelResolutionUHD4K": "UHD (4K)",
+ "DlnaMovedMessage": "A funcionalidade DLNA foi movida para um plugin.",
+ "LabelBuildVersion": "Versão da build",
+ "LabelServerVersion": "Versão do servidor",
+ "LabelWebVersion": "Versão web"
}
diff --git a/src/strings/pt-pt.json b/src/strings/pt-pt.json
index 4376ca3641..d4e5a3883b 100644
--- a/src/strings/pt-pt.json
+++ b/src/strings/pt-pt.json
@@ -1675,7 +1675,7 @@
"Interview": "Entrevista",
"DeletedScene": "Cenas removidas",
"BehindTheScenes": "Nos bastidores",
- "DownloadAll": "Transferir Todas",
+ "DownloadAll": "Transferir todas",
"MessageNoItemsAvailable": "Nenhum item disponível atualmente.",
"MessageNoFavoritesAvailable": "Nenhum favorito disponível atualmente.",
"SubtitleBlack": "Preto",
diff --git a/src/strings/sk.json b/src/strings/sk.json
index 1b663e025a..578da7806f 100644
--- a/src/strings/sk.json
+++ b/src/strings/sk.json
@@ -1781,5 +1781,7 @@
"LabelAlbumGain": "Zosilnenie pre album",
"LabelSelectAudioNormalization": "Normalizácia hlasitosti",
"LabelTrackGain": "Zosilnenie stopy",
- "SearchResultsEmpty": "Prepáčte! Nenašli sa žiadne výsledky pre \"{0}\""
+ "SearchResultsEmpty": "Prepáčte! Nenašli sa žiadne výsledky pre \"{0}\"",
+ "ButtonEditUser": "Upraviť používateľa",
+ "HeaderAllRecordings": "Všetky nahrávky"
}
diff --git a/src/strings/sl-si.json b/src/strings/sl-si.json
index a74186d5f7..f7d996710c 100644
--- a/src/strings/sl-si.json
+++ b/src/strings/sl-si.json
@@ -10,7 +10,7 @@
"HeaderUser": "Uporabnik",
"LabelArtists": "Izvajalci",
"LabelContentType": "Tip vsebine",
- "LabelCountry": "Država",
+ "LabelCountry": "Država/Regija",
"LabelCurrentPassword": "Trenutno geslo",
"LabelFinish": "Zaključi",
"LabelLanguage": "Jezik",
@@ -1453,7 +1453,7 @@
"LabelSelectAudioChannels": "Kanali",
"LabelAllowedAudioChannels": "Največje število dovoljenih zvočnih kanalov",
"AllowHevcEncoding": "Dovoli kodiranje v HEVC format",
- "PreferFmp4HlsContainerHelp": "Prioritiziraj uporabo fMP4 kot privzeti kontejner za HLS. Omogoča neposredno pretakanje HEVC vsebin na podprtih napravah.",
+ "PreferFmp4HlsContainerHelp": "Prioritiziraj uporabo fMP4 kot privzeti kontejner za HLS. Omogoča neposredno pretakanje HEVC in AV1 vsebin na podprtih napravah.",
"PreferFmp4HlsContainer": "Prioritiziraj fMP4-HLS kontejner",
"LabelSyncPlayInfo": "Informacije o SyncPlay",
"LabelOriginalMediaInfo": "Informacije o izvorni predstavnosti",
@@ -1770,5 +1770,7 @@
"SubtitleLightGray": "Svetlo siva",
"SubtitleMagenta": "Magenta",
"LabelParallelImageEncodingLimitHelp": "Največje dovoljeno število vzporednih kodiranj slik. Nastavite na 0 za samodejno omejitev glede na zmogljivost vašega sistema.",
- "AiTranslated": "AI prevedeno"
+ "AiTranslated": "AI prevedeno",
+ "ButtonEditUser": "Uredi uporabnika",
+ "HeaderAllRecordings": "Vsi posnetki"
}
diff --git a/src/strings/sv.json b/src/strings/sv.json
index 588f72ee3a..1110ab7ae8 100644
--- a/src/strings/sv.json
+++ b/src/strings/sv.json
@@ -415,7 +415,7 @@
"LabelCollection": "Samling",
"LabelCommunityRating": "Användaromdöme",
"LabelContentType": "Innehållstyp",
- "LabelCountry": "Land",
+ "LabelCountry": "Land/Region",
"LabelCriticRating": "Kritikerbetyg",
"LabelCurrentPassword": "Nuvarande lösenord",
"LabelCustomCertificatePath": "Sökväg för anpassat SSL-certifikat",
@@ -1781,5 +1781,9 @@
"LabelAlbumGain": "Albumförstärkning",
"LabelSelectAudioNormalization": "Ljudnormalisering",
"LabelTrackGain": "Spårförstärkning",
- "HeaderAllRecordings": "Alla inspelningar"
+ "HeaderAllRecordings": "Alla inspelningar",
+ "LabelBuildVersion": "Byggversion",
+ "ButtonEditUser": "redigera användare",
+ "LabelServerVersion": "Serverversion",
+ "LabelWebVersion": "Webbversion"
}
diff --git a/src/strings/tr.json b/src/strings/tr.json
index a67a8e81b5..5ee9b1f733 100644
--- a/src/strings/tr.json
+++ b/src/strings/tr.json
@@ -1777,5 +1777,6 @@
"HeaderAllRecordings": "Tüm Kayıtlar",
"LabelBuildVersion": "Yapı sürümü",
"LabelServerVersion": "Sunucu sürümü",
- "LabelWebVersion": "Web sürümü"
+ "LabelWebVersion": "Web sürümü",
+ "ButtonEditUser": "Kullanıcıyı düzenle"
}
diff --git a/src/strings/uk.json b/src/strings/uk.json
index a1df7529f8..c3f33203cc 100644
--- a/src/strings/uk.json
+++ b/src/strings/uk.json
@@ -1782,5 +1782,12 @@
"HeaderAllRecordings": "Всі записи",
"LabelBuildVersion": "Версія збірки",
"LabelServerVersion": "Версія сервера",
- "LabelWebVersion": "Версія вебу"
+ "LabelWebVersion": "Версія вебу",
+ "ButtonEditUser": "Редагувати користувача",
+ "DlnaMovedMessage": "Функціональність DLNA перенесено у плагін.",
+ "ChannelResolutionSD": "SD",
+ "ChannelResolutionSDPAL": "SD (PAL)",
+ "ChannelResolutionHD": "HD",
+ "ChannelResolutionFullHD": "Full HD",
+ "ChannelResolutionUHD4K": "UHD (4K)"
}
diff --git a/src/strings/zh-hk.json b/src/strings/zh-hk.json
index bdb4e50ef6..b8ab955467 100644
--- a/src/strings/zh-hk.json
+++ b/src/strings/zh-hk.json
@@ -1179,5 +1179,76 @@
"NoNewDevicesFound": "未偵測到調諧器。請關閉此對話框，手動輸入裝置資料。",
"OptionEnableForAllTuners": "為所有調諧器啟用",
"MessageConfirmDeleteTunerDevice": "你確定要刪除此裝置嗎？",
- "LabelDate": "日期"
+ "LabelDate": "日期",
+ "LabelDeveloper": "開發者",
+ "Select": "選擇",
+ "MediaInfoProfile": "設定檔",
+ "MessageConfirmShutdown": "你確定要關閉這個服務器嗎?",
+ "SeriesYearToPresent": "{0} - 現在",
+ "SubtitleBlue": "藍",
+ "SaveChanges": "儲存變更",
+ "RepeatOne": "重複播放一次",
+ "Yesterday": "昨天",
+ "ButtonEditUser": "更改用戶",
+ "Whitelist": "白名單",
+ "Movie": "電影",
+ "Settings": "設定",
+ "OptionMax": "最大",
+ "Quality": "品質",
+ "PlayCount": "播放次數",
+ "SelectServer": "選擇服務器",
+ "OptionWeekdays": "平日",
+ "RepeatAll": "重複播放所有",
+ "ShowYear": "顯示年份",
+ "NumLocationsValue": "{0} 資料夾",
+ "PlayFromBeginning": "從頭播放",
+ "Profile": "設定檔",
+ "QuickConnect": "快速連結",
+ "MySubtitles": "我的字幕",
+ "Subtitles": "字幕",
+ "Repeat": "重複播放",
+ "Subtitle": "字幕",
+ "Rewind": "倒回",
+ "ResetPassword": "重置密碼",
+ "SubtitleBlack": "黑",
+ "SubtitleGray": "灰",
+ "Bold": "粗體",
+ "LabelWebVersion": "網站版本",
+ "SecondarySubtitles": "副字幕",
+ "Played": "已播放",
+ "TabPlugins": "插件",
+ "TagsValue": "標籤: {0}",
+ "Trailers": "預告片",
+ "Transcoding": "轉碼",
+ "Unmute": "取消靜音",
+ "ValueCodec": "編解碼器: {0}",
+ "Writer": "編劇",
+ "Yes": "是",
+ "OptionWeekends": "周末",
+ "Print": "列印",
+ "Share": "分享",
+ "TabCodecs": "編解碼器",
+ "Tags": "標籤",
+ "Series": "系列",
+ "SearchResults": "搜索結果",
+ "OptionRandom": "隨機",
+ "Preview": "預覽",
+ "Suggestions": "建議",
+ "SubtitleYellow": "黃",
+ "Menu": "菜單",
+ "RememberMe": "保持登入狀態",
+ "Search": "搜索",
+ "HeaderAllRecordings": "所有錄影的節目",
+ "MenuOpen": "打開菜單",
+ "TitleHardwareAcceleration": "硬件加速",
+ "Upload": "上傳",
+ "Watched": "已觀看",
+ "Writers": "編劇",
+ "SubtitleRed": "紅",
+ "SubtitleWhite": "白",
+ "LabelSystem": "系統",
+ "ShowMore": "顯示更多",
+ "YoutubeBadRequest": "錯誤的請求。",
+ "MillisecondsUnit": "毫秒",
+ "MediaInfoTitle": "標題"
}
diff --git a/src/strings/zh-tw.json b/src/strings/zh-tw.json
index 27c659bfe9..adbcc220af 100644
--- a/src/strings/zh-tw.json
+++ b/src/strings/zh-tw.json
@@ -203,7 +203,7 @@
"WelcomeToProject": "歡迎使用 Jellyfin！",
"WizardCompleted": "這就是我們所需的全部資訊，Jellyfin 現在正在收集你的媒體櫃的資料，在這段時間內，不妨參考我們推出的應用程式。按一下完成進入控制台。",
"Actor": "演員",
- "AddToPlayQueue": "加入至播放佇列",
+ "AddToPlayQueue": "加入播放佇列",
"AddToPlaylist": "加入播放清單",
"Absolute": "絕對",
"AccessRestrictedTryAgainLater": "目前存取受限，請稍後再試。",
@@ -757,7 +757,7 @@
"No": "不要",
"Off": "關閉",
"OptionAdminUsers": "管理員",
- "OptionAllowRemoteControlOthers": "允許其他使用者遠端控制",
+ "OptionAllowRemoteControlOthers": "允許遠端控制其他用戶的裝置",
"OptionReleaseDate": "釋出日期",
"OptionWeekends": "假日",
"PlayNextEpisodeAutomatically": "自動播放下一集",
@@ -887,7 +887,7 @@
"PerfectMatch": "最佳配對",
"PictureInPicture": "浮窗播放",
"PlayFromBeginning": "從頭開始播放",
- "PlayNext": "播放下一個",
+ "PlayNext": "下一個播放",
"Next": "下一個",
"OptionCaptionInfoExSamsung": "CaptionInfoEx（三星）",
"People": "人物",
diff --git a/src/themes/theme.ts b/src/themes/theme.ts
index a5230ebafd..70e060dd74 100644
--- a/src/themes/theme.ts
+++ b/src/themes/theme.ts
@@ -1,5 +1,15 @@
import { createTheme } from '@mui/material/styles';
+declare module '@mui/material/styles' {
+ interface Palette {
+ starIcon: Palette['primary'];
+ }
+
+ interface PaletteOptions {
+ starIcon?: PaletteOptions['primary'];
+ }
+}
+
const LIST_ICON_WIDTH = 36;
/** The default Jellyfin app theme for mui */
@@ -18,6 +28,12 @@ const theme = createTheme({
},
action: {
selectedOpacity: 0.2
+ },
+ starIcon: {
+ main: '#f2b01e' // Yellow color
+ },
+ error: {
+ main: '#cb272a' // Red color
}
},
typography: {
diff --git a/src/types/base/common/shared/types.ts b/src/types/base/common/shared/types.ts
new file mode 100644
index 0000000000..f89240dc23
--- /dev/null
+++ b/src/types/base/common/shared/types.ts
@@ -0,0 +1,3 @@
+export type NullableString = string | null | undefined;
+export type NullableNumber = number | null | undefined;
+export type NullableBoolean = boolean | null | undefined;
diff --git a/src/types/base/models/item-dto.ts b/src/types/base/models/item-dto.ts
new file mode 100644
index 0000000000..a3fcedeaee
--- /dev/null
+++ b/src/types/base/models/item-dto.ts
@@ -0,0 +1,22 @@
+import type { BaseItemDto, BaseItemKind, CollectionTypeOptions, RecordingStatus, SearchHint, SeriesTimerInfoDto, TimerInfoDto, UserItemDataDto, VirtualFolderInfo } from '@jellyfin/sdk/lib/generated-client';
+
+type BaseItem = Omit;
+type TimerInfo = Omit;
+type SeriesTimerInfo = Omit;
+type SearchHintItem = Omit;
+type UserItem = Omit;
+type VirtualFolder = Omit;
+
+export interface ItemDto extends BaseItem, TimerInfo, SeriesTimerInfo, SearchHintItem, UserItem, VirtualFolder {
+ 'ChannelId'?: string | null;
+ 'EndDate'?: string | null;
+ 'Id'?: string | null;
+ 'StartDate'?: string | null;
+ 'Type'?: BaseItemKind | string | null;
+ 'Status'?: RecordingStatus | string | null;
+ 'CollectionType'?: CollectionTypeOptions | string | null;
+ 'Artists'?: Array | null;
+ 'MediaType'?: string | null;
+ 'Name'?: string | null;
+ 'ItemId'?: string | null;
+}
diff --git a/src/types/base/models/item-kind.ts b/src/types/base/models/item-kind.ts
new file mode 100644
index 0000000000..d89f8cbeef
--- /dev/null
+++ b/src/types/base/models/item-kind.ts
@@ -0,0 +1,12 @@
+import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
+
+export const ItemKind = {
+ ...BaseItemKind,
+ Timer: 'Timer',
+ SeriesTimer: 'SeriesTimer'
+} as const;
+
+// eslint-disable-next-line @typescript-eslint/no-redeclare
+export type ItemKind = keyof typeof ItemKind;
+
+export type ItemType = ItemKind | null | undefined;
diff --git a/src/types/base/models/item-media-kind.ts b/src/types/base/models/item-media-kind.ts
new file mode 100644
index 0000000000..14fbe6a137
--- /dev/null
+++ b/src/types/base/models/item-media-kind.ts
@@ -0,0 +1,15 @@
+export const ItemMediaKind = {
+ MusicArtist: 'MusicArtist',
+ Playlist: 'Playlist',
+ MusicGenre: 'MusicGenre',
+ Photo: 'Photo',
+ Audio: 'Audio',
+ Video: 'Video',
+ Book: 'Book',
+ Recording: 'Recording'
+} as const;
+
+// eslint-disable-next-line @typescript-eslint/no-redeclare
+export type ItemMediaKind = keyof typeof ItemMediaKind;
+
+export type ItemMediaType = ItemMediaKind | null | undefined;
diff --git a/src/types/cardOptions.ts b/src/types/cardOptions.ts
index cb4f49c0af..02d10f965f 100644
--- a/src/types/cardOptions.ts
+++ b/src/types/cardOptions.ts
@@ -1,10 +1,17 @@
-import type { BaseItemDto } from '@jellyfin/sdk/lib/generated-client';
-import { CollectionType } from '@jellyfin/sdk/lib/generated-client/models/collection-type';
+import type { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
+import type { ImageType } from '@jellyfin/sdk/lib/generated-client/models/image-type';
+import type { UserItemDataDto } from '@jellyfin/sdk/lib/generated-client/models/user-item-data-dto';
+import type { BaseItemDtoImageBlurHashes } from '@jellyfin/sdk/lib/generated-client/models/base-item-dto-image-blur-hashes';
+import type { CollectionType } from '@jellyfin/sdk/lib/generated-client/models/collection-type';
+import { CardShape } from 'utils/card';
+import type { NullableString } from './base/common/shared/types';
+import type { ItemDto } from './base/models/item-dto';
+import type { ParentId } from './library';
export interface CardOptions {
itemsContainer?: HTMLElement | null;
parentContainer?: HTMLElement | null;
- items?: BaseItemDto[] | null;
+ items?: ItemDto[] | null;
allowBottomPadding?: boolean;
centerText?: boolean;
coverImage?: boolean;
@@ -12,13 +19,16 @@ export interface CardOptions {
overlayMoreButton?: boolean;
overlayPlayButton?: boolean;
overlayText?: boolean;
+ imageBlurhashes?: BaseItemDtoImageBlurHashes | null;
+ preferBanner?: boolean;
preferThumb?: boolean | string | null;
preferDisc?: boolean;
preferLogo?: boolean;
scalable?: boolean;
- shape?: string | null;
+ shape?: CardShape;
+ defaultShape?: CardShape;
lazy?: boolean;
- cardLayout?: boolean | string;
+ cardLayout?: boolean | null;
showParentTitle?: boolean;
showParentTitleOrTitle?: boolean;
showAirTime?: boolean;
@@ -35,9 +45,8 @@ export interface CardOptions {
lines?: number;
context?: CollectionType;
action?: string | null;
- defaultShape?: string;
indexBy?: string;
- parentId?: string | null;
+ parentId?: ParentId;
showMenu?: boolean;
cardCssClass?: string | null;
cardClass?: string | null;
@@ -61,9 +70,10 @@ export interface CardOptions {
showSeriesTimerChannel?: boolean;
showSongCount?: boolean;
width?: number;
+ widths?: any;
showChannelLogo?: boolean;
showLogo?: boolean;
- serverId?: string;
+ serverId?: NullableString;
collectionId?: string | null;
playlistId?: string | null;
defaultCardImageIcon?: string;
@@ -72,4 +82,46 @@ export interface CardOptions {
showGroupCount?: boolean;
containerClass?: string;
noItemsMessage?: string;
+ showIndex?: boolean;
+ index?: string;
+ showIndexNumber?: boolean;
+ enableContentWrapper?: boolean;
+ enableOverview?: boolean;
+ enablePlayedButton?: boolean;
+ infoButton?: boolean;
+ imageSize?: string;
+ enableSideMediaInfo?: boolean;
+ imagePlayButton?: boolean;
+ border?: boolean;
+ highlight?: boolean;
+ smallIcon?: boolean;
+ artist?: boolean;
+ addToListButton?: boolean;
+ enableUserDataButtons?: boolean;
+ enableRatingButton?: boolean;
+ image?: boolean;
+ imageSource?: string;
+ showProgramDateTime?: boolean;
+ showChannel?: boolean;
+ mediaInfo?: boolean;
+ moreButton?: boolean;
+ recordButton?: boolean;
+ dragHandle?: boolean;
+ showProgramTime?: boolean;
+ parentTitleWithTitle?: boolean;
+ showIndexNumberLeft?: boolean;
+ sortBy?: string;
+ textLines?: (item: ItemDto) => (BaseItemKind | string | undefined)[];
+ userData?: UserItemDataDto;
+ rightButtons?: {
+ icon: string;
+ title: string;
+ id: string;
+ }[];
+ uiAspect?: number | null;
+ primaryImageAspectRatio?: number | null;
+ rows?: number | null;
+ imageType?: ImageType;
+ queryKey?: string[]
}
+
diff --git a/src/types/dataAttributes.ts b/src/types/dataAttributes.ts
new file mode 100644
index 0000000000..b9ae880f7a
--- /dev/null
+++ b/src/types/dataAttributes.ts
@@ -0,0 +1,49 @@
+import type { CollectionType } from '@jellyfin/sdk/lib/generated-client/models/collection-type';
+import type { UserItemDataDto } from '@jellyfin/sdk/lib/generated-client/models/user-item-data-dto';
+import type { NullableBoolean, NullableNumber, NullableString } from './base/common/shared/types';
+
+export type AttributesOpts = {
+ context?: CollectionType,
+ parentId?: NullableString,
+ collectionId?: NullableString,
+ playlistId?: NullableString,
+ prefix?: NullableString,
+ action?: NullableString,
+ itemServerId?: NullableString,
+ itemId?: NullableString,
+ itemTimerId?: NullableString,
+ itemSeriesTimerId?: NullableString,
+ itemChannelId?: NullableString,
+ itemPlaylistItemId?: NullableString,
+ itemType?: NullableString,
+ itemMediaType?: NullableString,
+ itemCollectionType?: NullableString,
+ itemIsFolder?: NullableBoolean,
+ itemPath?: NullableString,
+ itemStartDate?: NullableString,
+ itemEndDate?: NullableString,
+ itemUserData?: UserItemDataDto
+};
+
+export type DataAttributes = {
+ 'data-playlistitemid'?: NullableString;
+ 'data-timerid'?: NullableString;
+ 'data-seriestimerid'?: NullableString;
+ 'data-serverid'?: NullableString;
+ 'data-id'?: NullableString;
+ 'data-type'?: NullableString;
+ 'data-collectionid'?: NullableString;
+ 'data-playlistid'?: NullableString;
+ 'data-mediatype'?: NullableString;
+ 'data-channelid'?: NullableString;
+ 'data-path'?: NullableString;
+ 'data-collectiontype'?: NullableString;
+ 'data-context'?: NullableString;
+ 'data-parentid'?: NullableString;
+ 'data-startdate'?: NullableString;
+ 'data-enddate'?: NullableString;
+ 'data-prefix'?: NullableString;
+ 'data-action'?: NullableString;
+ 'data-positionticks'?: NullableNumber;
+ 'data-isfolder'?: NullableBoolean;
+};
diff --git a/src/types/libraryTabContent.ts b/src/types/libraryTabContent.ts
index 433744cd22..547d025134 100644
--- a/src/types/libraryTabContent.ts
+++ b/src/types/libraryTabContent.ts
@@ -1,7 +1,7 @@
-import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client';
-import { LibraryTab } from './libraryTab';
-import { CollectionType } from '@jellyfin/sdk/lib/generated-client/models/collection-type';
-import { SectionType } from './sections';
+import type { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
+import type { CollectionType } from '@jellyfin/sdk/lib/generated-client/models/collection-type';
+import type { LibraryTab } from './libraryTab';
+import type { SectionType } from './sections';
export interface SectionsView {
suggestionSections?: SectionType[];
diff --git a/src/types/listOptions.ts b/src/types/listOptions.ts
index 7df383a48b..e34999e758 100644
--- a/src/types/listOptions.ts
+++ b/src/types/listOptions.ts
@@ -1,9 +1,8 @@
-import { BaseItemDto, SeriesTimerInfoDto } from '@jellyfin/sdk/lib/generated-client';
import { ItemSortBy } from '@jellyfin/sdk/lib/models/api/item-sort-by';
-import { CollectionType } from '@jellyfin/sdk/lib/generated-client/models/collection-type';
-
+import type { CollectionType } from '@jellyfin/sdk/lib/generated-client/models/collection-type';
+import type { ItemDto } from './base/models/item-dto';
export interface ListOptions {
- items?: BaseItemDto[] | SeriesTimerInfoDto[] | null;
+ items?: ItemDto[] | null;
index?: string;
showIndex?: boolean;
action?: string | null;
diff --git a/src/types/mediaInfoItem.ts b/src/types/mediaInfoItem.ts
new file mode 100644
index 0000000000..3620fad620
--- /dev/null
+++ b/src/types/mediaInfoItem.ts
@@ -0,0 +1,4 @@
+export interface MiscInfo {
+ text?: string | number;
+ cssClass?: string;
+}
diff --git a/src/types/progressOptions.ts b/src/types/progressOptions.ts
new file mode 100644
index 0000000000..fd5ed7e468
--- /dev/null
+++ b/src/types/progressOptions.ts
@@ -0,0 +1,8 @@
+import type { UserItemDataDto } from '@jellyfin/sdk/lib/generated-client/models/user-item-data-dto';
+
+export interface ProgressOptions {
+ containerClass: string,
+ type?: string | null,
+ userData?: UserItemDataDto,
+ mediaType?: string
+}
diff --git a/src/utils/card.ts b/src/utils/card.ts
index bdb68e7243..950964054a 100644
--- a/src/utils/card.ts
+++ b/src/utils/card.ts
@@ -5,7 +5,15 @@ export enum CardShape {
Portrait = 'portrait',
PortraitOverflow = 'overflowPortrait',
Square = 'square',
- SquareOverflow = 'overflowSquare'
+ SquareOverflow = 'overflowSquare',
+ Auto = 'auto',
+ AutoHome = 'autohome',
+ AutoOverflow = 'autooverflow',
+ AutoVertical = 'autoVertical',
+ Mixed = 'mixed',
+ MixedSquare = 'mixedSquare',
+ MixedBackdrop = 'mixedBackdrop',
+ MixedPortrait = 'mixedPortrait',
}
export function getSquareShape(enableOverflow = true) {
diff --git a/src/utils/image.ts b/src/utils/image.ts
index 7420fad41c..dc32e87973 100644
--- a/src/utils/image.ts
+++ b/src/utils/image.ts
@@ -1,3 +1,4 @@
+import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
import type { DeviceInfo } from '@jellyfin/sdk/lib/generated-client/models/device-info';
import type { SessionInfo } from '@jellyfin/sdk/lib/generated-client/models/session-info';
@@ -103,7 +104,41 @@ export function getLibraryIcon(library: string | null | undefined) {
}
}
+export function getItemTypeIcon(itemType: BaseItemKind | string) {
+ switch (itemType) {
+ case BaseItemKind.MusicAlbum:
+ return 'album';
+ case BaseItemKind.MusicArtist:
+ case BaseItemKind.Person:
+ return 'person';
+ case BaseItemKind.Audio:
+ return 'audiotrack';
+ case BaseItemKind.Movie:
+ return 'movie';
+ case BaseItemKind.Episode:
+ case BaseItemKind.Series:
+ return 'tv';
+ case BaseItemKind.Program:
+ return 'live_tv';
+ case BaseItemKind.Book:
+ return 'book';
+ case BaseItemKind.Folder:
+ return 'folder';
+ case BaseItemKind.BoxSet:
+ return 'collections';
+ case BaseItemKind.Playlist:
+ return 'view_list';
+ case BaseItemKind.Photo:
+ return 'photo';
+ case BaseItemKind.PhotoAlbum:
+ return 'photo_album';
+ default:
+ return 'folder';
+ }
+}
+
export default {
getDeviceIcon,
- getLibraryIcon
+ getLibraryIcon,
+ getItemTypeIcon
};
diff --git a/src/utils/items.ts b/src/utils/items.ts
index 752226db26..6a5dcd0985 100644
--- a/src/utils/items.ts
+++ b/src/utils/items.ts
@@ -3,8 +3,10 @@ import { ImageType } from '@jellyfin/sdk/lib/generated-client/models/image-type'
import { ItemSortBy } from '@jellyfin/sdk/lib/models/api/item-sort-by';
import { SortOrder } from '@jellyfin/sdk/lib/generated-client/models/sort-order';
import * as userSettings from 'scripts/settings/userSettings';
+import layoutManager from 'components/layoutManager';
import { EpisodeFilter, FeatureFilters, LibraryViewSettings, ParentId, VideoBasicFilter, ViewMode } from '../types/library';
import { LibraryTab } from 'types/libraryTab';
+import type { AttributesOpts, DataAttributes } from 'types/dataAttributes';
export const getVideoBasicFilter = (libraryViewSettings: LibraryViewSettings) => {
let isHd;
@@ -164,3 +166,31 @@ export const getDefaultLibraryViewSettings = (viewType: LibraryTab): LibraryView
StartIndex: 0
};
};
+
+export function getDataAttributes(
+ opts: AttributesOpts
+): DataAttributes {
+ return {
+ 'data-context': opts.context,
+ 'data-collectionid': opts.collectionId,
+ 'data-playlistid': opts.playlistId,
+ 'data-parentid': opts.parentId,
+ 'data-playlistitemid': opts.itemPlaylistItemId,
+ 'data-action': layoutManager.tv ? opts.action : null,
+ 'data-serverid': opts.itemServerId,
+ 'data-id': opts.itemId,
+ 'data-timerid': opts.itemTimerId,
+ 'data-seriestimerid': opts.itemSeriesTimerId,
+ 'data-channelid': opts.itemChannelId,
+ 'data-type': opts.itemType,
+ 'data-mediatype': opts.itemMediaType,
+ 'data-collectiontype': opts.itemCollectionType,
+ 'data-isfolder': opts.itemIsFolder,
+ 'data-path': opts.itemPath,
+ 'data-prefix': opts.prefix,
+ 'data-positionticks': opts.itemUserData?.PlaybackPositionTicks,
+ 'data-startdate': opts.itemStartDate?.toString(),
+ 'data-enddate': opts.itemEndDate?.toString()
+ };
+}
+
diff --git a/src/utils/sections.ts b/src/utils/sections.ts
index 4617ea7f14..70c74b598e 100644
--- a/src/utils/sections.ts
+++ b/src/utils/sections.ts
@@ -1,9 +1,12 @@
-import { ImageType, ItemFields, ItemFilter } from '@jellyfin/sdk/lib/generated-client';
import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
+import { ItemFields } from '@jellyfin/sdk/lib/generated-client/models/item-fields';
+import { ItemFilter } from '@jellyfin/sdk/lib/generated-client/models/item-filter';
+import { ImageType } from '@jellyfin/sdk/lib/generated-client/models/image-type';
import { ItemSortBy } from '@jellyfin/sdk/lib/models/api/item-sort-by';
import { SortOrder } from '@jellyfin/sdk/lib/generated-client/models/sort-order';
import * as userSettings from 'scripts/settings/userSettings';
-import { Section, SectionType, SectionApiMethod } from 'types/sections';
+import { CardShape } from 'utils/card';
+import { type Section, SectionType, SectionApiMethod } from 'types/sections';
export const getSuggestionSections = (): Section[] => {
const parametersOptions = {
@@ -29,7 +32,7 @@ export const getSuggestionSections = (): Section[] => {
cardOptions: {
overlayPlayButton: true,
preferThumb: true,
- shape: 'overflowBackdrop',
+ shape: CardShape.BackdropOverflow,
showYear: true
}
},
@@ -43,7 +46,7 @@ export const getSuggestionSections = (): Section[] => {
},
cardOptions: {
overlayPlayButton: true,
- shape: 'overflowPortrait',
+ shape: CardShape.PortraitOverflow,
showYear: true
}
},
@@ -57,7 +60,7 @@ export const getSuggestionSections = (): Section[] => {
},
cardOptions: {
overlayPlayButton: true,
- shape: 'overflowBackdrop',
+ shape: CardShape.BackdropOverflow,
preferThumb: true,
inheritThumb:
!userSettings.useEpisodeImagesInNextUpAndResume(undefined),
@@ -74,7 +77,7 @@ export const getSuggestionSections = (): Section[] => {
},
cardOptions: {
overlayPlayButton: true,
- shape: 'overflowBackdrop',
+ shape: CardShape.BackdropOverflow,
preferThumb: true,
showSeriesYear: true,
showParentTitle: true,
@@ -90,7 +93,7 @@ export const getSuggestionSections = (): Section[] => {
type: SectionType.NextUp,
cardOptions: {
overlayPlayButton: true,
- shape: 'overflowBackdrop',
+ shape: CardShape.BackdropOverflow,
preferThumb: true,
inheritThumb:
!userSettings.useEpisodeImagesInNextUpAndResume(undefined),
@@ -107,7 +110,7 @@ export const getSuggestionSections = (): Section[] => {
},
cardOptions: {
showUnplayedIndicator: false,
- shape: 'overflowSquare',
+ shape: CardShape.SquareOverflow,
showParentTitle: true,
overlayPlayButton: true,
coverImage: true
@@ -125,7 +128,7 @@ export const getSuggestionSections = (): Section[] => {
},
cardOptions: {
showUnplayedIndicator: false,
- shape: 'overflowSquare',
+ shape: CardShape.SquareOverflow,
showParentTitle: true,
action: 'instantmix',
overlayMoreButton: true,
@@ -144,7 +147,7 @@ export const getSuggestionSections = (): Section[] => {
},
cardOptions: {
showUnplayedIndicator: false,
- shape: 'overflowSquare',
+ shape: CardShape.SquareOverflow,
showParentTitle: true,
action: 'instantmix',
overlayMoreButton: true,
@@ -157,8 +160,8 @@ export const getSuggestionSections = (): Section[] => {
export const getProgramSections = (): Section[] => {
const cardOptions = {
inheritThumb: false,
- shape: 'autooverflow',
- defaultShape: 'overflowBackdrop',
+ shape: CardShape.AutoOverflow,
+ defaultShape: CardShape.BackdropOverflow,
centerText: true,
coverImage: true,
overlayText: false,
@@ -309,8 +312,8 @@ export const getProgramSections = (): Section[] => {
cardOptions: {
showYear: true,
lines: 2,
- shape: 'autooverflow',
- defaultShape: 'overflowBackdrop',
+ shape: CardShape.AutoOverflow,
+ defaultShape: CardShape.BackdropOverflow,
showTitle: true,
showParentTitle: true,
coverImage: true,
@@ -328,8 +331,8 @@ export const getProgramSections = (): Section[] => {
cardOptions: {
showYear: false,
showParentTitle: false,
- shape: 'autooverflow',
- defaultShape: 'overflowBackdrop',
+ shape: CardShape.AutoOverflow,
+ defaultShape: CardShape.BackdropOverflow,
showTitle: true,
coverImage: true,
cardLayout: false,
@@ -347,8 +350,8 @@ export const getProgramSections = (): Section[] => {
isInProgress: true
},
cardOptions: {
- shape: 'autooverflow',
- defaultShape: 'backdrop',
+ shape: CardShape.AutoOverflow,
+ defaultShape: CardShape.Backdrop,
showParentTitle: false,
showParentTitleOrTitle: true,
showTitle: true,
diff --git a/webpack.common.js b/webpack.common.js
index 5c14b300c0..fef8db8a67 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -204,6 +204,8 @@ const config = {
path.resolve(__dirname, 'node_modules/markdown-it'),
path.resolve(__dirname, 'node_modules/mdurl'),
path.resolve(__dirname, 'node_modules/punycode'),
+ path.resolve(__dirname, 'node_modules/react-blurhash'),
+ path.resolve(__dirname, 'node_modules/react-lazy-load-image-component'),
path.resolve(__dirname, 'node_modules/react-router'),
path.resolve(__dirname, 'node_modules/screenfull'),
path.resolve(__dirname, 'node_modules/ssr-window'),