node-csfd-api 1.8.3 → 1.10.1

package/README.md

@@ -58,6 +58,7 @@ csfd.movie(535121).then((movie) => console.log(movie));
   origins: [ 'USA', 'Kanada' ],
   colorRating: 'good',
   rating: 73,
+  ratingCount: 6654,
   titlesOther: [
     { country: 'USA', title: 'Dragged Across Concrete' },
     { country: 'Kanada', title: 'Dragged Across Concrete' },
@@ -65,7 +66,7 @@ csfd.movie(535121).then((movie) => console.log(movie));
     { country: 'Austrálie', title: 'Dragged Across Concrete' },
     { country: 'Velká Británie', title: 'Dragged Across Concrete' }
   ],
-  poster: '//img.csfd.cz/files/images/film/posters/163/579/163579352_bf8737.jpg?h180',
+  poster: '//image.pmgstatic.com/cache/resized/w1080/files/images/film/posters/163/579/163579352_bf8737.jpg',
   creators: {
     directors: [
     {

package/helpers/movie.helper.d.ts

@@ -7,6 +7,7 @@ export declare const getGenres: (el: HTMLElement) => CSFDGenres[];
 export declare const getOrigins: (el: HTMLElement) => string[];
 export declare const getColorRating: (bodyClasses: string[]) => CSFDColorRating;
 export declare const getRating: (el: HTMLElement) => number;
+export declare const getRatingCount: (el: HTMLElement) => number;
 export declare const getYear: (el: HTMLElement) => string | number;
 export declare const getDuration: (el: HTMLElement) => number;
 export declare const getTitlesOther: (el: HTMLElement) => CSFDTitlesOther[];

package/helpers/movie.helper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTags = exports.getPremieres = exports.getBoxMovies = exports.getBoxContent = exports.getVods = exports.getType = exports.getGroup = exports.parsePeople = exports.getDirectors = exports.getDescriptions = exports.getPoster = exports.getTitlesOther = exports.getDuration = exports.getYear = exports.getRating = exports.getColorRating = exports.getOrigins = exports.getGenres = exports.getTitle = exports.getId = void 0;
+exports.getTags = exports.getPremieres = exports.getBoxMovies = exports.getBoxContent = exports.getVods = exports.getType = exports.getGroup = exports.parsePeople = exports.getDirectors = exports.getDescriptions = exports.getPoster = exports.getTitlesOther = exports.getDuration = exports.getYear = exports.getRatingCount = exports.getRating = exports.getColorRating = exports.getOrigins = exports.getGenres = exports.getTitle = exports.getId = void 0;
 const global_helper_1 = require("./global.helper");
 const getId = (el) => {
     const url = el.querySelector('.tabs .tab-nav-list a').attributes.href;
@@ -12,12 +12,12 @@ const getTitle = (el) => {
 };
 exports.getTitle = getTitle;
 const getGenres = (el) => {
-    const genresRaw = el.querySelector('.genres').text;
+    const genresRaw = el.querySelector('.genres').textContent;
     return genresRaw.split(' / ');
 };
 exports.getGenres = getGenres;
 const getOrigins = (el) => {
-    const originsRaw = el.querySelector('.origin').text;
+    const originsRaw = el.querySelector('.origin').textContent;
     const origins = originsRaw.split(',')[0];
     return origins.split(' / ');
 };
@@ -27,7 +27,7 @@ const getColorRating = (bodyClasses) => {
 };
 exports.getColorRating = getColorRating;
 const getRating = (el) => {
-    const ratingRaw = el.querySelector('.rating-average').text;
+    const ratingRaw = el.querySelector('.rating-average').textContent;
     const rating = +(ratingRaw === null || ratingRaw === void 0 ? void 0 : ratingRaw.replace(/%/g, '').trim());
     if (Number.isInteger(rating)) {
         return rating;
@@ -37,6 +37,18 @@ const getRating = (el) => {
     }
 };
 exports.getRating = getRating;
+const getRatingCount = (el) => {
+    var _a;
+    const ratingCountRaw = (_a = el.querySelector('.box-rating-container .counter')) === null || _a === void 0 ? void 0 : _a.textContent;
+    const ratingCount = +(ratingCountRaw === null || ratingCountRaw === void 0 ? void 0 : ratingCountRaw.replace(/[(\s)]/g, ''));
+    if (Number.isInteger(ratingCount)) {
+        return ratingCount;
+    }
+    else {
+        return null;
+    }
+};
+exports.getRatingCount = getRatingCount;
 const getYear = (el) => {
     return el.querySelector('.origin span').innerText.replace(/[{()}]/g, '');
 };
@@ -62,7 +74,7 @@ const getTitlesOther = (el) => {
     const namesNode = el.querySelectorAll('.film-names li');
     return namesNode.map((el) => {
         const country = el.querySelector('img.flag').attributes.alt;
-        const title = el.text.trim().split('\n')[0];
+        const title = el.textContent.trim().split('\n')[0];
         if (country && title) {
             return {
                 country,
@@ -84,7 +96,8 @@ const getPoster = (el) => {
     }
     else {
         // Full sized image (not thumb)
-        return poster.attributes.src.split('?')[0];
+        const imageThumb = poster.attributes.src.split('?')[0];
+        return imageThumb.replace(/\/w140\//, '/w1080/');
     }
 };
 exports.getPoster = getPoster;
@@ -92,7 +105,7 @@ const getDescriptions = (el) => {
     var _a;
     // TODO more plots
     const plot = (_a = el
-        .querySelector('.body--plots .plot-preview p')) === null || _a === void 0 ? void 0 : _a.text.trim().replace(/(\r\n|\n|\r|\t)/gm, '');
+        .querySelector('.body--plots .plot-preview p')) === null || _a === void 0 ? void 0 : _a.textContent.trim().replace(/(\r\n|\n|\r|\t)/gm, '');
     return plot ? [plot] : [];
 };
 exports.getDescriptions = getDescriptions;
@@ -118,7 +131,7 @@ const parsePeople = (el) => {
 exports.parsePeople = parsePeople;
 const getGroup = (el, group) => {
     const creators = el.querySelectorAll('.creators h4');
-    const element = creators.filter((elem) => elem.text.trim().includes(group))[0];
+    const element = creators.filter((elem) => elem.textContent.trim().includes(group))[0];
     if (element === null || element === void 0 ? void 0 : element.parentNode) {
         return (0, exports.parsePeople)(element.parentNode);
     }
@@ -140,7 +153,7 @@ const getVods = (el) => {
         const buttonsVod = buttons.filter((x) => !x.classNames.includes('button-social'));
         vods = buttonsVod.map((btn) => {
             return {
-                title: btn.text.trim(),
+                title: btn.textContent.trim(),
                 url: btn.attributes.href
             };
         });
@@ -152,7 +165,7 @@ exports.getVods = getVods;
 const getBoxContent = (el, box) => {
     var _a;
     const headers = el.querySelectorAll('section.box .box-header');
-    return (_a = headers.find((header) => header.querySelector('h3').text.trim().includes(box))) === null || _a === void 0 ? void 0 : _a.parentNode;
+    return (_a = headers.find((header) => header.querySelector('h3').textContent.trim().includes(box))) === null || _a === void 0 ? void 0 : _a.parentNode;
 };
 exports.getBoxContent = getBoxContent;
 const getBoxMovies = (el, boxName) => {
@@ -179,7 +192,7 @@ const getPremieres = (el) => {
         const [date, ...company] = premiereNode.querySelector('p + span').attributes.title.split(' ');
         premiere.push({
             country: ((_a = premiereNode.querySelector('.flag')) === null || _a === void 0 ? void 0 : _a.attributes.title) || null,
-            format: premiereNode.querySelector('p').text.trim().split(' od')[0],
+            format: premiereNode.querySelector('p').textContent.trim().split(' od')[0],
             date,
             company: company.join(' ')
         });
@@ -189,6 +202,6 @@ const getPremieres = (el) => {
 exports.getPremieres = getPremieres;
 const getTags = (el) => {
     const tagsRaw = el.querySelectorAll('.box-content a[href*="/podrobne-vyhledavani/?tag="]');
-    return tagsRaw.map((tag) => tag.text);
+    return tagsRaw.map((tag) => tag.textContent);
 };
 exports.getTags = getTags;

package/interfaces/movie.interface.d.ts

@@ -2,6 +2,7 @@ import { CSFDScreening } from './global';
 export interface CSFDMovie extends CSFDScreening {
     rating: number | null;
     poster: string;
+    ratingCount: number | null;
     duration: number | string;
     titlesOther: CSFDTitlesOther[];
     origins: string[];
@@ -15,7 +16,7 @@ export interface CSFDMovie extends CSFDScreening {
     similar: CSFDMovieListItem[];
 }
 export interface CSFDVod {
-    title: 'Netflix' | 'hbogo' | 'Primve Video' | 'Apple TV+' | 'ivysilani' | 'Aerovod' | 'o2tv' | 'Voyo' | 'FILMY ČESKY A ZADARMO' | 'VAPET' | 'VOREL FILM' | string;
+    title: 'Netflix' | 'hbogo' | 'Prime Video' | 'Apple TV+' | 'ivysilani' | 'Aerovod' | 'o2tv' | 'Voyo' | 'FILMY ČESKY A ZADARMO' | 'VAPET' | 'VOREL FILM' | string;
     url: string;
 }
 export interface CSFDCreators {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-csfd-api",
-  "version": "1.8.3",
+  "version": "1.10.1",
   "description": "Simple NPM library for scraping CSFD",
   "main": "./index.js",
   "author": "BART! <bart@bartweb.cz>",
@@ -15,7 +15,7 @@
     "test": "jest",
     "publish:next": "yarn && yarn build && yarn test --coverage true && npm publish --folder dist --tag beta",
     "postversion": "git push && git push --follow-tags",
-    "release:beta": "npm version prerelease -m \"chore(update): prelease %s β\"",
+    "release:beta": "npm version preminor --preid=beta -m \"chore(update): prelease %s β\"",
     "release:patch": "git checkout master && npm version patch -m \"chore(update): patch release %s 🐛\"",
     "release:minor": "git checkout master && npm version minor -m \"chore(update): release %s 🚀\"",
     "release:major": "git checkout master && npm version major -m \"chore(update): major release %s 💥\""

package/services/movie.service.js

@@ -29,6 +29,7 @@ class MovieScraper {
             origins: (0, movie_helper_1.getOrigins)(el),
             colorRating: (0, movie_helper_1.getColorRating)(pageClasses),
             rating: (0, movie_helper_1.getRating)(asideEl),
+            ratingCount: (0, movie_helper_1.getRatingCount)(asideEl),
             titlesOther: (0, movie_helper_1.getTitlesOther)(el),
             poster: (0, movie_helper_1.getPoster)(el),
             creators: {