From e3ed08e8dd36afec0481a06060526dd5e04025a1 Mon Sep 17 00:00:00 2001 From: KevinMidboe Date: Tue, 4 Jun 2019 23:45:22 +0200 Subject: [PATCH] Now a plex ip address is dynamically passed into the plexrepository, fetched from the config --- seasoned_api/src/plex/plexRepository.js | 8 ++++++-- seasoned_api/src/plex/requestRepository.js | 2 +- .../src/webserver/controllers/plex/plexPlaying.js | 3 ++- .../src/webserver/controllers/plex/searchMedia.js | 3 ++- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/seasoned_api/src/plex/plexRepository.js b/seasoned_api/src/plex/plexRepository.js index 395cf0b..88f26fb 100644 --- a/seasoned_api/src/plex/plexRepository.js +++ b/seasoned_api/src/plex/plexRepository.js @@ -3,6 +3,10 @@ const convertPlexToStream = require('src/plex/convertPlexToStream'); const rp = require('request-promise'); class PlexRepository { + constructor(plexIP) { + this.plexIP = plexIP; + } + inPlex(tmdbResult) { return Promise.resolve() .then(() => this.search(tmdbResult.title)) @@ -17,7 +21,7 @@ class PlexRepository { search(query) { console.log('searching:', query) const options = { - uri: `http://10.0.0.44:32400/search?query=${query}`, + uri: `http://${plexIP}:32400/search?query=${query}`, headers: { Accept: 'application/json', }, @@ -65,7 +69,7 @@ class PlexRepository { nowPlaying() { const options = { - uri: 'http://10.0.0.44:32400/status/sessions', + uri: `http://${plexIP}:32400/status/sessions`, headers: { Accept: 'application/json', }, diff --git a/seasoned_api/src/plex/requestRepository.js b/seasoned_api/src/plex/requestRepository.js index 7006758..28e4d9a 100644 --- a/seasoned_api/src/plex/requestRepository.js +++ b/seasoned_api/src/plex/requestRepository.js @@ -4,7 +4,7 @@ const configuration = require('src/config/configuration').getInstance(); const TMDB = require('src/tmdb/tmdb'); const establishedDatabase = require('src/database/database'); -const plexRepository = new PlexRepository(); +const plexRepository = new PlexRepository(configuration.get('plex', 'ip')); const cache = new Cache(); const tmdb = new TMDB(cache, configuration.get('tmdb', 'apiKey')); diff --git a/seasoned_api/src/webserver/controllers/plex/plexPlaying.js b/seasoned_api/src/webserver/controllers/plex/plexPlaying.js index a14ec6a..5bc2d59 100644 --- a/seasoned_api/src/webserver/controllers/plex/plexPlaying.js +++ b/seasoned_api/src/webserver/controllers/plex/plexPlaying.js @@ -1,6 +1,7 @@ const PlexRepository = require('src/plex/plexRepository'); +const configuration = require('src/config/configuration').getInstance(); -const plexRepository = new PlexRepository(); +const plexRepository = new PlexRepository(onfiguration.get('plex', 'ip')); function playingController(req, res) { plexRepository.nowPlaying() diff --git a/seasoned_api/src/webserver/controllers/plex/searchMedia.js b/seasoned_api/src/webserver/controllers/plex/searchMedia.js index 3351f6c..e70311a 100644 --- a/seasoned_api/src/webserver/controllers/plex/searchMedia.js +++ b/seasoned_api/src/webserver/controllers/plex/searchMedia.js @@ -1,6 +1,7 @@ const PlexRepository = require('src/plex/plexRepository'); +const configuration = require('src/config/configuration').getInstance(); -const plexRepository = new PlexRepository(); +const plexRepository = new PlexRepository(onfiguration.get('plex', 'ip')); /** * Controller: Search for media and check existence