Merge branch 'master' into fix-some-of-the-code-smells

src/components/itemContextMenu.js

@@ -109,7 +109,7 @@ export function getCommands(options) {
             });
         }
 
-        if (itemHelper.supportsAddingToCollection(item) && options.EnableCollectionManagement) {
+        if (itemHelper.supportsAddingToCollection(item) && (user.Policy.IsAdministrator || user.Policy.EnableCollectionManagement)) {
             commands.push({
                 name: globalize.translate('AddToCollection'),
                 id: 'addtocollection',

src/components/libraryoptionseditor/libraryoptionseditor.js

@@ -416,6 +416,8 @@ export function setContentType(parent, contentType) {
         }
     }
 
+    parent.querySelector('.chkEnableLUFSScan').classList.toggle('hide', contentType !== 'music');
+
     if (contentType === 'tvshows') {
         parent.querySelector('.chkEnableEmbeddedEpisodeInfosContainer').classList.remove('hide');
     } else {
@@ -512,6 +514,7 @@ export function getLibraryOptions(parent) {
         EnableArchiveMediaFiles: false,
         EnablePhotos: parent.querySelector('.chkEnablePhotos').checked,
         EnableRealtimeMonitor: parent.querySelector('.chkEnableRealtimeMonitor').checked,
+        EnableLUFSScan: parent.querySelector('.chkEnableLUFSScan').checked,
         ExtractChapterImagesDuringLibraryScan: parent.querySelector('.chkExtractChaptersDuringLibraryScan').checked,
         EnableChapterImageExtraction: parent.querySelector('.chkExtractChapterImages').checked,
         EnableInternetProviders: true,
@@ -573,6 +576,7 @@ export function setLibraryOptions(parent, options) {
     parent.querySelector('#txtSeasonZeroName').value = options.SeasonZeroDisplayName || 'Specials';
     parent.querySelector('.chkEnablePhotos').checked = options.EnablePhotos;
     parent.querySelector('.chkEnableRealtimeMonitor').checked = options.EnableRealtimeMonitor;
+    parent.querySelector('.chkEnableLUFSScan').checked = options.EnableLUFSScan;
     parent.querySelector('.chkExtractChaptersDuringLibraryScan').checked = options.ExtractChapterImagesDuringLibraryScan;
     parent.querySelector('.chkExtractChapterImages').checked = options.EnableChapterImageExtraction;
     parent.querySelector('#chkSaveLocal').checked = options.SaveLocalMetadata;

src/components/libraryoptionseditor/libraryoptionseditor.template.html

@@ -55,6 +55,14 @@
     <div class="fieldDescription checkboxFieldDescription">${LabelEnableRealtimeMonitorHelp}</div>
 </div>
 
+<div class="checkboxContainer checkboxContainer-withDescription advanced">
+    <label>
+        <input type="checkbox" is="emby-checkbox" class="chkEnableLUFSScan" checked />
+        <span>${LabelEnableLUFSScan}</span>
+    </label>
+    <div class="fieldDescription checkboxFieldDescription">${LabelEnableLUFSScanHelp}</div>
+</div>
+
 <div class="checkboxContainer checkboxContainer-withDescription chkAutomaticallyAddToCollectionContainer hide advanced">
     <label>
         <input is="emby-checkbox" type="checkbox" id="chkAutomaticallyAddToCollection" />

src/components/playback/displayMirrorManager.ts

@@ -0,0 +1,38 @@
+import type { BaseItemDto } from '@jellyfin/sdk/lib/generated-client';
+
+import { playbackManager } from './playbackmanager';
+
+interface PlaybackInfo {
+    item: BaseItemDto;
+    context?: string;
+}
+
+function mirrorItem(info: PlaybackInfo, player?: unknown) {
+    const { item } = info;
+
+    playbackManager.displayContent({
+        ItemName: item.Name,
+        ItemId: item.Id,
+        ItemType: item.Type,
+        Context: info.context
+    }, player);
+}
+
+function mirrorIfEnabled(info: PlaybackInfo) {
+    if (info && playbackManager.enableDisplayMirroring()) {
+        const playerInfo = playbackManager.getPlayerInfo();
+
+        if (playerInfo && !playerInfo.isLocalPlayer && playerInfo.supportedCommands.indexOf('DisplayContent') !== -1) {
+            mirrorItem(info, playbackManager.getCurrentPlayer());
+        }
+    }
+}
+
+document.addEventListener('viewshow', e => {
+    const state = e.detail.state || {};
+    const { item } = state;
+
+    if (item?.ServerId) {
+        mirrorIfEnabled({ item });
+    }
+});

src/components/playback/playerSelectionMenu.js

@@ -1,4 +1,3 @@
-import appSettings from '../../scripts/settings/appSettings';
 import Events from '../../utils/events.ts';
 import browser from '../../scripts/browser';
 import loading from '../loading/loading';
@@ -13,32 +12,6 @@ import '../../elements/emby-button/emby-button';
 import dialog from '../dialog/dialog';
 import dialogHelper from '../dialogHelper/dialogHelper';
 
-function mirrorItem(info, player) {
-    const item = info.item;
-
-    playbackManager.displayContent({
-
-        ItemName: item.Name,
-        ItemId: item.Id,
-        ItemType: item.Type,
-        Context: info.context
-    }, player);
-}
-
-function mirrorIfEnabled(info) {
-    if (info && playbackManager.enableDisplayMirroring()) {
-        const getPlayerInfo = playbackManager.getPlayerInfo();
-
-        if (getPlayerInfo && !getPlayerInfo.isLocalPlayer && getPlayerInfo.supportedCommands.indexOf('DisplayContent') !== -1) {
-            mirrorItem(info, playbackManager.getCurrentPlayer());
-        }
-    }
-}
-
-function emptyCallback() {
-    // avoid console logs about uncaught promises
-}
-
 function getTargetSecondaryText(target) {
     if (target.user) {
         return target.user.Name;
@@ -140,10 +113,14 @@ export function show(button) {
                 })[0];
 
                 playbackManager.trySetActivePlayer(target.playerName, target);
-
-                mirrorIfEnabled();
-            }, emptyCallback);
+            }).catch(() => {
+                // action sheet closed
+            });
+        }).catch(err => {
+            console.error('[playerSelectionMenu] failed to import action sheet', err);
         });
+    }).catch(err => {
+        console.error('[playerSelectionMenu] failed to get playback targets', err);
     });
 }
 
@@ -180,6 +157,8 @@ function disconnectFromPlayer(currentDeviceName) {
                 default:
                     break;
             }
+        }).catch(() => {
+            // dialog closed
         });
     } else {
         playbackManager.setDefaultPlayerActive();
@@ -272,11 +251,13 @@ function showActivePlayerMenuInternal(playerInfo) {
 
     dialogHelper.open(dlg).then(function () {
         if (destination === 'nowplaying') {
-            appRouter.showNowPlaying();
+            return appRouter.showNowPlaying();
         } else if (destination === 'disconnectFromPlayer') {
             disconnectFromPlayer(currentDeviceName);
         }
-    }, emptyCallback);
+    }).catch(() => {
+        // dialog closed
+    });
 }
 
 function onMirrorChange() {
@@ -287,23 +268,6 @@ function onAutoCastChange() {
     enable(this.checked);
 }
 
-document.addEventListener('viewshow', function (e) {
-    const state = e.detail.state || {};
-    const item = state.item;
-
-    if (item && item.ServerId) {
-        mirrorIfEnabled({
-            item: item
-        });
-    }
-});
-
-Events.on(appSettings, 'change', function (e, name) {
-    if (name === 'displaymirror') {
-        mirrorIfEnabled();
-    }
-});
-
 Events.on(playbackManager, 'pairing', function () {
     loading.show();
 });

src/components/playbackSettings/playbackSettings.js

@@ -173,6 +173,7 @@ function loadForm(context, user, userSettings, apiClient) {
     context.querySelector('.chkPlayDefaultAudioTrack').checked = user.Configuration.PlayDefaultAudioTrack || false;
     context.querySelector('.chkPreferFmp4HlsContainer').checked = userSettings.preferFmp4HlsContainer();
     context.querySelector('.chkEnableCinemaMode').checked = userSettings.enableCinemaMode();
+    context.querySelector('.chkEnableAudioNormalization').checked = userSettings.enableAudioNormalization();
     context.querySelector('.chkEnableNextVideoOverlay').checked = userSettings.enableNextVideoInfoOverlay();
     context.querySelector('.chkRememberAudioSelections').checked = user.Configuration.RememberAudioSelections || false;
     context.querySelector('.chkRememberSubtitleSelections').checked = user.Configuration.RememberSubtitleSelections || false;
@@ -217,7 +218,7 @@ function saveUser(context, user, userSettingsInstance, apiClient) {
     user.Configuration.EnableNextEpisodeAutoPlay = context.querySelector('.chkEpisodeAutoPlay').checked;
     userSettingsInstance.preferFmp4HlsContainer(context.querySelector('.chkPreferFmp4HlsContainer').checked);
     userSettingsInstance.enableCinemaMode(context.querySelector('.chkEnableCinemaMode').checked);
-
+    userSettingsInstance.enableAudioNormalization(context.querySelector('.chkEnableAudioNormalization').checked);
     userSettingsInstance.enableNextVideoInfoOverlay(context.querySelector('.chkEnableNextVideoOverlay').checked);
     user.Configuration.RememberAudioSelections = context.querySelector('.chkRememberAudioSelections').checked;
     user.Configuration.RememberSubtitleSelections = context.querySelector('.chkRememberSubtitleSelections').checked;

src/components/playbackSettings/playbackSettings.template.html

@@ -72,6 +72,14 @@
             ${TabAdvanced}
         </h2>
 
+        <div class="checkboxContainer checkboxContainer-withDescription">
+            <label>
+                <input type="checkbox" is="emby-checkbox" class="chkEnableAudioNormalization" />
+                <span>${EnableAudioNormalization}</span>
+            </label>
+            <div class="fieldDescription checkboxFieldDescription">${EnableAudioNormalizationHelp}</div>
+        </div>
+
         <div class="checkboxContainer checkboxContainer-withDescription">
             <label>
                 <input type="checkbox" is="emby-checkbox" class="chkPreferFmp4HlsContainer" />
@@ -102,7 +110,7 @@
             </label>
             <div class="fieldDescription checkboxFieldDescription">${RememberAudioSelectionsHelp}</div>
         </div>
-        
+
         <div class="checkboxContainer checkboxContainer-withDescription">
             <label>
                 <input type="checkbox" is="emby-checkbox" class="chkRememberSubtitleSelections" />