Merge branch 'main' into ui_configuration

2.0
Juraj Nyíri 3 years ago
commit bd9d760038

@ -18830,7 +18830,7 @@ class Plex {
}
class PlayController {
constructor(hass, plex, entity, runBefore, runAfter, libraryName) {
constructor(hass, plex, entity, runBefore, runAfter) {
this.plexPlayerEntity = '';
this.runBefore = false;
this.runAfter = false;
@ -18913,14 +18913,14 @@ class PlayController {
case 'movie':
this.playViaCastPlex(entity.value, 'movie', `plex://${JSON.stringify({
// eslint-disable-next-line @typescript-eslint/camelcase
library_name: this.libraryName,
library_name: data.librarySectionTitle,
title: data.title
})}`);
break;
case 'episode':
this.playViaCastPlex(entity.value, 'EPISODE', `plex://${JSON.stringify({
// eslint-disable-next-line @typescript-eslint/camelcase
library_name: this.libraryName,
library_name: data.librarySectionTitle,
// eslint-disable-next-line @typescript-eslint/camelcase
show_name: data.grandparentTitle,
// eslint-disable-next-line @typescript-eslint/camelcase
@ -19229,7 +19229,6 @@ class PlayController {
this.hass = hass;
this.plex = plex;
this.entity = entity;
this.libraryName = libraryName;
if (!lodash.isEmpty(runBefore) && this.hass.states[runBefore]) {
this.runBefore = runBefore.split('.');
}
@ -20544,7 +20543,7 @@ class PlexMeetsHomeAssistant extends HTMLElement {
try {
if (this.plex) {
if (this.hassObj) {
this.playController = new PlayController(this.hassObj, this.plex, entity, this.runBefore, this.runAfter, this.config.libraryName);
this.playController = new PlayController(this.hassObj, this.plex, entity, this.runBefore, this.runAfter);
if (this.playController) {
await this.playController.init();
}

@ -16,26 +16,16 @@ class PlayController {
plex: Plex;
libraryName: string;
runBefore: Array<string> | false = false;
runAfter: Array<string> | false = false;
supported: any = supported;
constructor(
hass: HomeAssistant,
plex: Plex,
entity: Record<string, any>,
runBefore: string,
runAfter: string,
libraryName: string
) {
constructor(hass: HomeAssistant, plex: Plex, entity: Record<string, any>, runBefore: string, runAfter: string) {
this.hass = hass;
this.plex = plex;
this.entity = entity;
this.libraryName = libraryName;
if (!_.isEmpty(runBefore) && this.hass.states[runBefore]) {
this.runBefore = runBefore.split('.');
}
@ -129,7 +119,7 @@ class PlayController {
'movie',
`plex://${JSON.stringify({
// eslint-disable-next-line @typescript-eslint/camelcase
library_name: this.libraryName,
library_name: data.librarySectionTitle,
title: data.title
})}`
);
@ -140,7 +130,7 @@ class PlayController {
'EPISODE',
`plex://${JSON.stringify({
// eslint-disable-next-line @typescript-eslint/camelcase
library_name: this.libraryName,
library_name: data.librarySectionTitle,
// eslint-disable-next-line @typescript-eslint/camelcase
show_name: data.grandparentTitle,
// eslint-disable-next-line @typescript-eslint/camelcase

@ -277,14 +277,7 @@ class PlexMeetsHomeAssistant extends HTMLElement {
try {
if (this.plex) {
if (this.hassObj) {
this.playController = new PlayController(
this.hassObj,
this.plex,
entity,
this.runBefore,
this.runAfter,
this.config.libraryName
);
this.playController = new PlayController(this.hassObj, this.plex, entity, this.runBefore, this.runAfter);
if (this.playController) {
await this.playController.init();
}

Loading…
Cancel
Save