move themes and plugins into config file

src/scripts/autoThemes.js

@@ -0,0 +1,8 @@
+import * as userSettings from 'userSettings';
+import skinManager from 'skinManager';
+import connectionManager from 'connectionManager';
+import events from 'events';
+
+events.on(connectionManager, 'localusersignedin', function (e, user) {
+    skinManager.setTheme(userSettings.theme());
+});

src/scripts/inputManager.js

@@ -35,6 +35,7 @@ import appHost from 'apphost';
         if (eventListenerCount) {
             eventListenerCount--;
         }
+
         dom.removeEventListener(scope, 'command', fn, {});
     }
 

src/scripts/settings/appSettings.js

@@ -80,43 +80,6 @@ import events from 'events';
         return val ? parseInt(val) : null;
     }
 
-    export function syncOnlyOnWifi(val) {
-        if (val !== undefined) {
-            this.set('syncOnlyOnWifi', val.toString());
-        }
-
-        return this.get('syncOnlyOnWifi') !== 'false';
-    }
-
-    export function syncPath(val) {
-        if (val !== undefined) {
-            this.set('syncPath', val);
-        }
-
-        return this.get('syncPath');
-    }
-
-    export function cameraUploadServers(val) {
-        if (val !== undefined) {
-            this.set('cameraUploadServers', val.join(','));
-        }
-
-        val = this.get('cameraUploadServers');
-        if (val) {
-            return val.split(',');
-        }
-
-        return [];
-    }
-
-    export function runAtStartup(val) {
-        if (val !== undefined) {
-            this.set('runatstartup', val.toString());
-        }
-
-        return this.get('runatstartup') === 'true';
-    }
-
     export function set(name, value, userId) {
         const currentValue = this.get(name, userId);
         appStorage.setItem(getKey(name, userId), value);
@@ -139,10 +102,6 @@ export default {
     maxStreamingBitrate: maxStreamingBitrate,
     maxStaticMusicBitrate: maxStaticMusicBitrate,
     maxChromecastBitrate: maxChromecastBitrate,
-    syncOnlyOnWifi: syncOnlyOnWifi,
-    syncPath: syncPath,
-    cameraUploadServers: cameraUploadServers,
-    runAtStartup: runAtStartup,
     set: set,
     get: get
 };

src/scripts/settings/webSettings.js

@@ -18,7 +18,7 @@ function getDefaultConfig() {
     });
 }
 
-export function enableMultiServer() {
+export function getMultiServer() {
     return getConfig().then(config => {
         return config.multiserver;
     }).catch(error => {
@@ -26,3 +26,21 @@ export function enableMultiServer() {
         return false;
     });
 }
+
+export function getThemes() {
+    return getConfig().then(config => {
+        return config.themes;
+    }).catch(error => {
+        console.log('cannot get web config:', error);
+        return [];
+    });
+}
+
+export function getPlugins() {
+    return getConfig().then(config => {
+        return config.plugins;
+    }).catch(error => {
+        console.log('cannot get web config:', error);
+        return [];
+    });
+}

src/scripts/site.js

@@ -477,36 +477,30 @@ function initClient() {
 
     function loadPlugins(appHost, browser, shell) {
         console.debug('loading installed plugins');
-        var list = [
-            'plugins/playAccessValidation/plugin',
-            'plugins/experimentalWarnings/plugin',
-            'plugins/htmlAudioPlayer/plugin',
-            'plugins/htmlVideoPlayer/plugin',
-            'plugins/photoPlayer/plugin',
-            'plugins/bookPlayer/plugin',
-            'plugins/youtubePlayer/plugin',
-            'plugins/backdropScreensaver/plugin',
-            'plugins/logoScreensaver/plugin'
-        ];
-
-        if (appHost.supports('remotecontrol')) {
-            list.push('plugins/sessionPlayer/plugin');
-
-            if (browser.chrome || browser.edgeChromium || browser.opera) {
-                list.push('plugins/chromecastPlayer/plugin');
-            }
-        }
-
-        if (window.NativeShell) {
-            list = list.concat(window.NativeShell.getPlugins());
-        }
-
         return new Promise(function (resolve, reject) {
-            Promise.all(list.map(loadPlugin)).then(function () {
-                require(['packageManager'], function (packageManager) {
-                    packageManager.init().then(resolve, reject);
+            require(['webSettings'], function (webSettings) {
+                webSettings.getPlugins().then(function (list) {
+                    // these two plugins are dependent on features
+                    if (!appHost.supports('remotecontrol')) {
+                        list.splice(list.indexOf('sessionPlayer'), 1);
+
+                        if (!browser.chrome && !browser.opera) {
+                            list.splice(list.indexOf('chromecastPlayer', 1));
+                        }
+                    }
+
+                    // add any native plugins
+                    if (window.NativeShell) {
+                        list = list.concat(window.NativeShell.getPlugins());
+                    }
+
+                    Promise.all(list.map(loadPlugin)).then(function () {
+                        require(['packageManager'], function (packageManager) {
+                            packageManager.init().then(resolve, reject);
+                        });
+                    }, reject);
                 });
-            }, reject);
+            });
         });
     }
 
@@ -532,7 +526,7 @@ function initClient() {
 
             window.Emby.Page = appRouter;
 
-            require(['emby-button', 'scripts/themeLoader', 'libraryMenu', 'scripts/routes'], function () {
+            require(['emby-button', 'scripts/autoThemes', 'libraryMenu', 'scripts/routes'], function () {
                 Emby.Page.start({
                     click: false,
                     hashbang: true
@@ -653,8 +647,7 @@ function initClient() {
             nowPlayingHelper: componentsPath + '/playback/nowplayinghelper',
             pluginManager: componentsPath + '/pluginManager',
             packageManager: componentsPath + '/packageManager',
-            screensaverManager: componentsPath + '/screensavermanager',
-            chromecastHelper: 'plugins/chromecastPlayer/chromecastHelpers'
+            screensaverManager: componentsPath + '/screensavermanager'
         };
 
         requirejs.onError = onRequireJsError;
@@ -848,7 +841,7 @@ function initClient() {
         define('viewContainer', [componentsPath + '/viewContainer'], returnFirstDependency);
         define('dialogHelper', [componentsPath + '/dialogHelper/dialogHelper'], returnFirstDependency);
         define('serverNotifications', [scriptsPath + '/serverNotifications'], returnFirstDependency);
-        define('skinManager', [componentsPath + '/skinManager'], returnFirstDependency);
+        define('skinManager', [scriptsPath + '/themeManager'], returnFirstDependency);
         define('keyboardnavigation', [scriptsPath + '/keyboardNavigation'], returnFirstDependency);
         define('mouseManager', [scriptsPath + '/mouseManager'], returnFirstDependency);
         define('scrollManager', [componentsPath + '/scrollManager'], returnFirstDependency);

src/scripts/themeLoader.js

@@ -1,29 +0,0 @@
-import * as userSettings from 'userSettings';
-import skinManager from 'skinManager';
-import connectionManager from 'connectionManager';
-import events from 'events';
-
-var currentViewType;
-pageClassOn('viewbeforeshow', 'page', function () {
-    var classList = this.classList;
-    var viewType = classList.contains('type-interior') || classList.contains('wizardPage') ? 'a' : 'b';
-
-    if (viewType !== currentViewType) {
-        currentViewType = viewType;
-        var theme;
-        var context;
-
-        if (viewType === 'a') {
-            theme = userSettings.dashboardTheme();
-            context = 'serverdashboard';
-        } else {
-            theme = userSettings.theme();
-        }
-
-        skinManager.setTheme(theme, context);
-    }
-});
-
-events.on(connectionManager, 'localusersignedin', function (e, user) {
-    currentViewType = null;
-});

src/scripts/themeManager.js

@@ -0,0 +1,66 @@
+import * as webSettings from 'webSettings';
+
+var themeStyleElement;
+var currentThemeId;
+
+function unloadTheme() {
+    var elem = themeStyleElement;
+    if (elem) {
+        elem.parentNode.removeChild(elem);
+        themeStyleElement = null;
+        currentThemeId = null;
+    }
+}
+
+function getThemes() {
+    return webSettings.getThemes();
+}
+
+function getThemeStylesheetInfo(id) {
+    return getThemes().then(themes => {
+        var theme = themes.find(theme => {
+            return id ? theme.id === id : theme.default;
+        });
+
+        return {
+            stylesheetPath: 'themes/' + theme.id + '/theme.css',
+            themeId: theme.id
+        };
+    });
+}
+
+function setTheme(id) {
+    return new Promise(function (resolve, reject) {
+        if (currentThemeId && currentThemeId === id) {
+            resolve();
+            return;
+        }
+
+        getThemeStylesheetInfo(id).then(function (info) {
+            if (currentThemeId && currentThemeId === info.themeId) {
+                resolve();
+                return;
+            }
+
+            var linkUrl = info.stylesheetPath;
+            unloadTheme();
+
+            var link = document.createElement('link');
+            link.setAttribute('rel', 'stylesheet');
+            link.setAttribute('type', 'text/css');
+            link.onload = function () {
+                resolve();
+            };
+
+            link.setAttribute('href', linkUrl);
+            document.head.appendChild(link);
+            themeStyleElement = link;
+            currentThemeId = info.themeId;
+        });
+    });
+}
+
+export default {
+    getThemes: getThemes,
+    setTheme: setTheme
+};