From 14dc03ab7d909f4a2b49e1687b204c4909ac177c Mon Sep 17 00:00:00 2001 From: Bill Thornton Date: Sat, 12 Dec 2020 00:42:11 -0500 Subject: [PATCH 1/3] Add lint rule for array callback returns --- .eslintrc.js | 1 + 1 file changed, 1 insertion(+) diff --git a/.eslintrc.js b/.eslintrc.js index 400c528a48..d45cc5dd05 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -29,6 +29,7 @@ module.exports = { 'plugin:compat/recommended' ], rules: { + 'array-callback-return': ['error'], 'block-spacing': ['error'], 'brace-style': ['error', '1tbs', { 'allowSingleLine': true }], 'comma-dangle': ['error', 'never'], From 310e8b713f0f2f5aa20429b286c035949669e297 Mon Sep 17 00:00:00 2001 From: Bill Thornton Date: Sat, 12 Dec 2020 00:57:26 -0500 Subject: [PATCH 2/3] Fix invalid uses of Array.map --- src/components/multiSelect/multiSelect.js | 4 +--- src/components/playback/playbackmanager.js | 8 ++++---- src/plugins/sessionPlayer/plugin.js | 2 +- src/scripts/shell.js | 4 +--- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/components/multiSelect/multiSelect.js b/src/components/multiSelect/multiSelect.js index 8cfc838d09..d552a9f1b2 100644 --- a/src/components/multiSelect/multiSelect.js +++ b/src/components/multiSelect/multiSelect.js @@ -157,9 +157,7 @@ import confirm from '../confirm/confirm'; } confirm(msg, title).then(() => { - const promises = itemIds.map(itemId => { - apiClient.deleteItem(itemId); - }); + const promises = itemIds.map(itemId => apiClient.deleteItem(itemId)); Promise.all(promises).then(resolve, () => { alertText(globalize.translate('ErrorDeletingItem')).then(reject, reject); diff --git a/src/components/playback/playbackmanager.js b/src/components/playback/playbackmanager.js index 6d9aebdacb..e43a2c8f50 100644 --- a/src/components/playback/playbackmanager.js +++ b/src/components/playback/playbackmanager.js @@ -283,9 +283,9 @@ function getAudioMaxValues(deviceProfile) { let maxAudioBitDepth = null; let maxAudioBitrate = null; - deviceProfile.CodecProfiles.map(function (codecProfile) { + deviceProfile.CodecProfiles.forEach(codecProfile => { if (codecProfile.Type === 'Audio') { - (codecProfile.Conditions || []).map(function (condition) { + (codecProfile.Conditions || []).forEach(condition => { if (condition.Condition === 'LessThanEqual' && condition.Property === 'AudioBitDepth') { return maxAudioBitDepth = condition.Value; } else if (condition.Condition === 'LessThanEqual' && condition.Property === 'AudioSampleRate') { @@ -334,7 +334,7 @@ function getAudioStreamUrlFromDeviceProfile(item, deviceProfile, maxBitrate, api let directPlayContainers = ''; - deviceProfile.DirectPlayProfiles.map(function (p) { + deviceProfile.DirectPlayProfiles.forEach(p => { if (p.Type === 'Audio') { if (directPlayContainers) { directPlayContainers += ',' + p.Container; @@ -360,7 +360,7 @@ function getStreamUrls(items, deviceProfile, maxBitrate, apiClient, startPositio let audioDirectPlayContainers = ''; - deviceProfile.DirectPlayProfiles.map(function (p) { + deviceProfile.DirectPlayProfiles.forEach(p => { if (p.Type === 'Audio') { if (audioDirectPlayContainers) { audioDirectPlayContainers += ',' + p.Container; diff --git a/src/plugins/sessionPlayer/plugin.js b/src/plugins/sessionPlayer/plugin.js index b68154b19c..2f9b6f926f 100644 --- a/src/plugins/sessionPlayer/plugin.js +++ b/src/plugins/sessionPlayer/plugin.js @@ -86,7 +86,7 @@ function unsubscribeFromPlayerUpdates(instance) { function processUpdatedSessions(instance, sessions, apiClient) { const serverId = apiClient.serverId(); - sessions.map(function (s) { + sessions.forEach(s => { if (s.NowPlayingItem) { s.NowPlayingItem.ServerId = serverId; } diff --git a/src/scripts/shell.js b/src/scripts/shell.js index 3b3635c7f4..006d0433ff 100644 --- a/src/scripts/shell.js +++ b/src/scripts/shell.js @@ -33,9 +33,7 @@ export default { */ downloadFiles(items) { if (window.NativeShell) { - items.map(function(item) { - window.NativeShell.downloadFile(item); - }); + items.forEach(item => window.NativeShell.downloadFile(item)); return true; } return false; From dc64556d0c5a9d5fabc207316c6c8862fba58aad Mon Sep 17 00:00:00 2001 From: Bill Thornton Date: Mon, 14 Dec 2020 16:33:49 -0500 Subject: [PATCH 3/3] Remove unnecessary returns --- src/components/playback/playbackmanager.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/playback/playbackmanager.js b/src/components/playback/playbackmanager.js index e43a2c8f50..2b6c13bb1c 100644 --- a/src/components/playback/playbackmanager.js +++ b/src/components/playback/playbackmanager.js @@ -287,11 +287,11 @@ function getAudioMaxValues(deviceProfile) { if (codecProfile.Type === 'Audio') { (codecProfile.Conditions || []).forEach(condition => { if (condition.Condition === 'LessThanEqual' && condition.Property === 'AudioBitDepth') { - return maxAudioBitDepth = condition.Value; + maxAudioBitDepth = condition.Value; } else if (condition.Condition === 'LessThanEqual' && condition.Property === 'AudioSampleRate') { - return maxAudioSampleRate = condition.Value; + maxAudioSampleRate = condition.Value; } else if (condition.Condition === 'LessThanEqual' && condition.Property === 'AudioBitrate') { - return maxAudioBitrate = condition.Value; + maxAudioBitrate = condition.Value; } }); }