KevinMidboe/seasonedShows
1
0
Fork 0
Code Issues 20 Pull Requests 2 Packages Projects Releases 8 Wiki Activity

Changed tmdb constructor to have apiKey as first parameter. If cache is not defined we use redis.

Browse Source
This commit is contained in:
Kevin
2020-04-08 22:54:19 +02:00
parent 578eff30fb
commit 815aaedffb
12 changed files with 17 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
seasoned_api/src/tmdb/tmdb.js
View File

@@ -27,9 +27,10 @@ const tmdbErrorResponse = (error, typeString=undefined) => {
} }
class TMDB { class TMDB {
constructor(cache, apiKey, tmdbLibrary) { constructor(apiKey, cache, tmdbLibrary) {
this.cache = cache || redisCache;
this.tmdbLibrary = tmdbLibrary || moviedb(apiKey); this.tmdbLibrary = tmdbLibrary || moviedb(apiKey);
this.cache = cache || redisCache;
this.cacheTags = { this.cacheTags = {
multiSearch: 'mus', multiSearch: 'mus',
movieSearch: 'mos', movieSearch: 'mos',

4
seasoned_api/src/webserver/controllers/list/listController.js
View File

@@ -1,8 +1,6 @@
const configuration = require('src/config/configuration').getInstance(); const configuration = require('src/config/configuration').getInstance();
const Cache = require('src/tmdb/cache');
const TMDB = require('src/tmdb/tmdb'); const TMDB = require('src/tmdb/tmdb');
const cache = new Cache(); const tmdb = new TMDB(configuration.get('tmdb', 'apiKey'));
const tmdb = new TMDB(cache, configuration.get('tmdb', 'apiKey'));
// there should be a translate function from query params to // there should be a translate function from query params to
// tmdb list that is valid. Should it be a helper function or does it // tmdb list that is valid. Should it be a helper function or does it

6
seasoned_api/src/webserver/controllers/movie/credits.js
View File

@@ -1,9 +1,7 @@
const configuration = require('src/config/configuration').getInstance(); const configuration = require('src/config/configuration').getInstance();
const Cache = require('src/tmdb/cache');
const TMDB = require('src/tmdb/tmdb'); const TMDB = require('src/tmdb/tmdb');
const cache = new Cache(); const tmdb = new TMDB(configuration.get('tmdb', 'apiKey'));
const tmdb = new TMDB(cache, configuration.get('tmdb', 'apiKey'));
const movieCreditsController = (req, res) => { const movieCreditsController = (req, res) => {
const movieId = req.params.id; const movieId = req.params.id;
@@ -23,4 +21,4 @@ const movieCreditsController = (req, res) => {
}) })
} }
module.exports = movieCreditsController; module.exports = movieCreditsController;

4
seasoned_api/src/webserver/controllers/movie/info.js
View File

@@ -1,9 +1,7 @@
const configuration = require('src/config/configuration').getInstance(); const configuration = require('src/config/configuration').getInstance();
const Cache = require('src/tmdb/cache');
const TMDB = require('src/tmdb/tmdb'); const TMDB = require('src/tmdb/tmdb');
const Plex = require('src/plex/plex'); const Plex = require('src/plex/plex');
const cache = new Cache(); const tmdb = new TMDB(configuration.get('tmdb', 'apiKey'));
const tmdb = new TMDB(cache, configuration.get('tmdb', 'apiKey'));
const plex = new Plex(configuration.get('plex', 'ip')); const plex = new Plex(configuration.get('plex', 'ip'));
function handleError(error, res) { function handleError(error, res) {

6
seasoned_api/src/webserver/controllers/movie/releaseDates.js
View File

@@ -1,9 +1,7 @@
const configuration = require('src/config/configuration').getInstance(); const configuration = require('src/config/configuration').getInstance();
const Cache = require('src/tmdb/cache');
const TMDB = require('src/tmdb/tmdb'); const TMDB = require('src/tmdb/tmdb');
const cache = new Cache(); const tmdb = new TMDB(configuration.get('tmdb', 'apiKey'));
const tmdb = new TMDB(cache, configuration.get('tmdb', 'apiKey'));
const movieReleaseDatesController = (req, res) => { const movieReleaseDatesController = (req, res) => {
const movieId = req.params.id; const movieId = req.params.id;
@@ -23,4 +21,4 @@ const movieReleaseDatesController = (req, res) => {
}) })
} }
module.exports = movieReleaseDatesController; module.exports = movieReleaseDatesController;

4
seasoned_api/src/webserver/controllers/person/info.js
View File

@@ -1,8 +1,6 @@
const configuration = require('src/config/configuration').getInstance(); const configuration = require('src/config/configuration').getInstance();
const Cache = require('src/tmdb/cache');
const TMDB = require('src/tmdb/tmdb'); const TMDB = require('src/tmdb/tmdb');
const cache = new Cache(); const tmdb = new TMDB(configuration.get('tmdb', 'apiKey'));
const tmdb = new TMDB(cache, configuration.get('tmdb', 'apiKey'));
/** /**
* Controller: Retrieve information for a person * Controller: Retrieve information for a person

4
seasoned_api/src/webserver/controllers/search/movieSearch.js
View File

@@ -1,9 +1,7 @@
const configuration = require('src/config/configuration').getInstance(); const configuration = require('src/config/configuration').getInstance();
const Cache = require('src/tmdb/cache');
const TMDB = require('src/tmdb/tmdb'); const TMDB = require('src/tmdb/tmdb');
const SearchHistory = require('src/searchHistory/searchHistory'); const SearchHistory = require('src/searchHistory/searchHistory');
const cache = new Cache(); const tmdb = new TMDB(configuration.get('tmdb', 'apiKey'));
const tmdb = new TMDB(cache, configuration.get('tmdb', 'apiKey'));
const searchHistory = new SearchHistory(); const searchHistory = new SearchHistory();
/** /**

4
seasoned_api/src/webserver/controllers/search/multiSearch.js
View File

@@ -1,9 +1,7 @@
const configuration = require('src/config/configuration').getInstance(); const configuration = require('src/config/configuration').getInstance();
const Cache = require('src/tmdb/cache');
const TMDB = require('src/tmdb/tmdb'); const TMDB = require('src/tmdb/tmdb');
const SearchHistory = require('src/searchHistory/searchHistory'); const SearchHistory = require('src/searchHistory/searchHistory');
const cache = new Cache(); const tmdb = new TMDB(configuration.get('tmdb', 'apiKey'));
const tmdb = new TMDB(cache, configuration.get('tmdb', 'apiKey'));
const searchHistory = new SearchHistory(); const searchHistory = new SearchHistory();
function checkAndCreateJsonResponse(result) { function checkAndCreateJsonResponse(result) {

4
seasoned_api/src/webserver/controllers/search/personSearch.js
View File

@@ -1,9 +1,7 @@
const configuration = require('src/config/configuration').getInstance(); const configuration = require('src/config/configuration').getInstance();
const Cache = require('src/tmdb/cache');
const TMDB = require('src/tmdb/tmdb'); const TMDB = require('src/tmdb/tmdb');
const SearchHistory = require('src/searchHistory/searchHistory'); const SearchHistory = require('src/searchHistory/searchHistory');
const cache = new Cache(); const tmdb = new TMDB(configuration.get('tmdb', 'apiKey'));
const tmdb = new TMDB(cache, configuration.get('tmdb', 'apiKey'));
const searchHistory = new SearchHistory(); const searchHistory = new SearchHistory();
/** /**

4
seasoned_api/src/webserver/controllers/search/showSearch.js
View File

@@ -1,9 +1,7 @@
const SearchHistory = require('src/searchHistory/searchHistory'); const SearchHistory = require('src/searchHistory/searchHistory');
const configuration = require('src/config/configuration').getInstance(); const configuration = require('src/config/configuration').getInstance();
const Cache = require('src/tmdb/cache');
const TMDB = require('src/tmdb/tmdb'); const TMDB = require('src/tmdb/tmdb');
const cache = new Cache(); const tmdb = new TMDB(configuration.get('tmdb', 'apiKey'));
const tmdb = new TMDB(cache, configuration.get('tmdb', 'apiKey'));
const searchHistory = new SearchHistory(); const searchHistory = new SearchHistory();
/** /**

7
seasoned_api/src/webserver/controllers/show/credits.js
View File

@@ -1,9 +1,6 @@
const configuration = require('src/config/configuration').getInstance(); const configuration = require('src/config/configuration').getInstance();
const Cache = require('src/tmdb/cache');
const TMDB = require('src/tmdb/tmdb'); const TMDB = require('src/tmdb/tmdb');
const tmdb = new TMDB(configuration.get('tmdb', 'apiKey'));
const cache = new Cache();
const tmdb = new TMDB(cache, configuration.get('tmdb', 'apiKey'));
const showCreditsController = (req, res) => { const showCreditsController = (req, res) => {
const showId = req.params.id; const showId = req.params.id;
@@ -23,4 +20,4 @@ const showCreditsController = (req, res) => {
}) })
} }
module.exports = showCreditsController; module.exports = showCreditsController;

4
seasoned_api/src/webserver/controllers/show/info.js
View File

@@ -1,9 +1,7 @@
const configuration = require('src/config/configuration').getInstance(); const configuration = require('src/config/configuration').getInstance();
const Cache = require('src/tmdb/cache');
const TMDB = require('src/tmdb/tmdb'); const TMDB = require('src/tmdb/tmdb');
const Plex = require('src/plex/plex'); const Plex = require('src/plex/plex');
const cache = new Cache(); const tmdb = new TMDB(configuration.get('tmdb', 'apiKey'));
const tmdb = new TMDB(cache, configuration.get('tmdb', 'apiKey'));
const plex = new Plex(configuration.get('plex', 'ip')); const plex = new Plex(configuration.get('plex', 'ip'));
function handleError(error, res) { function handleError(error, res) {