Add: WIP Support for client servers for plexPlayer

pull/16/head
Juraj Nyíri 3 years ago
parent 75257220cd
commit a410779873

@ -19062,9 +19062,59 @@ class PlayController {
}); });
return service; return service;
}; };
this.getPlexPlayerMachineIdentifier = (entityName) => { this.init = async () => {
if (!lodash.isNil(this.entity.plexPlayer)) {
if (lodash.isArray(this.entity.plexPlayer)) {
for (let i = 0; i < this.entity.plexPlayer.length; i += 1) {
if (lodash.isObjectLike(this.entity.plexPlayer[i]) && !lodash.isNil(this.entity.plexPlayer[i].server)) {
let port = false;
if (!lodash.isNil(this.entity.plexPlayer[i].server.port)) {
port = this.entity.plexPlayer[i].server.port;
}
let protocol = 'http';
if (!lodash.isNil(this.entity.plexPlayer[i].server.protocol)) {
protocol = this.entity.plexPlayer[i].server.protocol;
}
// eslint-disable-next-line no-param-reassign
this.entity.plexPlayer[i].plex = new Plex(this.entity.plexPlayer[i].server.ip, port, this.entity.plexPlayer[i].server.token, protocol);
// eslint-disable-next-line no-await-in-loop
await this.entity.plexPlayer[i].plex.getClients();
}
}
}
else if (!lodash.isNil(this.entity.plexPlayer.server) &&
!lodash.isNil(this.entity.plexPlayer.server.ip) &&
!lodash.isNil(this.entity.plexPlayer.server.token)) {
let port = false;
if (!lodash.isNil(this.entity.plexPlayer.server.port)) {
port = this.entity.plexPlayer.server.port;
}
let protocol = 'http';
if (!lodash.isNil(this.entity.plexPlayer.server.protocol)) {
protocol = this.entity.plexPlayer.server.protocol;
}
// eslint-disable-next-line no-param-reassign
this.entity.plexPlayer.plex = new Plex(this.entity.plexPlayer.server.ip, port, this.entity.plexPlayer.server.token, protocol);
// eslint-disable-next-line no-await-in-loop
await this.entity.plexPlayer.plex.getClients();
}
}
};
this.getPlexPlayerMachineIdentifier = (entity) => {
let machineIdentifier = ''; let machineIdentifier = '';
lodash.forEach(this.plex.clients, plexClient => { let { plex } = this;
let entityName = '';
if (lodash.isString(entity)) {
entityName = entity;
}
else if (lodash.isObjectLike(entity) && !lodash.isNil(entity.identifier)) {
entityName = entity.identifier;
if (!lodash.isNil(entity.plex) && entity.plex) {
plex = entity.plex;
}
}
console.log(plex.clients);
lodash.forEach(plex.clients, plexClient => {
if (lodash.isEqual(plexClient.machineIdentifier, entityName) || if (lodash.isEqual(plexClient.machineIdentifier, entityName) ||
lodash.isEqual(plexClient.product, entityName) || lodash.isEqual(plexClient.product, entityName) ||
lodash.isEqual(plexClient.name, entityName) || lodash.isEqual(plexClient.name, entityName) ||
@ -19079,9 +19129,9 @@ class PlayController {
this.isPlaySupported = (data) => { this.isPlaySupported = (data) => {
return !lodash.isEmpty(this.getPlayService(data)); return !lodash.isEmpty(this.getPlayService(data));
}; };
this.isPlexPlayerSupported = (entityName) => { this.isPlexPlayerSupported = (entity) => {
let found = false; let found = false;
if (this.getPlexPlayerMachineIdentifier(entityName)) { if (this.getPlexPlayerMachineIdentifier(entity)) {
found = true; found = true;
} }
return found || !lodash.isEqual(this.runBefore, false); return found || !lodash.isEqual(this.runBefore, false);
@ -20136,6 +20186,13 @@ class PlexMeetsHomeAssistant extends HTMLElement {
} }
this.renderNewElementsIfNeeded(); this.renderNewElementsIfNeeded();
}); });
if (this.hassObj && this.plex) {
const entityConfig = JSON.parse(JSON.stringify(this.config.entity)); // todo: find a nicer solution
this.playController = new PlayController(this.hassObj, this.plex, entityConfig, this.runBefore, this.runAfter);
if (this.playController) {
await this.playController.init();
}
}
if (this.card) { if (this.card) {
this.previousPageWidth = this.card.offsetWidth; this.previousPageWidth = this.card.offsetWidth;
} }
@ -21287,9 +21344,6 @@ class PlexMeetsHomeAssistant extends HTMLElement {
} }
set hass(hass) { set hass(hass) {
this.hassObj = hass; this.hassObj = hass;
if (this.plex) {
this.playController = new PlayController(this.hassObj, this.plex, this.config.entity, this.runBefore, this.runAfter);
}
if (!this.content) { if (!this.content) {
this.error = ''; this.error = '';
if (!this.loading) { if (!this.loading) {

@ -285,9 +285,72 @@ class PlayController {
return service; return service;
}; };
private getPlexPlayerMachineIdentifier = (entityName: string): string => { init = async (): Promise<void> => {
if (!_.isNil(this.entity.plexPlayer)) {
if (_.isArray(this.entity.plexPlayer)) {
for (let i = 0; i < this.entity.plexPlayer.length; i += 1) {
if (_.isObjectLike(this.entity.plexPlayer[i]) && !_.isNil(this.entity.plexPlayer[i].server)) {
let port: number | false = false;
if (!_.isNil(this.entity.plexPlayer[i].server.port)) {
port = this.entity.plexPlayer[i].server.port;
}
let protocol: 'http' | 'https' = 'http';
if (!_.isNil(this.entity.plexPlayer[i].server.protocol)) {
protocol = this.entity.plexPlayer[i].server.protocol;
}
// eslint-disable-next-line no-param-reassign
this.entity.plexPlayer[i].plex = new Plex(
this.entity.plexPlayer[i].server.ip,
port,
this.entity.plexPlayer[i].server.token,
protocol
);
// eslint-disable-next-line no-await-in-loop
await this.entity.plexPlayer[i].plex.getClients();
}
}
} else if (
!_.isNil(this.entity.plexPlayer.server) &&
!_.isNil(this.entity.plexPlayer.server.ip) &&
!_.isNil(this.entity.plexPlayer.server.token)
) {
let port: number | false = false;
if (!_.isNil(this.entity.plexPlayer.server.port)) {
port = this.entity.plexPlayer.server.port;
}
let protocol: 'http' | 'https' = 'http';
if (!_.isNil(this.entity.plexPlayer.server.protocol)) {
protocol = this.entity.plexPlayer.server.protocol;
}
// eslint-disable-next-line no-param-reassign
this.entity.plexPlayer.plex = new Plex(
this.entity.plexPlayer.server.ip,
port,
this.entity.plexPlayer.server.token,
protocol
);
// eslint-disable-next-line no-await-in-loop
await this.entity.plexPlayer.plex.getClients();
}
}
};
private getPlexPlayerMachineIdentifier = (entity: string | Record<string, any>): string => {
let machineIdentifier = ''; let machineIdentifier = '';
_.forEach(this.plex.clients, plexClient => {
let { plex } = this;
let entityName = '';
if (_.isString(entity)) {
entityName = entity;
} else if (_.isObjectLike(entity) && !_.isNil(entity.identifier)) {
entityName = entity.identifier;
if (!_.isNil(entity.plex) && entity.plex) {
plex = entity.plex;
}
}
console.log(plex.clients);
_.forEach(plex.clients, plexClient => {
if ( if (
_.isEqual(plexClient.machineIdentifier, entityName) || _.isEqual(plexClient.machineIdentifier, entityName) ||
_.isEqual(plexClient.product, entityName) || _.isEqual(plexClient.product, entityName) ||
@ -306,11 +369,12 @@ class PlayController {
return !_.isEmpty(this.getPlayService(data)); return !_.isEmpty(this.getPlayService(data));
}; };
private isPlexPlayerSupported = (entityName: string): boolean => { private isPlexPlayerSupported = (entity: string | Record<string, any>): boolean => {
let found = false; let found = false;
if (this.getPlexPlayerMachineIdentifier(entityName)) { if (this.getPlexPlayerMachineIdentifier(entity)) {
found = true; found = true;
} }
return found || !_.isEqual(this.runBefore, false); return found || !_.isEqual(this.runBefore, false);
}; };

@ -117,15 +117,6 @@ class PlexMeetsHomeAssistant extends HTMLElement {
set hass(hass: HomeAssistant) { set hass(hass: HomeAssistant) {
this.hassObj = hass; this.hassObj = hass;
if (this.plex) {
this.playController = new PlayController(
this.hassObj,
this.plex,
this.config.entity,
this.runBefore,
this.runAfter
);
}
if (!this.content) { if (!this.content) {
this.error = ''; this.error = '';
@ -211,6 +202,15 @@ class PlexMeetsHomeAssistant extends HTMLElement {
} }
this.renderNewElementsIfNeeded(); this.renderNewElementsIfNeeded();
}); });
if (this.hassObj && this.plex) {
const entityConfig: Record<string, any> = JSON.parse(JSON.stringify(this.config.entity)); // todo: find a nicer solution
this.playController = new PlayController(this.hassObj, this.plex, entityConfig, this.runBefore, this.runAfter);
if (this.playController) {
await this.playController.init();
}
}
if (this.card) { if (this.card) {
this.previousPageWidth = this.card.offsetWidth; this.previousPageWidth = this.card.offsetWidth;
} }

Loading…
Cancel
Save