node-csfd-api 2.0.0 → 2.1.1-next.0

package/README.md

@@ -3,7 +3,7 @@
 [![Build & Publish](https://github.com/bartholomej/node-csfd-api/workflows/Publish/badge.svg)](https://github.com/bartholomej/node-csfd-api/actions)
 [![codecov](https://codecov.io/gh/bartholomej/node-csfd-api/branch/master/graph/badge.svg?token=YQH9UoVrGP)](https://codecov.io/gh/bartholomej/node-csfd-api)
 
-# CSFD API 2021
+# CSFD API 2022
 
 > JavaScript NPM library for scraping **Czech Movie Database (csfd.cz)**
 >
@@ -30,6 +30,7 @@ npm install node-csfd-api --save
 - [Movies and TV Series](#Movie)
 - [User Ratings](#User-Ratings)
 - [Search](#Search)
+- [Creators](#Creators)
 
 ### Movie
 
@@ -396,7 +397,7 @@ yarn start
 
 ### Run demo locally
 
-You can find and modify it in [`./demo.ts`](https://raw.githubusercontent.com/bartholomej/node-csfd-api/search/demo.ts) file
+You can find and modify it in [`./demo.ts`](https://github.com/bartholomej/node-csfd-api/blob/master/demo.ts) file
 
 ```bash
 yarn demo
@@ -423,9 +424,11 @@ I welcome you to customize this according to your needs ;)
 
 Pull requests for any improvements would be great!
 
-## Donation
+## ⭐️ Show your support
 
-If this project have helped you save time please consider [making a donation](https://github.com/sponsors/bartholomej) for some 🍺 or 🍵 ;)
+Give a ⭐️ if this project helped you!
+
+Or if you are brave enough consider [making a donation](https://github.com/sponsors/bartholomej) for some 🍺 or 🍵 ;)
 
 ## Privacy Policy
 
@@ -437,7 +440,7 @@ That's why, with CSFD Api, what happens on your device stays on your device till
 
 ## License
 
-Copyright © 2021 [Lukas Bartak](http://bartweb.cz)
+Copyright © 2022 [Lukas Bartak](http://bartweb.cz)
 
 Proudly powered by nature 🗻, wind 💨, tea 🍵 and beer 🍺 ;)
 

package/helpers/global.helper.d.ts

@@ -4,3 +4,4 @@ export declare const parseIdFromUrl: (url: string) => number;
 export declare const getColor: (cls: string) => CSFDColorRating;
 export declare const parseColor: (quality: Colors) => CSFDColorRating;
 export declare const addProtocol: (url: string) => string;
+export declare const parseISO8601Duration: (iso: string) => number;

package/helpers/global.helper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addProtocol = exports.parseColor = exports.getColor = exports.parseIdFromUrl = void 0;
+exports.parseISO8601Duration = exports.addProtocol = exports.parseColor = exports.getColor = exports.parseIdFromUrl = void 0;
 const parseIdFromUrl = (url) => {
     const idSlug = url.split('/')[2];
     const id = idSlug.split('-')[0];
@@ -41,3 +41,19 @@ const addProtocol = (url) => {
     return url.startsWith('//') ? 'https:' + url : url;
 };
 exports.addProtocol = addProtocol;
+const parseISO8601Duration = (iso) => {
+    const iso8601DurationRegex = /(-)?P(?:([.,\d]+)Y)?(?:([.,\d]+)M)?(?:([.,\d]+)W)?(?:([.,\d]+)D)?T(?:([.,\d]+)H)?(?:([.,\d]+)M)?(?:([.,\d]+)S)?/;
+    const matches = iso.match(iso8601DurationRegex);
+    const duration = {
+        sign: matches[1] === undefined ? '+' : '-',
+        years: matches[2] === undefined ? 0 : matches[2],
+        months: matches[3] === undefined ? 0 : matches[3],
+        weeks: matches[4] === undefined ? 0 : matches[4],
+        days: matches[5] === undefined ? 0 : matches[5],
+        hours: matches[6] === undefined ? 0 : matches[6],
+        minutes: matches[7] === undefined ? 0 : matches[7],
+        seconds: matches[8] === undefined ? 0 : matches[8]
+    };
+    return +duration.minutes;
+};
+exports.parseISO8601Duration = parseISO8601Duration;

package/helpers/movie.helper.d.ts

@@ -9,7 +9,7 @@ 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: string) => number;
-export declare const getDuration: (el: HTMLElement) => number;
+export declare const getDuration: (jsonLdRaw: string, el: HTMLElement) => number;
 export declare const getTitlesOther: (el: HTMLElement) => CSFDTitlesOther[];
 export declare const getPoster: (el: HTMLElement) => string;
 export declare const getDescriptions: (el: HTMLElement) => string[];

package/helpers/movie.helper.js

@@ -60,20 +60,31 @@ const getYear = (el) => {
     }
 };
 exports.getYear = getYear;
-const getDuration = (el) => {
-    const origin = el.querySelector('.origin').innerText;
-    const timeString = origin.split(',');
-    if (timeString.length > 2) {
-        const timeString2 = timeString.pop().trim();
-        const timeRaw = timeString2.split('(')[0].trim();
-        const hoursMinsRaw = timeRaw.split('min')[0];
-        const hoursMins = hoursMinsRaw.split('h');
-        // Resolve hours + minutes format
-        const duration = hoursMins.length > 1 ? +hoursMins[0] * 60 + +hoursMins[1] : +hoursMins[0];
-        return duration;
+const getDuration = (jsonLdRaw, el) => {
+    let duration = null;
+    try {
+        const jsonLd = JSON.parse(jsonLdRaw);
+        duration = jsonLd.duration;
+        return (0, global_helper_1.parseISO8601Duration)(duration);
     }
-    else {
-        return null;
+    catch (error) {
+        const origin = el.querySelector('.origin').innerText;
+        const timeString = origin.split(',');
+        if (timeString.length > 2) {
+            // Get last time elelment
+            const timeString2 = timeString.pop().trim();
+            // Clean it
+            const timeRaw = timeString2.split('(')[0].trim();
+            // Split by minutes and hours
+            const hoursMinsRaw = timeRaw.split('min')[0];
+            const hoursMins = hoursMinsRaw.split('h');
+            // Resolve hours + minutes format
+            duration = hoursMins.length > 1 ? +hoursMins[0] * 60 + +hoursMins[1] : +hoursMins[0];
+            return duration;
+        }
+        else {
+            return null;
+        }
     }
 };
 exports.getDuration = getDuration;
@@ -118,7 +129,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.textContent.trim().replace(/(\r\n|\n|\r|\t)/gm, '');
+        .querySelector('.body--plots .plot-full p')) === null || _a === void 0 ? void 0 : _a.textContent.trim().replace(/(\r\n|\n|\r|\t)/gm, '');
     return plot ? [plot] : [];
 };
 exports.getDescriptions = getDescriptions;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-csfd-api",
-  "version": "2.0.0",
+  "version": "2.1.1-next.0",
   "description": "ČSFD API in JavaScript. Amazing NPM library for scrapping csfd.cz :)",
   "main": "./index.js",
   "author": "BART! <bart@bartweb.cz>",
@@ -21,8 +21,8 @@
     "release:major": "git checkout master && npm version major -m \"chore(update): major release %s 💥\""
   },
   "dependencies": {
-    "cross-fetch": "^3.1.4",
-    "node-html-parser": "^5.1.0"
+    "cross-fetch": "^3.1.5",
+    "node-html-parser": "^5.2.0"
   },
   "repository": {
     "url": "git+https://github.com/bartholomej/node-csfd-api.git",

package/services/movie.service.js

@@ -22,7 +22,7 @@ class MovieScraper {
             id: movieId,
             title: (0, movie_helper_1.getTitle)(el),
             year: (0, movie_helper_1.getYear)(jsonLd),
-            duration: (0, movie_helper_1.getDuration)(el),
+            duration: (0, movie_helper_1.getDuration)(jsonLd, el),
             descriptions: (0, movie_helper_1.getDescriptions)(el),
             genres: (0, movie_helper_1.getGenres)(el),
             type: (0, movie_helper_1.getType)(el),