From 524ede412b1fd1d7c9b1ee89274c11ce4225c30a Mon Sep 17 00:00:00 2001 From: gnattu Date: Sun, 4 Aug 2024 12:54:39 +0800 Subject: [PATCH] Add non-standard multi-value audio tag support --- .../libraryoptionseditor.js | 11 ++++++++ .../libraryoptionseditor.template.html | 26 +++++++++++++++++++ src/strings/en-us.json | 4 +++ 3 files changed, 41 insertions(+) diff --git a/src/components/libraryoptionseditor/libraryoptionseditor.js b/src/components/libraryoptionseditor/libraryoptionseditor.js index de70c1c1a9..73784097d9 100644 --- a/src/components/libraryoptionseditor/libraryoptionseditor.js +++ b/src/components/libraryoptionseditor/libraryoptionseditor.js @@ -12,6 +12,7 @@ import dom from '../../scripts/dom'; import '../../elements/emby-checkbox/emby-checkbox'; import '../../elements/emby-select/emby-select'; import '../../elements/emby-input/emby-input'; +import '../../elements/emby-textarea/emby-textarea'; import './style.scss'; import template from './libraryoptionseditor.template.html'; @@ -439,8 +440,10 @@ export function setContentType(parent, contentType) { if (contentType === 'music') { parent.querySelector('.lyricSettingsSection').classList.remove('hide'); + parent.querySelector('.audioTagSettingsSection').classList.remove('hide'); } else { parent.querySelector('.lyricSettingsSection').classList.add('hide'); + parent.querySelector('.audioTagSettingsSection').classList.add('hide'); } parent.querySelector('.chkAutomaticallyAddToCollectionContainer').classList.toggle('hide', contentType !== 'movies' && contentType !== 'mixed'); @@ -550,6 +553,8 @@ export function getLibraryOptions(parent) { SaveLyricsWithMedia: parent.querySelector('#chkSaveLyricsLocally').checked, RequirePerfectSubtitleMatch: parent.querySelector('#chkRequirePerfectMatch').checked, AutomaticallyAddToCollection: parent.querySelector('#chkAutomaticallyAddToCollection').checked, + PreferNonstandardArtistsTag: parent.querySelector('#chkPreferNonstandardArtistsTag').checked, + UseCustomTagDelimiters: parent.querySelector('#chkUseCustomTagDelimiters').checked, MetadataSavers: Array.prototype.map.call(Array.prototype.filter.call(parent.querySelectorAll('.chkMetadataSaver'), elem => { return elem.checked; }), elem => { @@ -566,6 +571,8 @@ export function getLibraryOptions(parent) { }), elem => { return elem.getAttribute('data-lang'); }); + options.CustomTagDelimiters = parent.querySelector('#customTagDelimitersInput').value.split(''); + options.DelimiterWhitelist = parent.querySelector('#tagDelimiterWhitelist').value.split('\n'); setSubtitleFetchersIntoOptions(parent, options); setMetadataFetchersIntoOptions(parent, options); setImageFetchersIntoOptions(parent, options); @@ -612,12 +619,16 @@ export function setLibraryOptions(parent, options) { parent.querySelector('#chkSkipIfAudioTrackPresent').checked = options.SkipSubtitlesIfAudioTrackMatches; parent.querySelector('#chkRequirePerfectMatch').checked = options.RequirePerfectSubtitleMatch; parent.querySelector('#chkAutomaticallyAddToCollection').checked = options.AutomaticallyAddToCollection; + parent.querySelector('#chkPreferNonstandardArtistsTag').checked = options.PreferNonstandardArtistsTag; + parent.querySelector('#chkUseCustomTagDelimiters').checked = options.UseCustomTagDelimiters; Array.prototype.forEach.call(parent.querySelectorAll('.chkMetadataSaver'), elem => { elem.checked = options.MetadataSavers ? options.MetadataSavers.includes(elem.getAttribute('data-pluginname')) : elem.getAttribute('data-defaultenabled') === 'true'; }); Array.prototype.forEach.call(parent.querySelectorAll('.chkSubtitleLanguage'), elem => { elem.checked = !!options.SubtitleDownloadLanguages && options.SubtitleDownloadLanguages.includes(elem.getAttribute('data-lang')); }); + parent.querySelector('#customTagDelimitersInput').value = options.CustomTagDelimiters.join(''); + parent.querySelector('#tagDelimiterWhitelist').value = options.DelimiterWhitelist.join('\n').filter(item => item.trim()); renderMetadataReaders(parent, getOrderedPlugins(parent.availableOptions.MetadataReaders, options.LocalMetadataReaderOrder || [])); renderMetadataFetchers(parent, parent.availableOptions, options); renderImageFetchers(parent, parent.availableOptions, options); diff --git a/src/components/libraryoptionseditor/libraryoptionseditor.template.html b/src/components/libraryoptionseditor/libraryoptionseditor.template.html index b1d358cc02..28c711cbd3 100644 --- a/src/components/libraryoptionseditor/libraryoptionseditor.template.html +++ b/src/components/libraryoptionseditor/libraryoptionseditor.template.html @@ -205,3 +205,29 @@
${SaveLyricsIntoMediaFoldersHelp}
+ +
+

Audio Tag settings

+
+ +
${PreferNonstandardArtistsTagHelp}
+
+
+ +
${UseCustomTagDelimitersHelp}
+
+
+ +
${LabelcustomTagDelimitersHelp}
+
+
+ +
${LabelDelimiterWhitelistHelp}
+
+
diff --git a/src/strings/en-us.json b/src/strings/en-us.json index 12023468eb..b45c9e6351 100644 --- a/src/strings/en-us.json +++ b/src/strings/en-us.json @@ -615,6 +615,7 @@ "LabelCustomCssHelp": "Apply your custom CSS code for theming/branding on the web interface.", "LabelCustomDeviceDisplayNameHelp": "Supply a custom display name or leave empty to use the name reported by the device.", "LabelCustomRating": "Custom rating", + "LabelcustomTagDelimitersHelp": "Characters to be treated as delimiters to separate tags.", "LabelDashboardTheme": "Server Dashboard theme", "LabelDate": "Date", "LabelDateAdded": "Date added", @@ -625,6 +626,7 @@ "LabelDeathDate": "Death date", "LabelDefaultScreen": "Default screen", "LabelDeinterlaceMethod": "Deinterlacing method", + "LabelDelimiterWhitelistHelp": "Items to be excluded from tag splitting. One item per line.", "LabelDeveloper": "Developer", "LabelDisableCustomCss": "Disable custom CSS code for theming/branding provided from the server.", "LabelDiscNumber": "Disc number", @@ -1301,6 +1303,7 @@ "PreferEmbeddedExtrasTitlesOverFileNamesHelp": "Extras often have the same embedded name as the parent, check this to use embedded titles for them anyway.", "PreferEmbeddedTitlesOverFileNames": "Prefer embedded titles over filenames", "PreferEmbeddedTitlesOverFileNamesHelp": "Determine the display title to use when no internet metadata or local metadata is available.", + "PreferNonstandardArtistsTagHelp": "Use the non-standard ARTISTS tag instead of ARTIST tag when available.", "AllowEmbeddedSubtitles": "Disable different types of embedded subtitles", "AllowEmbeddedSubtitlesHelp": "Disable subtitles that are packaged within media containers. Requires a full library refresh.", "AllowEmbeddedSubtitlesAllowAllOption": "Allow All", @@ -1529,6 +1532,7 @@ "UnsupportedPlayback": "Jellyfin cannot decrypt content protected by DRM but all content will be tried regardless, including protected titles. Some files may appear completely black due to encryption or other unsupported features, such as interactive titles.", "Up": "Up", "Upload": "Upload", + "UseCustomTagDelimitersHelp": "Split artist/genre tags with custom characters.", "UseDoubleRateDeinterlacing": "Double the frame rate when deinterlacing", "UseDoubleRateDeinterlacingHelp": "This setting uses the field rate when deinterlacing, often referred to as bob deinterlacing, which doubles the frame rate of the video to provide full motion like what you would see when viewing interlaced video on a TV.", "UseEpisodeImagesInNextUp": "Use episode images in 'Next Up' and 'Continue Watching' sections",