diff --git a/scripts/updateRequestsInPlex.js b/scripts/updateRequestsInPlex.js index 409041a..c2c818c 100644 --- a/scripts/updateRequestsInPlex.js +++ b/scripts/updateRequestsInPlex.js @@ -16,11 +16,6 @@ const queries = { const getByStatus = () => establishedDatabase.all(queries.getRequestsNotYetInPlex); -const checkIfRequestExistInPlex = async request => { - request.existsInPlex = await plex.existsInPlex(request); - return request; -}; - const commitNewStatus = (status, id, type, title) => { console.log(type, title, "updated to:", status); return establishedDatabase.run(queries.saveNewStatus, [status, id, type]); @@ -29,12 +24,12 @@ const commitNewStatus = (status, id, type, title) => { const getNewRequestMatchesInPlex = async () => { const requests = await getByStatus(); - return Promise.all(requests.map(checkIfRequestExistInPlex)) + return Promise.all(requests.map(plex.inPlex)) .catch(error => console.log("error from checking plex for existance:", error) ) .then(matchedRequests => - matchedRequests.filter(request => request.existsInPlex) + matchedRequests.filter(request => request.matchedInPlex) ); }; diff --git a/src/plex/plexRepository.js b/src/plex/plexRepository.js index ddb552f..8babee2 100644 --- a/src/plex/plexRepository.js +++ b/src/plex/plexRepository.js @@ -41,9 +41,12 @@ class PlexRepository { inPlex(_tmdbResult) { const tmdbResult = { ..._tmdbResult }; - this.search(tmdbResult.title) + + return this.search(tmdbResult.title) .then(plexResult => addAttributeIfTmdbInPlex(tmdbResult, plexResult)) .catch(() => { + // log("some error here::", error); + /** * If something crashes with search from this function it probably * fine to set the `matchedInPlex` attribute to false and return diff --git a/src/webserver/controllers/plex/readRequest.js b/src/webserver/controllers/plex/readRequest.js index e03cdd3..ff6617a 100644 --- a/src/webserver/controllers/plex/readRequest.js +++ b/src/webserver/controllers/plex/readRequest.js @@ -14,7 +14,7 @@ function readRequestController(req, res) { requestRepository .lookup(mediaId, type) .then(movies => { - res.send(movies); + res.send(movies || {}); }) .catch(error => { res.status(404).send({ success: false, message: error.message }); diff --git a/src/webserver/middleware/mustHaveAccountLinkedToPlex.js b/src/webserver/middleware/mustHaveAccountLinkedToPlex.js index e4b7d54..2b1f395 100644 --- a/src/webserver/middleware/mustHaveAccountLinkedToPlex.js +++ b/src/webserver/middleware/mustHaveAccountLinkedToPlex.js @@ -18,7 +18,8 @@ const mustHaveAccountLinkedToPlex = (req, res, next) => { req.loggedInUser.username ) .then(row => { - const plexUserId = row.plex_userid; + const plexUserId = row?.plex_userid || null; + if (plexUserId === null) { return res.status(403).send({ success: false,