From e5d16ab46cb75521ad76a5b1186955bf565992f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juraj=20Nyi=CC=81ri?= Date: Mon, 12 Jul 2021 13:46:54 +0200 Subject: [PATCH] no message --- dist/plex-meets-homeassistant.js | 81 +++++++++++++++++++++++++++--- src/editor.ts | 86 ++++++++++++++++++++++++++++---- src/plex-meets-homeassistant.ts | 1 + 3 files changed, 151 insertions(+), 17 deletions(-) diff --git a/dist/plex-meets-homeassistant.js b/dist/plex-meets-homeassistant.js index 13fa570..e0e33d3 100644 --- a/dist/plex-meets-homeassistant.js +++ b/dist/plex-meets-homeassistant.js @@ -19454,6 +19454,8 @@ class PlexMeetsHomeAssistantEditor extends HTMLElement { this.libraryName = document.createElement('paper-dropdown-menu'); this.protocol = document.createElement('paper-dropdown-menu'); this.tabs = document.createElement('paper-tabs'); + this.sort = document.createElement('paper-dropdown-menu'); + this.sortOrder = document.createElement('paper-dropdown-menu'); this.devicesTabs = 0; this.entities = []; this.sections = []; @@ -19472,6 +19474,7 @@ class PlexMeetsHomeAssistantEditor extends HTMLElement { return event; }; this.valueUpdated = () => { + console.log('valueUpdated'); if (!lodash.isEmpty(this.libraryName.value)) { const originalConfig = lodash.clone(this.config); this.config.ip = this.ip.value; @@ -19479,21 +19482,24 @@ class PlexMeetsHomeAssistantEditor extends HTMLElement { this.config.port = this.port.value; this.config.libraryName = this.libraryName.value; this.config.protocol = this.protocol.value; + this.config.sort = `${this.sort.value}:${this.sortOrder.value}`; if (lodash.isEmpty(this.maxCount.value)) { this.config.maxCount = ''; } else { - this.config.maxCount = parseInt(this.maxCount.value, 10); + this.config.maxCount = this.maxCount.value; } if (!lodash.isEmpty(this.entities)) { this.config.entity = []; lodash.forEach(this.entities, entity => { - if (!lodash.isEmpty(entity.value)) { + if (!lodash.isEmpty(entity.value) && !lodash.includes(this.config.entity, entity.value)) { this.config.entity.push(entity.value); } }); } if (!lodash.isEqual(this.config, originalConfig)) { + console.log(this.config); + console.log(originalConfig); this.fireEvent(this, 'config-changed', { config: this.config }); } } @@ -19569,11 +19575,6 @@ class PlexMeetsHomeAssistantEditor extends HTMLElement { this.port.type = 'number'; this.port.addEventListener('change', this.valueUpdated); this.content.appendChild(this.port); - this.maxCount.label = 'Maximum number of items to display'; - this.maxCount.value = this.config.maxCount; - this.maxCount.type = 'number'; - this.maxCount.addEventListener('change', this.valueUpdated); - this.content.appendChild(this.maxCount); this.libraryName.innerHTML = ''; const libraryItems = document.createElement('paper-listbox'); libraryItems.appendChild(addDropdownItem('Continue Watching')); @@ -19599,6 +19600,67 @@ class PlexMeetsHomeAssistantEditor extends HTMLElement { } } this.plexValidSection.style.display = 'none'; + this.plexValidSection.innerHTML = ''; + const viewTitle = document.createElement('h2'); + viewTitle.innerHTML = `View Configuration`; + viewTitle.style.lineHeight = '29px'; + viewTitle.style.marginBottom = '0px'; + viewTitle.style.marginTop = '20px'; + this.plexValidSection.appendChild(viewTitle); + this.maxCount.label = 'Maximum number of items to display'; + this.maxCount.value = this.config.maxCount; + this.maxCount.type = 'number'; + this.maxCount.addEventListener('change', this.valueUpdated); + this.plexValidSection.appendChild(this.maxCount); + this.sort.innerHTML = ''; + const sortItems = document.createElement('paper-listbox'); + sortItems.appendChild(addDropdownItem('titleSort')); + sortItems.appendChild(addDropdownItem('title')); + sortItems.appendChild(addDropdownItem('year')); + sortItems.appendChild(addDropdownItem('originallyAvailableAt')); + sortItems.appendChild(addDropdownItem('rating')); + sortItems.appendChild(addDropdownItem('audienceRating')); + sortItems.appendChild(addDropdownItem('userRating')); + sortItems.appendChild(addDropdownItem('contentRating')); + sortItems.appendChild(addDropdownItem('unviewedLeafCount')); + sortItems.appendChild(addDropdownItem('episode.addedAt')); + sortItems.appendChild(addDropdownItem('addedAt')); + sortItems.appendChild(addDropdownItem('lastViewedAt')); + sortItems.slot = 'dropdown-content'; + this.sort.label = 'Sort'; + this.sort.appendChild(sortItems); + this.sort.style.width = '100%'; + this.sort.addEventListener('value-changed', this.valueUpdated); + if (lodash.isEmpty(this.config.sort)) { + this.sort.value = 'title'; + } + else { + // eslint-disable-next-line prefer-destructuring + this.sort.value = this.config.sort.split(':')[0]; + } + this.plexValidSection.appendChild(this.sort); + this.sortOrder.innerHTML = ''; + const sortOrderItems = document.createElement('paper-listbox'); + sortOrderItems.appendChild(addDropdownItem('asc')); + sortOrderItems.appendChild(addDropdownItem('desc')); + sortOrderItems.slot = 'dropdown-content'; + this.sortOrder.label = 'Sort Order'; + this.sortOrder.appendChild(sortOrderItems); + this.sortOrder.style.width = '100%'; + this.sortOrder.addEventListener('value-changed', this.valueUpdated); + if (lodash.isEmpty(this.config.sort)) { + this.sortOrder.value = 'asc'; + } + else { + const sortOrder = this.config.sort.split(':')[1]; + if (lodash.isEmpty(sortOrder)) { + this.sortOrder.value = 'asc'; + } + else { + this.sortOrder.value = sortOrder; + } + } + this.plexValidSection.appendChild(this.sortOrder); const devicesTitle = document.createElement('h2'); devicesTitle.innerHTML = `Devices Configuration`; devicesTitle.style.lineHeight = '29px'; @@ -19616,7 +19678,6 @@ class PlexMeetsHomeAssistantEditor extends HTMLElement { } }); devicesTitle.appendChild(addDeviceButton); - this.plexValidSection.innerHTML = ''; this.plexValidSection.appendChild(devicesTitle); if (lodash.isString(this.config.entity)) { this.config.entity = [this.config.entity]; @@ -19652,6 +19713,9 @@ class PlexMeetsHomeAssistantEditor extends HTMLElement { else { this.config.protocol = 'http'; } + if (!config.sort) { + this.config.sort = 'titleSort:asc'; + } this.plex = new Plex(this.config.ip, this.plexPort, this.config.token, this.plexProtocol, this.config.sort); this.render(); }; @@ -20618,6 +20682,7 @@ class PlexMeetsHomeAssistant extends HTMLElement { this.render(); } else { + console.log('RETRY'); setTimeout(() => { this.renderInitialData(); }, 250); diff --git a/src/editor.ts b/src/editor.ts index 5f9cdcc..991e6f4 100644 --- a/src/editor.ts +++ b/src/editor.ts @@ -30,6 +30,10 @@ class PlexMeetsHomeAssistantEditor extends HTMLElement { tabs: any = document.createElement('paper-tabs'); + sort: any = document.createElement('paper-dropdown-menu'); + + sortOrder: any = document.createElement('paper-dropdown-menu'); + devicesTabs = 0; hassObj: HomeAssistant | undefined; @@ -61,6 +65,7 @@ class PlexMeetsHomeAssistantEditor extends HTMLElement { }; valueUpdated = (): void => { + console.log('valueUpdated'); if (!_.isEmpty(this.libraryName.value)) { const originalConfig = _.clone(this.config); this.config.ip = this.ip.value; @@ -69,21 +74,24 @@ class PlexMeetsHomeAssistantEditor extends HTMLElement { this.config.libraryName = this.libraryName.value; this.config.protocol = this.protocol.value; + this.config.sort = `${this.sort.value}:${this.sortOrder.value}`; if (_.isEmpty(this.maxCount.value)) { this.config.maxCount = ''; } else { - this.config.maxCount = parseInt(this.maxCount.value, 10); + this.config.maxCount = this.maxCount.value; } if (!_.isEmpty(this.entities)) { this.config.entity = []; _.forEach(this.entities, entity => { - if (!_.isEmpty(entity.value)) { + if (!_.isEmpty(entity.value) && !_.includes(this.config.entity, entity.value)) { this.config.entity.push(entity.value); } }); } if (!_.isEqual(this.config, originalConfig)) { + console.log(this.config); + console.log(originalConfig); this.fireEvent(this, 'config-changed', { config: this.config }); } } @@ -168,12 +176,6 @@ class PlexMeetsHomeAssistantEditor extends HTMLElement { this.port.addEventListener('change', this.valueUpdated); this.content.appendChild(this.port); - this.maxCount.label = 'Maximum number of items to display'; - this.maxCount.value = this.config.maxCount; - this.maxCount.type = 'number'; - this.maxCount.addEventListener('change', this.valueUpdated); - this.content.appendChild(this.maxCount); - this.libraryName.innerHTML = ''; const libraryItems: any = document.createElement('paper-listbox'); libraryItems.appendChild(addDropdownItem('Continue Watching')); @@ -201,6 +203,69 @@ class PlexMeetsHomeAssistantEditor extends HTMLElement { } this.plexValidSection.style.display = 'none'; + this.plexValidSection.innerHTML = ''; + + const viewTitle = document.createElement('h2'); + viewTitle.innerHTML = `View Configuration`; + viewTitle.style.lineHeight = '29px'; + viewTitle.style.marginBottom = '0px'; + viewTitle.style.marginTop = '20px'; + this.plexValidSection.appendChild(viewTitle); + + this.maxCount.label = 'Maximum number of items to display'; + this.maxCount.value = this.config.maxCount; + this.maxCount.type = 'number'; + this.maxCount.addEventListener('change', this.valueUpdated); + this.plexValidSection.appendChild(this.maxCount); + + this.sort.innerHTML = ''; + const sortItems: any = document.createElement('paper-listbox'); + sortItems.appendChild(addDropdownItem('titleSort')); + sortItems.appendChild(addDropdownItem('title')); + sortItems.appendChild(addDropdownItem('year')); + sortItems.appendChild(addDropdownItem('originallyAvailableAt')); + sortItems.appendChild(addDropdownItem('rating')); + sortItems.appendChild(addDropdownItem('audienceRating')); + sortItems.appendChild(addDropdownItem('userRating')); + sortItems.appendChild(addDropdownItem('contentRating')); + sortItems.appendChild(addDropdownItem('unviewedLeafCount')); + sortItems.appendChild(addDropdownItem('episode.addedAt')); + sortItems.appendChild(addDropdownItem('addedAt')); + sortItems.appendChild(addDropdownItem('lastViewedAt')); + sortItems.slot = 'dropdown-content'; + this.sort.label = 'Sort'; + this.sort.appendChild(sortItems); + this.sort.style.width = '100%'; + this.sort.addEventListener('value-changed', this.valueUpdated); + if (_.isEmpty(this.config.sort)) { + this.sort.value = 'title'; + } else { + // eslint-disable-next-line prefer-destructuring + this.sort.value = this.config.sort.split(':')[0]; + } + this.plexValidSection.appendChild(this.sort); + + this.sortOrder.innerHTML = ''; + const sortOrderItems: any = document.createElement('paper-listbox'); + sortOrderItems.appendChild(addDropdownItem('asc')); + sortOrderItems.appendChild(addDropdownItem('desc')); + sortOrderItems.slot = 'dropdown-content'; + this.sortOrder.label = 'Sort Order'; + this.sortOrder.appendChild(sortOrderItems); + this.sortOrder.style.width = '100%'; + this.sortOrder.addEventListener('value-changed', this.valueUpdated); + if (_.isEmpty(this.config.sort)) { + this.sortOrder.value = 'asc'; + } else { + const sortOrder = this.config.sort.split(':')[1]; + if (_.isEmpty(sortOrder)) { + this.sortOrder.value = 'asc'; + } else { + this.sortOrder.value = sortOrder; + } + } + this.plexValidSection.appendChild(this.sortOrder); + const devicesTitle = document.createElement('h2'); devicesTitle.innerHTML = `Devices Configuration`; devicesTitle.style.lineHeight = '29px'; @@ -220,7 +285,6 @@ class PlexMeetsHomeAssistantEditor extends HTMLElement { }); devicesTitle.appendChild(addDeviceButton); - this.plexValidSection.innerHTML = ''; this.plexValidSection.appendChild(devicesTitle); if (_.isString(this.config.entity)) { this.config.entity = [this.config.entity]; @@ -259,6 +323,10 @@ class PlexMeetsHomeAssistantEditor extends HTMLElement { this.config.protocol = 'http'; } + if (!config.sort) { + this.config.sort = 'titleSort:asc'; + } + this.plex = new Plex(this.config.ip, this.plexPort, this.config.token, this.plexProtocol, this.config.sort); this.render(); }; diff --git a/src/plex-meets-homeassistant.ts b/src/plex-meets-homeassistant.ts index 75db1e5..9bb97d9 100644 --- a/src/plex-meets-homeassistant.ts +++ b/src/plex-meets-homeassistant.ts @@ -353,6 +353,7 @@ class PlexMeetsHomeAssistant extends HTMLElement { this.loading = false; this.render(); } else { + console.log('RETRY'); setTimeout(() => { this.renderInitialData(); }, 250);