From 2682fe2067b3443f2b7a167bba04eb8f5fc16503 Mon Sep 17 00:00:00 2001
From: Joe Rogers <1337joe@gmail.com>
Date: Tue, 17 May 2022 23:01:20 +0200
Subject: [PATCH 1/3] Add option to allow extras to use embedded titles

---
 .../libraryoptionseditor.js                   | 19 +++++++++++++++++++
 .../libraryoptionseditor.template.html        |  7 +++++++
 src/strings/en-us.json                        |  2 ++
 3 files changed, 28 insertions(+)

diff --git a/src/components/libraryoptionseditor/libraryoptionseditor.js b/src/components/libraryoptionseditor/libraryoptionseditor.js
index 522ee3058b..1991e0f198 100644
--- a/src/components/libraryoptionseditor/libraryoptionseditor.js
+++ b/src/components/libraryoptionseditor/libraryoptionseditor.js
@@ -366,6 +366,14 @@ import template from './libraryoptionseditor.template.html';
         parent.querySelector('.subtitleFetchers').addEventListener('click', onSortableContainerClick);
         parent.querySelector('.metadataFetchers').addEventListener('click', onSortableContainerClick);
         parent.querySelector('.imageFetchers').addEventListener('click', onImageFetchersContainerClick);
+
+        parent.querySelector('#chkEnableEmbeddedTitles').addEventListener('change', (e) => {
+            if (e.currentTarget.checked) {
+                parent.querySelector('.chkEnableEmbeddedExtrasTitlesContainer').classList.remove('hide');
+            } else {
+                parent.querySelector('.chkEnableEmbeddedExtrasTitlesContainer').classList.add('hide');
+            }
+        });
     }
 
     export async function embed(parent, contentType, libraryOptions) {
@@ -412,8 +420,12 @@ import template from './libraryoptionseditor.template.html';
 
         if (contentType === 'books' || contentType === 'boxsets' || contentType === 'playlists' || contentType === 'music') {
             parent.querySelector('.chkEnableEmbeddedTitlesContainer').classList.add('hide');
+            parent.querySelector('.chkEnableEmbeddedExtrasTitlesContainer').classList.add('hide');
         } else {
             parent.querySelector('.chkEnableEmbeddedTitlesContainer').classList.remove('hide');
+            if (parent.querySelector('#chkEnableEmbeddedTitles').checked) {
+                parent.querySelector('.chkEnableEmbeddedExtrasTitlesContainer').classList.remove('hide');
+            }
         }
 
         if (contentType === 'tvshows') {
@@ -525,6 +537,7 @@ import template from './libraryoptionseditor.template.html';
             SeasonZeroDisplayName: parent.querySelector('#txtSeasonZeroName').value,
             AutomaticRefreshIntervalDays: parseInt(parent.querySelector('#selectAutoRefreshInterval').value),
             EnableEmbeddedTitles: parent.querySelector('#chkEnableEmbeddedTitles').checked,
+            EnableEmbeddedExtrasTitles: parent.querySelector('#chkEnableEmbeddedExtrasTitles').checked,
             EnableEmbeddedEpisodeInfos: parent.querySelector('#chkEnableEmbeddedEpisodeInfos').checked,
             AllowEmbeddedSubtitles: parent.querySelector('#selectAllowEmbeddedSubtitles').value,
             SkipSubtitlesIfEmbeddedSubtitlesPresent: parent.querySelector('#chkSkipIfGraphicalSubsPresent').checked,
@@ -580,6 +593,12 @@ import template from './libraryoptionseditor.template.html';
         parent.querySelector('#chkSaveLocal').checked = options.SaveLocalMetadata;
         parent.querySelector('.chkAutomaticallyGroupSeries').checked = options.EnableAutomaticSeriesGrouping;
         parent.querySelector('#chkEnableEmbeddedTitles').checked = options.EnableEmbeddedTitles;
+        if (options.EnableEmbeddedTitles) {
+            parent.querySelector('.chkEnableEmbeddedExtrasTitlesContainer').classList.remove('hide');
+        } else {
+            parent.querySelector('.chkEnableEmbeddedExtrasTitlesContainer').classList.add('hide');
+        }
+        parent.querySelector('#chkEnableEmbeddedExtrasTitles').checked = options.EnableEmbeddedExtrasTitles;
         parent.querySelector('#chkEnableEmbeddedEpisodeInfos').value = options.EnableEmbeddedEpisodeInfos;
         parent.querySelector('#selectAllowEmbeddedSubtitles').value = options.AllowEmbeddedSubtitles;
         parent.querySelector('#chkSkipIfGraphicalSubsPresent').checked = options.SkipSubtitlesIfEmbeddedSubtitlesPresent;
diff --git a/src/components/libraryoptionseditor/libraryoptionseditor.template.html b/src/components/libraryoptionseditor/libraryoptionseditor.template.html
index 5fc0742177..fbaad6e2d4 100644
--- a/src/components/libraryoptionseditor/libraryoptionseditor.template.html
+++ b/src/components/libraryoptionseditor/libraryoptionseditor.template.html
@@ -23,6 +23,13 @@
     </label>
     <div class="fieldDescription checkboxFieldDescription">${PreferEmbeddedTitlesOverFileNamesHelp}</div>
 </div>
+<div class="checkboxContainer checkboxContainer-withDescription chkEnableEmbeddedExtrasTitlesContainer hide advanced">
+    <label>
+        <input is="emby-checkbox" type="checkbox" id="chkEnableEmbeddedExtrasTitles" />
+        <span>${PreferEmbeddedExtrasTitlesOverFileNames}</span>
+    </label>
+    <div class="fieldDescription checkboxFieldDescription">${PreferEmbeddedExtrasTitlesOverFileNamesHelp}</div>
+</div>
 <div class="checkboxContainer checkboxContainer-withDescription chkEnableEmbeddedEpisodeInfosContainer hide advanced">
     <label>
         <input is="emby-checkbox" type="checkbox" id="chkEnableEmbeddedEpisodeInfos" />
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index dc2f9e466c..ac0ce98a6d 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -1313,6 +1313,8 @@
     "PosterCard": "Poster Card",
     "PreferEmbeddedEpisodeInfosOverFileNames": "Prefer embedded episode information over filenames",
     "PreferEmbeddedEpisodeInfosOverFileNamesHelp": "Use the episode information from the embedded metadata if available.",
+    "PreferEmbeddedExtrasTitlesOverFileNames": "Prefer embedded titles over filenames for extras",
+    "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.",
     "AllowEmbeddedSubtitles": "Disable different types of embedded subtitles",

From 16e51aa3196b4ddda6d4d2681913bcb626c0989c Mon Sep 17 00:00:00 2001
From: Joe Rogers <1337joe@users.noreply.github.com>
Date: Fri, 10 Feb 2023 22:34:20 -0500
Subject: [PATCH 2/3] Convert if/else add/remove statements to toggle

Co-authored-by: Bill Thornton <thornbill@users.noreply.github.com>
---
 .../libraryoptionseditor/libraryoptionseditor.js     | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/components/libraryoptionseditor/libraryoptionseditor.js b/src/components/libraryoptionseditor/libraryoptionseditor.js
index 1991e0f198..877b781a25 100644
--- a/src/components/libraryoptionseditor/libraryoptionseditor.js
+++ b/src/components/libraryoptionseditor/libraryoptionseditor.js
@@ -368,11 +368,7 @@ import template from './libraryoptionseditor.template.html';
         parent.querySelector('.imageFetchers').addEventListener('click', onImageFetchersContainerClick);
 
         parent.querySelector('#chkEnableEmbeddedTitles').addEventListener('change', (e) => {
-            if (e.currentTarget.checked) {
-                parent.querySelector('.chkEnableEmbeddedExtrasTitlesContainer').classList.remove('hide');
-            } else {
-                parent.querySelector('.chkEnableEmbeddedExtrasTitlesContainer').classList.add('hide');
-            }
+            parent.querySelector('.chkEnableEmbeddedExtrasTitlesContainer').classList.toggle('hide', !e.currentTarget.checked);
         });
     }
 
@@ -593,11 +589,7 @@ import template from './libraryoptionseditor.template.html';
         parent.querySelector('#chkSaveLocal').checked = options.SaveLocalMetadata;
         parent.querySelector('.chkAutomaticallyGroupSeries').checked = options.EnableAutomaticSeriesGrouping;
         parent.querySelector('#chkEnableEmbeddedTitles').checked = options.EnableEmbeddedTitles;
-        if (options.EnableEmbeddedTitles) {
-            parent.querySelector('.chkEnableEmbeddedExtrasTitlesContainer').classList.remove('hide');
-        } else {
-            parent.querySelector('.chkEnableEmbeddedExtrasTitlesContainer').classList.add('hide');
-        }
+    parent.querySelector('.chkEnableEmbeddedExtrasTitlesContainer').classList.toggle('hide', !options.EnableEmbeddedTitles);
         parent.querySelector('#chkEnableEmbeddedExtrasTitles').checked = options.EnableEmbeddedExtrasTitles;
         parent.querySelector('#chkEnableEmbeddedEpisodeInfos').value = options.EnableEmbeddedEpisodeInfos;
         parent.querySelector('#selectAllowEmbeddedSubtitles').value = options.AllowEmbeddedSubtitles;

From 0c583b5b10e17d0d4908f3075c52a3042b765db6 Mon Sep 17 00:00:00 2001
From: Joe Rogers <1337joe@gmail.com>
Date: Sat, 11 Feb 2023 11:29:38 -0500
Subject: [PATCH 3/3] Fix indentation

---
 src/components/libraryoptionseditor/libraryoptionseditor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/libraryoptionseditor/libraryoptionseditor.js b/src/components/libraryoptionseditor/libraryoptionseditor.js
index 877b781a25..2272aac93b 100644
--- a/src/components/libraryoptionseditor/libraryoptionseditor.js
+++ b/src/components/libraryoptionseditor/libraryoptionseditor.js
@@ -589,7 +589,7 @@ import template from './libraryoptionseditor.template.html';
         parent.querySelector('#chkSaveLocal').checked = options.SaveLocalMetadata;
         parent.querySelector('.chkAutomaticallyGroupSeries').checked = options.EnableAutomaticSeriesGrouping;
         parent.querySelector('#chkEnableEmbeddedTitles').checked = options.EnableEmbeddedTitles;
-    parent.querySelector('.chkEnableEmbeddedExtrasTitlesContainer').classList.toggle('hide', !options.EnableEmbeddedTitles);
+        parent.querySelector('.chkEnableEmbeddedExtrasTitlesContainer').classList.toggle('hide', !options.EnableEmbeddedTitles);
         parent.querySelector('#chkEnableEmbeddedExtrasTitles').checked = options.EnableEmbeddedExtrasTitles;
         parent.querySelector('#chkEnableEmbeddedEpisodeInfos').value = options.EnableEmbeddedEpisodeInfos;
         parent.querySelector('#selectAllowEmbeddedSubtitles').value = options.AllowEmbeddedSubtitles;