From 7006ce2c5cfcd758e346d1fc68dc4e933bdd7ef5 Mon Sep 17 00:00:00 2001 From: dkanada Date: Mon, 12 Oct 2020 12:00:38 +0900 Subject: [PATCH 1/9] remove symlink to config file --- src/config.json | 40 +++++++++++++++++++++++++++++++++++++++- src/config.template.json | 39 --------------------------------------- 2 files changed, 39 insertions(+), 40 deletions(-) mode change 120000 => 100644 src/config.json delete mode 100644 src/config.template.json diff --git a/src/config.json b/src/config.json deleted file mode 120000 index f1bd2db71e..0000000000 --- a/src/config.json +++ /dev/null @@ -1 +0,0 @@ -config.template.json \ No newline at end of file diff --git a/src/config.json b/src/config.json new file mode 100644 index 0000000000..0f308ccc11 --- /dev/null +++ b/src/config.json @@ -0,0 +1,39 @@ +{ + "multiserver": false, + "themes": [ + { + "name": "Apple TV", + "id": "appletv" + }, { + "name": "Blue Radiance", + "id": "blueradiance" + }, { + "name": "Dark", + "id": "dark", + "default": true + }, { + "name": "Light", + "id": "light" + }, { + "name": "Purple Haze", + "id": "purplehaze" + }, { + "name": "WMC", + "id": "wmc" + } + ], + "plugins": [ + "plugins/playAccessValidation/plugin", + "plugins/experimentalWarnings/plugin", + "plugins/htmlAudioPlayer/plugin", + "plugins/htmlVideoPlayer/plugin", + "plugins/photoPlayer/plugin", + "plugins/comicsPlayer/plugin", + "plugins/bookPlayer/plugin", + "plugins/youtubePlayer/plugin", + "plugins/backdropScreensaver/plugin", + "plugins/logoScreensaver/plugin", + "plugins/sessionPlayer/plugin", + "plugins/chromecastPlayer/plugin" + ] +} diff --git a/src/config.template.json b/src/config.template.json deleted file mode 100644 index 0f308ccc11..0000000000 --- a/src/config.template.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "multiserver": false, - "themes": [ - { - "name": "Apple TV", - "id": "appletv" - }, { - "name": "Blue Radiance", - "id": "blueradiance" - }, { - "name": "Dark", - "id": "dark", - "default": true - }, { - "name": "Light", - "id": "light" - }, { - "name": "Purple Haze", - "id": "purplehaze" - }, { - "name": "WMC", - "id": "wmc" - } - ], - "plugins": [ - "plugins/playAccessValidation/plugin", - "plugins/experimentalWarnings/plugin", - "plugins/htmlAudioPlayer/plugin", - "plugins/htmlVideoPlayer/plugin", - "plugins/photoPlayer/plugin", - "plugins/comicsPlayer/plugin", - "plugins/bookPlayer/plugin", - "plugins/youtubePlayer/plugin", - "plugins/backdropScreensaver/plugin", - "plugins/logoScreensaver/plugin", - "plugins/sessionPlayer/plugin", - "plugins/chromecastPlayer/plugin" - ] -} From 4d92ca43bb423f78cc190e64d47f4fde0fa05e7c Mon Sep 17 00:00:00 2001 From: dkanada Date: Mon, 12 Oct 2020 12:02:24 +0900 Subject: [PATCH 2/9] reduce requirements for controls on dashboard --- src/controllers/dashboard/dashboard.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/controllers/dashboard/dashboard.js b/src/controllers/dashboard/dashboard.js index fc7c178ee3..2078e0af8f 100644 --- a/src/controllers/dashboard/dashboard.js +++ b/src/controllers/dashboard/dashboard.js @@ -550,13 +550,13 @@ import 'emby-itemscontainer'; row.classList.remove('playingSession'); } - if (session.ServerId && session.SupportedCommands.indexOf('DisplayMessage') !== -1 && session.DeviceId !== window.connectionManager.deviceId()) { + if (session.ServerId && session.SupportedCommands.indexOf('DisplayMessage') !== -1) { row.querySelector('.btnSessionSendMessage').classList.remove('hide'); } else { row.querySelector('.btnSessionSendMessage').classList.add('hide'); } - if (session.TranscodingInfo && session.TranscodingInfo.TranscodeReasons && session.TranscodingInfo && session.TranscodingInfo.TranscodeReasons.length) { + if (session.TranscodingInfo && session.TranscodingInfo.TranscodeReasons && session.TranscodingInfo) { row.querySelector('.btnSessionInfo').classList.remove('hide'); } else { row.querySelector('.btnSessionInfo').classList.add('hide'); @@ -564,7 +564,7 @@ import 'emby-itemscontainer'; const btnSessionPlayPause = row.querySelector('.btnSessionPlayPause'); - if (session.ServerId && nowPlayingItem && session.SupportsRemoteControl && session.DeviceId !== window.connectionManager.deviceId()) { + if (session.ServerId && nowPlayingItem && session.SupportsRemoteControl) { btnSessionPlayPause.classList.remove('hide'); row.querySelector('.btnSessionStop').classList.remove('hide'); } else { From 05c16d19ac3e041356ef51020e5f6f3a70560ac6 Mon Sep 17 00:00:00 2001 From: dkanada Date: Mon, 12 Oct 2020 12:20:06 +0900 Subject: [PATCH 3/9] remove swap file from translations --- src/strings/.en-us.json.swp | Bin 16384 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/strings/.en-us.json.swp diff --git a/src/strings/.en-us.json.swp b/src/strings/.en-us.json.swp deleted file mode 100644 index bbb5d9ab1641a6c2570646b97834b16268a5b238..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16384 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 Date: Mon, 12 Oct 2020 12:20:28 +0900 Subject: [PATCH 4/9] invert default backdrop setting --- src/scripts/settings/userSettings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/settings/userSettings.js b/src/scripts/settings/userSettings.js index 1235e0fa5f..263d74ed37 100644 --- a/src/scripts/settings/userSettings.js +++ b/src/scripts/settings/userSettings.js @@ -209,7 +209,7 @@ export class UserSettings { } val = this.get('enableBackdrops', false); - return val !== 'false'; + return val === 'true'; } /** From 7b168608a06d4fe48171b8b054d008518bce70ea Mon Sep 17 00:00:00 2001 From: dkanada Date: Mon, 12 Oct 2020 12:29:57 +0900 Subject: [PATCH 5/9] add library scan button to dashboard --- src/controllers/dashboard/dashboard.html | 3 +++ src/controllers/dashboard/dashboard.js | 15 +++++++++++++++ src/scripts/taskbutton.js | 2 +- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/controllers/dashboard/dashboard.html b/src/controllers/dashboard/dashboard.html index ec0d60a74d..4c20da8de5 100644 --- a/src/controllers/dashboard/dashboard.html +++ b/src/controllers/dashboard/dashboard.html @@ -22,6 +22,9 @@ +
diff --git a/src/controllers/dashboard/dashboard.js b/src/controllers/dashboard/dashboard.js index 2078e0af8f..855ce3ff03 100644 --- a/src/controllers/dashboard/dashboard.js +++ b/src/controllers/dashboard/dashboard.js @@ -3,6 +3,7 @@ import events from 'events'; import itemHelper from 'itemHelper'; import serverNotifications from 'serverNotifications'; import dom from 'dom'; +import taskButton from 'scripts/taskbutton'; import globalize from 'globalize'; import * as datefns from 'date-fns'; import dfnshelper from 'dfnshelper'; @@ -827,9 +828,17 @@ import 'emby-itemscontainer'; refreshActiveRecordings(view, apiClient); loading.hide(); } + + taskButton({ + mode: 'on', + taskKey: 'RefreshLibrary', + button: page.querySelector('.btnRefresh') + }); }); view.addEventListener('viewbeforehide', function () { const apiClient = ApiClient; + const page = this; + events.off(serverNotifications, 'RestartRequired', onRestartRequired); events.off(serverNotifications, 'ServerShuttingDown', onServerShuttingDown); events.off(serverNotifications, 'ServerRestarting', onServerRestarting); @@ -841,6 +850,12 @@ import 'emby-itemscontainer'; if (apiClient) { DashboardPage.stopInterval(apiClient); } + + taskButton({ + mode: 'off', + taskKey: 'RefreshLibrary', + button: page.querySelector('.btnRefresh') + }); }); view.addEventListener('viewdestroy', function () { const page = this; diff --git a/src/scripts/taskbutton.js b/src/scripts/taskbutton.js index 163bcb5a1c..43a46301aa 100644 --- a/src/scripts/taskbutton.js +++ b/src/scripts/taskbutton.js @@ -13,7 +13,7 @@ export default function (options) { function updateTasks(tasks) { const task = tasks.filter(function (t) { - return t.ScheduledTask.Key == options.taskKey; + return t.Key == options.taskKey; })[0]; if (options.panel) { From 39a333f17b988758aeeaf425b2105462bb58a7df Mon Sep 17 00:00:00 2001 From: dkanada Date: Mon, 12 Oct 2020 12:33:20 +0900 Subject: [PATCH 6/9] move scan button to start on dashboard --- src/controllers/dashboard/dashboard.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/controllers/dashboard/dashboard.html b/src/controllers/dashboard/dashboard.html index 4c20da8de5..83d30495e5 100644 --- a/src/controllers/dashboard/dashboard.html +++ b/src/controllers/dashboard/dashboard.html @@ -16,15 +16,15 @@
+ -
From 7411f96ff9a0f8797468f2c93f4f21783ea09c58 Mon Sep 17 00:00:00 2001 From: dkanada Date: Mon, 12 Oct 2020 12:36:42 +0900 Subject: [PATCH 7/9] move quickconnect html to proper location --- .../dashboard/quickConnect.html} | 0 .../dashboard/{quickconnect.js => quickConnect.js} | 0 src/scripts/routes.js | 5 +++-- 3 files changed, 3 insertions(+), 2 deletions(-) rename src/{quickconnect.html => controllers/dashboard/quickConnect.html} (100%) rename src/controllers/dashboard/{quickconnect.js => quickConnect.js} (100%) diff --git a/src/quickconnect.html b/src/controllers/dashboard/quickConnect.html similarity index 100% rename from src/quickconnect.html rename to src/controllers/dashboard/quickConnect.html diff --git a/src/controllers/dashboard/quickconnect.js b/src/controllers/dashboard/quickConnect.js similarity index 100% rename from src/controllers/dashboard/quickconnect.js rename to src/controllers/dashboard/quickConnect.js diff --git a/src/scripts/routes.js b/src/scripts/routes.js index 5651102655..ebe6f3cf5a 100644 --- a/src/scripts/routes.js +++ b/src/scripts/routes.js @@ -159,10 +159,11 @@ import 'detailtablecss'; }); defineRoute({ - path: '/quickconnect.html', + alias: '/quickConnect.html', + path: '/controllers/dashboard/quickConnect.html', autoFocus: false, roles: 'admin', - controller: 'dashboard/quickconnect' + controller: 'dashboard/quickConnect' }); defineRoute({ From a1cd9c8e602e2078c888bad9a6961264dd9956ad Mon Sep 17 00:00:00 2001 From: dkanada Date: Mon, 12 Oct 2020 12:45:20 +0900 Subject: [PATCH 8/9] update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 42bdc9dfcf..2f666ec7bc 100644 --- a/package.json +++ b/package.json @@ -245,7 +245,7 @@ "src/controllers/dashboard/plugins/installed/index.js", "src/controllers/dashboard/plugins/available/index.js", "src/controllers/dashboard/plugins/repositories/index.js", - "src/controllers/dashboard/quickconnect.js", + "src/controllers/dashboard/quickConnect.js", "src/controllers/dashboard/scheduledtasks/scheduledtask.js", "src/controllers/dashboard/scheduledtasks/scheduledtasks.js", "src/controllers/dashboard/serveractivity.js", From e877e711a11c46cc715683f6007d1cc75d382e63 Mon Sep 17 00:00:00 2001 From: dkanada Date: Sun, 18 Oct 2020 01:14:26 +0900 Subject: [PATCH 9/9] update config.json --- .gitignore | 3 ++ src/config.json | 74 ++++++++++++++++++++++++------------------------- 2 files changed, 40 insertions(+), 37 deletions(-) diff --git a/.gitignore b/.gitignore index 36b843f022..98aa2d974b 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,9 @@ dist web node_modules +# config +config.json + # ide .idea .vscode diff --git a/src/config.json b/src/config.json index 0f308ccc11..864e1f3656 100644 --- a/src/config.json +++ b/src/config.json @@ -1,39 +1,39 @@ { - "multiserver": false, - "themes": [ - { - "name": "Apple TV", - "id": "appletv" - }, { - "name": "Blue Radiance", - "id": "blueradiance" - }, { - "name": "Dark", - "id": "dark", - "default": true - }, { - "name": "Light", - "id": "light" - }, { - "name": "Purple Haze", - "id": "purplehaze" - }, { - "name": "WMC", - "id": "wmc" - } - ], - "plugins": [ - "plugins/playAccessValidation/plugin", - "plugins/experimentalWarnings/plugin", - "plugins/htmlAudioPlayer/plugin", - "plugins/htmlVideoPlayer/plugin", - "plugins/photoPlayer/plugin", - "plugins/comicsPlayer/plugin", - "plugins/bookPlayer/plugin", - "plugins/youtubePlayer/plugin", - "plugins/backdropScreensaver/plugin", - "plugins/logoScreensaver/plugin", - "plugins/sessionPlayer/plugin", - "plugins/chromecastPlayer/plugin" - ] + "multiserver": false, + "themes": [ + { + "name": "Apple TV", + "id": "appletv" + }, { + "name": "Blue Radiance", + "id": "blueradiance" + }, { + "name": "Dark", + "id": "dark", + "default": true + }, { + "name": "Light", + "id": "light" + }, { + "name": "Purple Haze", + "id": "purplehaze" + }, { + "name": "WMC", + "id": "wmc" + } + ], + "plugins": [ + "plugins/playAccessValidation/plugin", + "plugins/experimentalWarnings/plugin", + "plugins/htmlAudioPlayer/plugin", + "plugins/htmlVideoPlayer/plugin", + "plugins/photoPlayer/plugin", + "plugins/comicsPlayer/plugin", + "plugins/bookPlayer/plugin", + "plugins/youtubePlayer/plugin", + "plugins/backdropScreensaver/plugin", + "plugins/logoScreensaver/plugin", + "plugins/sessionPlayer/plugin", + "plugins/chromecastPlayer/plugin" + ] }