Merge remote-tracking branch 'origin/master' into standalone

Conflicts:
	package.json
	src/components/appRouter.js
	src/components/require/requiretext.js
	src/config.json
	src/scripts/clientUtils.js
	src/scripts/settings/webSettings.js
	src/scripts/site.js

src/scripts/settings/appSettings.js

@@ -1,9 +1,8 @@
 /* eslint-disable indent */
+import { AppStorage, Events } from 'jellyfin-apiclient';
 
-import appStorage from 'appStorage';
-import events from 'events';
-
-    function getKey(name, userId) {
+class AppSettings {
+    #getKey(name, userId) {
         if (userId) {
             name = userId + '-' + name;
         }
@@ -11,7 +10,7 @@ import events from 'events';
         return name;
     }
 
-    export function enableAutoLogin(val) {
+    enableAutoLogin(val) {
         if (val !== undefined) {
             this.set('enableAutoLogin', val.toString());
         }
@@ -19,7 +18,7 @@ import events from 'events';
         return this.get('enableAutoLogin') !== 'false';
     }
 
-    export function enableSystemExternalPlayers(val) {
+    enableSystemExternalPlayers(val) {
         if (val !== undefined) {
             this.set('enableSystemExternalPlayers', val.toString());
         }
@@ -27,7 +26,7 @@ import events from 'events';
         return this.get('enableSystemExternalPlayers') === 'true';
     }
 
-    export function enableAutomaticBitrateDetection(isInNetwork, mediaType, val) {
+    enableAutomaticBitrateDetection(isInNetwork, mediaType, val) {
         const key = 'enableautobitratebitrate-' + mediaType + '-' + isInNetwork;
         if (val !== undefined) {
             if (isInNetwork && mediaType === 'Audio') {
@@ -44,7 +43,7 @@ import events from 'events';
         }
     }
 
-    export function maxStreamingBitrate(isInNetwork, mediaType, val) {
+    maxStreamingBitrate(isInNetwork, mediaType, val) {
         const key = 'maxbitrate-' + mediaType + '-' + isInNetwork;
         if (val !== undefined) {
             if (isInNetwork && mediaType === 'Audio') {
@@ -62,7 +61,7 @@ import events from 'events';
         }
     }
 
-    export function maxStaticMusicBitrate(val) {
+    maxStaticMusicBitrate(val) {
         if (val !== undefined) {
             this.set('maxStaticMusicBitrate', val);
         }
@@ -71,7 +70,7 @@ import events from 'events';
         return parseInt(this.get('maxStaticMusicBitrate') || defaultValue.toString()) || defaultValue;
     }
 
-    export function maxChromecastBitrate(val) {
+    maxChromecastBitrate(val) {
         if (val !== undefined) {
             this.set('chromecastBitrate1', val);
         }
@@ -80,28 +79,20 @@ import events from 'events';
         return val ? parseInt(val) : null;
     }
 
-    export function set(name, value, userId) {
+    set(name, value, userId) {
         const currentValue = this.get(name, userId);
-        appStorage.setItem(getKey(name, userId), value);
+        AppStorage.setItem(this.#getKey(name, userId), value);
 
         if (currentValue !== value) {
-            events.trigger(this, 'change', [name]);
+            Events.trigger(this, 'change', [name]);
         }
     }
 
-    export function get(name, userId) {
-        return appStorage.getItem(getKey(name, userId));
+    get(name, userId) {
+        return AppStorage.getItem(this.#getKey(name, userId));
     }
+}
 
 /* eslint-enable indent */
 
-export default {
-    enableAutoLogin: enableAutoLogin,
-    enableSystemExternalPlayers: enableSystemExternalPlayers,
-    enableAutomaticBitrateDetection: enableAutomaticBitrateDetection,
-    maxStreamingBitrate: maxStreamingBitrate,
-    maxStaticMusicBitrate: maxStaticMusicBitrate,
-    maxChromecastBitrate: maxChromecastBitrate,
-    set: set,
-    get: get
-};
+export default new AppSettings();

src/scripts/settings/userSettings.js

@@ -1,5 +1,5 @@
-import appSettings from 'appSettings';
-import events from 'events';
+import appSettings from './appSettings';
+import { Events } from 'jellyfin-apiclient';
 
 function onSaveTimeout() {
     const self = this;
@@ -77,7 +77,7 @@ export class UserSettings {
         }
 
         if (currentValue !== value) {
-            events.trigger(this, 'change', [name]);
+            Events.trigger(this, 'change', [name]);
         }
 
         return result;
@@ -114,6 +114,33 @@ export class UserSettings {
         });
     }
 
+    /**
+     * Get or set 'Allowed Audio Channels'.
+     * @param {string|undefined} val - 'Allowed Audio Channels'.
+     * @return {string} 'Allowed Audio Channels'.
+     */
+    allowedAudioChannels(val) {
+        if (val !== undefined) {
+            return this.set('allowedAudioChannels', val, false);
+        }
+
+        return this.get('allowedAudioChannels', false) || '-1';
+    }
+
+    /**
+     * Get or set 'Perfer fMP4-HLS Container' state.
+     * @param {boolean|undefined} val - Flag to enable 'Perfer fMP4-HLS Container' or undefined.
+     * @return {boolean} 'Prefer fMP4-HLS Container' state.
+     */
+    preferFmp4HlsContainer(val) {
+        if (val !== undefined) {
+            return this.set('preferFmp4HlsContainer', val.toString(), false);
+        }
+
+        val = this.get('preferFmp4HlsContainer', false);
+        return val === 'true';
+    }
+
     /**
      * Get or set 'Cinema Mode' state.
      * @param {boolean|undefined} val - Flag to enable 'Cinema Mode' or undefined.
@@ -457,6 +484,8 @@ export const importFrom = currentSettings.importFrom.bind(currentSettings);
 export const set = currentSettings.set.bind(currentSettings);
 export const get = currentSettings.get.bind(currentSettings);
 export const serverConfig = currentSettings.serverConfig.bind(currentSettings);
+export const allowedAudioChannels = currentSettings.allowedAudioChannels.bind(currentSettings);
+export const preferFmp4HlsContainer = currentSettings.preferFmp4HlsContainer.bind(currentSettings);
 export const enableCinemaMode = currentSettings.enableCinemaMode.bind(currentSettings);
 export const enableNextVideoInfoOverlay = currentSettings.enableNextVideoInfoOverlay.bind(currentSettings);
 export const enableThemeSongs = currentSettings.enableThemeSongs.bind(currentSettings);

src/scripts/settings/webSettings.js

@@ -94,15 +94,41 @@ export function getServers() {
     });
 }
 
+const baseDefaultTheme = {
+    'name': 'Dark',
+    'id': 'dark',
+    'default': true
+};
+
+let internalDefaultTheme = baseDefaultTheme;
+
+const checkDefaultTheme = (themes) => {
+    if (themes) {
+        const defaultTheme = themes.find((theme) => theme.default);
+
+        if (defaultTheme) {
+            internalDefaultTheme = defaultTheme;
+            return;
+        }
+    }
+
+    internalDefaultTheme = baseDefaultTheme;
+};
+
 export function getThemes() {
     return getConfig().then(config => {
-        return config.themes;
+        const themes = Array.isArray(config.themes) ? config.themes : [];
+        checkDefaultTheme(themes);
+        return themes;
     }).catch(error => {
         console.log('cannot get web config:', error);
+        checkDefaultTheme();
         return [];
     });
 }
 
+export const getDefaultTheme = () => internalDefaultTheme;
+
 export function getPlugins() {
     return getConfig().then(config => {
         return config.plugins;
@@ -111,12 +137,3 @@ export function getPlugins() {
         return [];
     });
 }
-
-export function getFonts() {
-    return getConfig().then(config => {
-        return config.fonts;
-    }).catch(error => {
-        console.log('cannot get web config:', error);
-        return [];
-    });
-}