wisecolt/flixinfo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug fix and add promise feature

Browse Source
This commit is contained in:
Wise Colt
2020-03-28 02:51:44 +03:00
parent c2b55c6f0b
commit b8a3d6dcbb
4 changed files with 164 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

183
lib/index.js
View File

@@ -6,6 +6,7 @@ const config = require('../config');
// Modules // Modules
const modules = require('./module'); const modules = require('./module');
class FlixInfo { class FlixInfo {
constructor(opt = '') { constructor(opt = '') {
@@ -14,10 +15,12 @@ class FlixInfo {
this.tmdbApiKey = opt; this.tmdbApiKey = opt;
} }
getInfo(netflixId, cb) {
getInfo(netflixId) {
// Imdb id page // Imdb id page
const flixableURL = config.filexibleURL + netflixId; const flixableURL = config.filexibleURL + netflixId;
// The Movie DB api page // The Movie DB api page
const theMovieDbURL = config.theMovieDbURL; const theMovieDbURL = config.theMovieDbURL;
// API Key // API Key
@@ -25,101 +28,115 @@ class FlixInfo {
// Result Object // Result Object
var returnResult = {}; var returnResult = {};
request(flixableURL, (err, response, body) => { return new Promise((resolve, reject) => {
if (err) {
returnResult = { error: 1, errorMsg: 'flixable.com connection error' };
cb(returnResult)
}
else {
const $ = cheerio.load(body, {
normalizeWhitespace: true,
xmlMode: true
});
const imdbResult = $('[class="imdbRatingPlugin"]').length; request(flixableURL, (err, response, body) => {
if (err) {
returnResult = { error: 1, errorMsg: 'flixable.com connection error' };
reject(returnResult);
}
else {
const $ = cheerio.load(body, {
normalizeWhitespace: true,
xmlMode: true
});
if (imdbResult) { const imdbResult = $('[class="imdbRatingPlugin"]').length;
$('[class="imdbRatingPlugin"]').each(function (i, element) { let netflixButton = null;
// find imdb id attribute and catch try {
const imdbId = $(this).attr('data-title'); netflixButton = /class=\"btn btn-primary watch-on-netflix\"(.*?)/img.exec(body)[0];
// create (find) tmdb api url } catch (error) {
const tmdbURL = theMovieDbURL + 'find/' + imdbId + '?api_key=' + tmdbApiKey + '&language=en-EN&external_source=imdb_id' returnResult = { error: 1, errorMsg: 'this content was not found!' };
reject(returnResult)
}
request(tmdbURL, (err, resultBody, body) => {
// Api find all result (for get tmdb id)
const getJson = JSON.parse(resultBody.body);
if (getJson.status_code > 1) {
// if wrong api key error
returnResult = { error: 1, errorMsg: 'tmdb find id wrong api key error' };
cb(returnResult)
}
else {
if (err) { if (netflixButton != null) {
// if thmdb api connection error const imdbId = ($($('[class="imdbRatingPlugin"]')).attr('data-title'));
returnResult = { error: 1, errorMsg: 'tmdb find id connection api error' };
cb(returnResult) if (imdbId) {
// create (find) tmdb api url
const tmdbURL = theMovieDbURL + 'find/' + imdbId + '?api_key=' + tmdbApiKey + '&language=en-EN&external_source=imdb_id'
request(tmdbURL, (err, resultBody, body) => {
// Api find all result (for get tmdb id)
const getJson = JSON.parse(resultBody.body);
if (getJson.status_code > 1) {
// if wrong api key error
returnResult = { error: 1, errorMsg: 'tmdb find id wrong api key error' };
reject(returnResult)
} }
else { else {
// if tmdb api result not empty if (err) {
if (getJson.tv_results.length || getJson.movie_results.length) { // if thmdb api connection error
returnResult = { error: 1, errorMsg: 'tmdb find id connection api error' };
if (getJson.movie_results.length) { reject(returnResult)
var watchParameter = 'movie';
var thmdbId = getJson.movie_results[0].id;
}
else if (getJson.tv_results.length) {
var watchParameter = 'tv';
var thmdbId = getJson.tv_results[0].id;
}
// Get detail info
modules.getDetails(thmdbId, watchParameter, tmdbApiKey, (err, getDetailResult) => {
if (err) {
returnResult = { error: 1, errorMsg: err };
cb(returnResult);
}
else {
// Get credits info
modules.getCredits(thmdbId, watchParameter, tmdbApiKey, (err, getCreditsResult) => {
if (err) {
returnResult = { error: 1, errorMsg: err };
cb(returnResult);
}
else {
// Get images info
modules.getImages(thmdbId, watchParameter, tmdbApiKey, (err, getImagesResult) => {
if (err) {
returnResult = { error: 1, errorMsg: err };
cb(returnResult);
}
else {
returnResult = { result: 1, error: 0, watch: watchParameter, details: getDetailResult, credits: getCreditsResult, images: getImagesResult };
cb(returnResult);
}
});
}
});
}
});
} }
else { else {
// Return the empty result if tmdb return empty
const returnResult = { result: 0, error: 0, msg: 'tmdb api return is empty'}; // if tmdb api result not empty
cb(returnResult) if (getJson.tv_results.length || getJson.movie_results.length) {
if (getJson.movie_results.length) {
var watchParameter = 'movie';
var thmdbId = getJson.movie_results[0].id;
}
else if (getJson.tv_results.length) {
var watchParameter = 'tv';
var thmdbId = getJson.tv_results[0].id;
}
// Get detail info
modules.getDetails(thmdbId, watchParameter, tmdbApiKey, (err, getDetailResult) => {
if (err) {
returnResult = { error: 1, errorMsg: err };
reject(returnResult);
}
else {
// Get credits info
modules.getCredits(thmdbId, watchParameter, tmdbApiKey, (err, getCreditsResult) => {
if (err) {
returnResult = { error: 1, errorMsg: err };
reject(returnResult);
}
else {
// Get images info
modules.getImages(thmdbId, watchParameter, tmdbApiKey, (err, getImagesResult) => {
if (err) {
returnResult = { error: 1, errorMsg: err };
reject(returnResult);
}
else {
returnResult = { result: 1, error: 0, watch: watchParameter, details: getDetailResult, credits: getCreditsResult, images: getImagesResult };
resolve(returnResult);
}
});
}
});
}
});
}
else {
// Return the empty result if tmdb return empty
const returnResult = { result: 0, error: 0, msg: 'tmdb api return is empty' };
reject(returnResult)
}
} }
} }
} });
}); } else {
}) returnResult = { error: 1, errorMsg: 'imdb id not found.' };
reject(returnResult)
}
}
else {
// Return the empty result if imdb id cannot be found
const returnResult = { result: 0, error: 0, msg: 'imdb id cannot be found' };
reject(returnResult)
}
} }
else { });
// Return the empty result if imdb id cannot be found
const returnResult = { result: 0, error: 0, msg: 'imdb id cannot be found' };
cb(returnResult)
}
}
}); });
} }
} }

5
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "flixinfo", "name": "flixinfo",
"version": "1.0.4", "version": "1.1.0",
"description": "Get movie detail with netflix id", "description": "Get movie detail with netflix id",
"main": "index.js", "main": "index.js",
"directories": { "directories": {
@@ -27,8 +27,9 @@
}, },
"homepage": "https://github.com/sbilketay/flixinfo#readme", "homepage": "https://github.com/sbilketay/flixinfo#readme",
"dependencies": { "dependencies": {
"chai-as-promised": "^7.1.1",
"cheerio": "^1.0.0-rc.2", "cheerio": "^1.0.0-rc.2",
"nodemon": "^1.18.9", "nodemon": "^1.19.4",
"request": "^2.88.0" "request": "^2.88.0"
}, },
"devDependencies": { "devDependencies": {

96
test/flixinfo.test.js
View File

@@ -21,69 +21,75 @@ describe('Flix Info', () => {
const flixinfoWrongApiKey = new GetFlix('sfs345k34jlkdflgkjdfglk435j345klj'); const flixinfoWrongApiKey = new GetFlix('sfs345k34jlkdflgkjdfglk435j345klj');
flixinfoWrongApiKey.getInfo(70143836, (result) => { flixinfoWrongApiKey.getInfo(70143836)
result.should.have.property('error').equal(1); .catch(result => {
result.should.have.property('errorMsg').equal('tmdb find id wrong api key error'); result.should.have.property('error').equal(1);
done(); result.should.have.property('errorMsg').equal('tmdb find id wrong api key error');
}); done();
})
}); });
}); });
}); });
describe('#getInfo()', () => { describe('#getInfo()', () => {
const flixinfo = new GetFlix('f29e56ff85f361ff01b5c5403a343021'); const flixinfo = new GetFlix('d9d6007d1bcf12043db5a085ae3e5bbb');
context('Return result infos', () => { context('Return result infos', () => {
// Movie test // Movie test
it('- movies return right result', (done) => { it('- movies return right result', (done) => {
flixinfo.getInfo(60033299, (result) => { flixinfo.getInfo(70131314)
result.should.have.property('result').equal(1); .then(result => {
result.should.have.property('error').equal(0); result.should.have.property('result').equal(1);
result.should.have.property('details').have.property('original_title').equal('The Butterfly Effect'); result.should.have.property('error').equal(0);
result.should.have.property('details').have.property('title').equal('The Butterfly Effect'); result.should.have.property('details').have.property('original_title').equal('Inception');
result.should.have.property('details').have.property('release_date').equal('2004-01-22'); result.should.have.property('details').have.property('title').equal('Inception');
result.should.have.property('details').have.property('poster_path').equal('/3PAQy3CyNNJPES772OFMx47lFEE.jpg'); result.should.have.property('details').have.property('release_date').equal('2010-07-15');
result.should.have.property('details').have.property('backdrop_path').equal('/zXTUrm0BIrrZn3nEhybg0hlY275.jpg'); result.should.have.property('details').have.property('poster_path').equal('/qmDpIHrmpJINaRKAfWQfftjCdyi.jpg');
result.should.have.property('details').have.property('id').equal(1954); result.should.have.property('details').have.property('backdrop_path').equal('/s2bT29y0ngXxxu2IA8AOzzXTRhd.jpg');
result.should.have.property('details').have.property('imdb_id').equal('tt0289879'); result.should.have.property('details').have.property('id').equal(27205);
result.should.have.property('details').have.property('original_language').equal('en'); result.should.have.property('details').have.property('imdb_id').equal('tt1375666');
result.should.have.property('credits').have.property('id').equal(1954); result.should.have.property('details').have.property('original_language').equal('en');
result.should.have.property('images').have.property('id').equal(1954); result.should.have.property('credits').have.property('id').equal(27205);
done(); result.should.have.property('images').have.property('id').equal(27205);
}); done();
})
}); });
// Tv test // // Tv test
it('- tv series return right result', (done) => { it('- tv series return right result', (done) => {
flixinfo.getInfo(80099656, (result) => { flixinfo.getInfo(80232926)
result.should.have.property('result').equal(1); .then(result => {
result.should.have.property('error').equal(0); result.should.have.property('result').equal(1);
result.should.have.property('details').have.property('original_name').equal('Frontier'); result.should.have.property('error').equal(0);
result.should.have.property('details').have.property('name').equal('Frontier'); result.should.have.property('details').have.property('original_name').equal('Ragnarok');
result.should.have.property('details').have.property('first_air_date').equal('2016-11-06'); result.should.have.property('details').have.property('name').equal('Ragnarok');
result.should.have.property('details').have.property('poster_path').equal('/mhIeCeYgG4WJHNzaw2EyRpvmGX8.jpg'); result.should.have.property('details').have.property('first_air_date').equal('2020-01-31');
result.should.have.property('details').have.property('backdrop_path').equal('/hDYEGNX6CADoCqhyBbe2Qu7rKVG.jpg'); result.should.have.property('details').have.property('poster_path').equal('/bSXE4qqdWWFF903FmxSdKtVRm7t.jpg');
result.should.have.property('details').have.property('id').equal(64555); result.should.have.property('details').have.property('backdrop_path').equal('/jM7LHr811U4A6EnY9iMyKhUVsMN.jpg');
result.should.have.property('details').have.property('original_language').equal('en'); result.should.have.property('details').have.property('id').equal(91557);
result.should.have.property('credits').have.property('id').equal(64555); result.should.have.property('details').have.property('original_language').equal('no');
result.should.have.property('images').have.property('id').equal(64555); result.should.have.property('credits').have.property('id').equal(91557);
done(); result.should.have.property('images').have.property('id').equal(91557);
}); done();
});
}); });
it('- return empty result', (done) => { it('- return empty result', (done) => {
flixinfo.getInfo(23424, (result) => { flixinfo.getInfo(70143836)
result.should.have.property('error').equal(0); .then(result => {
done(); result.should.have.property('error').equal(0);
}); done();
});
}); });
it('- flixable.com and tmdb.com connection error', (done) => { it('- flixable.com and tmdb.com connection error', (done) => {
nock.disableNetConnect(); //Prevents making request external connection nock.disableNetConnect(); //Prevents making request external connection
flixinfo.getInfo(70143836, (result) => { flixinfo.getInfo(70143836)
result.should.have.property('error').equal(1); .catch(result => {
result.should.have.property('errorMsg'); result.should.have.property('error').equal(1);
done(); result.should.have.property('errorMsg');
}); done();
});
}); });
}); });
}); });