Merge branch 'release/1.0.5'

Author: aespinilla

.gitlab-ci.yml

@@ -6,7 +6,6 @@ stages:
 
 before_script:
   - export GITHUB_TOKEN="$GITHUB_TOKEN"
-  - npm install -g github-release-cli
 
 deploy:npm:
   stage: deploy
@@ -25,4 +24,5 @@ release:github:
   only:
     - tags
   script:
+    - npm install -g github-release-cli
     - github-release upload --owner="$GITHUB_USER" --repo=faparser --tag="$CI_COMMIT_TAG" --name="$CI_COMMIT_TAG" --body="Release $CI_COMMIT_TAG"

faparser.js

@@ -1,6 +1,6 @@
-var parser = require('./parser')
-var requestfa = require('./requestfa')
-var Promise = require('promise')
+const parser = require('./parser')
+const requestfa = require('./requestfa')
+const Promise = require('promise')
 
 module.exports = {
     film: film,
@@ -13,33 +13,34 @@ module.exports = {
     CAST: 'CAST'
 }
 
-function search(data){
-    return new Promise(function(resolve, reject){
-        var now = new Date()
+function search(data) {
+    return new Promise(function (resolve, reject) {
+        const now = new Date()
         data.isFilm = false
-        requestfa.FArequest(data).then(function(res){
+        requestfa.FArequest(data).then(function (res) {
             res.lang = data.lang
             res.type = data.type
-            var result = parser.parseSearch(res)
-            var diff = new Date().getTime() - now.getTime()
-            console.log('Process time: '+diff+'ms succesfully for data: '+JSON.stringify(data)+' with result count: '+result.result.length)
+            const result = parser.parseSearch(res)
+            log(now, data, result.result)
             return resolve(result)
-        }).catch(function(error){
-            console.log(error)
-            var diff = new Date().getTime() - now.getTime()
-            console.log('Process time: '+diff+'ms for data: '+JSON.stringify(data)+' with error: '+error)
-            return reject(error)
+        }).catch(function (error) {
+            console.error('[' + new Date() + '] faparser: ' + JSON.stringify(error))
+            log(now, data, {error: error})
+            return reject({
+                code: error.code,
+                error: error.error
+            })
         })
     })
 }
 
-function preview(data){
-    return new Promise(function(resolve, reject){
-        var now = new Date()
+function preview(data) {
+    return new Promise(function (resolve, reject) {
+        const now = new Date()
         data.isFilm = true
-        requestfa.FArequest(data).then(function(result){
-            var film = parser.parseFilm(result)
-            var filmResult = {
+        requestfa.FArequest(data).then(function (result) {
+            const film = parser.parseFilm(result)
+            const filmResult = {
                 id: data.id,
                 url: film.url,
                 thumbnail: film.imageUrlMed.replace("mmed", "msmall"),
@@ -48,62 +49,70 @@ function preview(data){
                 directors: film.directors,
                 cast: film.cast,
                 country: film.country,
-                rating: data.lang == 'es' && film.rating?film.rating.replace('.',','):film.rating,
+                rating: film.rating ? film.rating.replace(',', '.') : 0,
                 votes: film.votes
             }
-            var diff = new Date().getTime() - now.getTime()
-            console.log('Process time: '+diff+'ms succesfully for preview data: '+JSON.stringify(data)+' with film title: '+film.title)
+            log(now, data, film)
             return resolve(filmResult)
-        }).catch(function(e){
-            return reject(e)
+        }).catch(function (error) {
+            console.error('[' + new Date() + '] faparser: ' + JSON.stringify(error))
+            log(now, data, {error: error})
+            return reject({
+                code: error.code,
+                error: error.error
+            })
         })
     })
 }
 
-function film(data){
+function film(data) {
     return new Promise(function (resolve, reject) {
-        var now = new Date()
+        const now = new Date()
         data.isFilm = true
-        filmTaskPromise(data).then(function(film){
-            var diff = new Date().getTime() - now.getTime()
-            console.log('Process time: '+diff+'ms succesfully for data: '+JSON.stringify(data)+' with film title: '+film.title)
+        filmTaskPromise(data).then(function (film) {
+            log(now, data, film)
             return resolve(film)
-        }).catch(function(error){
-            console.log(error)
-            var diff = new Date().getTime() - now.getTime()
-            console.log('Process time: '+diff+'ms for data: '+JSON.stringify(data)+' with error: '+error)
-            return reject(error)
+        }).catch(function (error) {
+            console.error('[' + new Date() + '] faparser: ' + JSON.stringify(error))
+            log(now, data, {error: error})
+            return reject({
+                code: error.code,
+                error: error.error
+            })
         })
     })
 }
 
-function filmTaskPromise(data){
-    return new Promise(function(resolve, reject){
-        var f  = data
-        var t = clone(data)
+function filmTaskPromise(data) {
+    return new Promise(function (resolve, reject) {
+        const f = data
+        const t = clone(data)
         t.isFilm = false
         t.type = 'TRAILERS'
-        var i = clone(data)
+        const i = clone(data)
         i.isFilm = false
         i.type = 'IMAGES'
-        var r = clone(data)
+        const r = clone(data)
         r.isFilm = false
         r.type = 'PRO_REVIEWS'
 
         Promise.all([requestfa.FArequest(f), requestfa.FArequest(i), requestfa.FArequest(t), requestfa.FArequest(r)])
-            .then(function(result){
-                var film = parser.parseFilm(result[0])
+            .then(function (result) {
+                const film = parser.parseFilm(result[0])
                 film.id = data.id
                 film.images = parser.parseImages(result[1])
                 film.trailers = parser.parseTrailers(result[2])
                 film.proReviews = parser.parseProReviews(result[3])
                 return resolve(film)
-            }).catch(function(error){
-                return reject(error)
-            })
+            }).catch(reject)
     })
 }
 
-function clone(o){
+function clone(o) {
     return JSON.parse(JSON.stringify(o))
+}
+
+function log(now, data, response) {
+    const diff = new Date().getTime() - now.getTime()
+    console.info('[' + new Date() + '] faparser: ' + 'Process time: ' + diff + 'ms for request data: ' + JSON.stringify(data) + ' with response: ' + JSON.stringify(response))
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "faparser",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Parser for Filmaffinity site",
   "main": "faparser.js",
   "scripts": {