Added Jules Jordan scraper. Added render argument to stop going into ncurses mode during dev.

src/app.js

@@ -4,6 +4,7 @@ const config = require('config');
 const moment = require('moment');
 const blessed = require('neo-blessed');
 
+const argv = require('./argv');
 const networks = require('../networks.js');
 const scrapers = require('./scrapers');
 const render = require('./tui/render');
@@ -115,13 +116,15 @@ async function fetchScenes(sites) {
 }
 
 async function init() {
-    const screen = initScreen();
-
     const sites = accumulateSites();
     const scenes = await fetchScenes(sites);
-    const sortedScenes = scenes.sort(({ date: dateA }, { date: dateB }) => moment(dateB).diff(dateA));
 
-    render(sortedScenes, screen);
+    if (argv.render) {
+        const screen = initScreen();
+        const sortedScenes = scenes.sort(({ date: dateA }, { date: dateB }) => moment(dateB).diff(dateA));
+
+        render(sortedScenes, screen);
+    }
 }
 
 init();

src/argv.js

@@ -0,0 +1,13 @@
+'use strict';
+
+const yargs = require('yargs');
+
+const { argv } = yargs
+    .command('npm start')
+    .option('render', {
+        describe: 'Fetch data without rendering interface',
+        type: 'boolean',
+        default: true,
+    });
+
+module.exports = argv;

src/scrapers/index.js

@@ -1,9 +1,11 @@
 'use strict';
 
-const pervcity = require('./pervcity');
 const xempire = require('./xempire');
+const julesjordan = require('./julesjordan');
+const pervcity = require('./pervcity');
 
 module.exports = {
-    pervcity,
     xempire,
+    julesjordan,
+    pervcity,
 };

src/scrapers/julesjordan.js

@@ -0,0 +1,83 @@
+'use strict';
+
+const bhttp = require('bhttp');
+const cheerio = require('cheerio');
+const moment = require('moment');
+
+function scrapeLatest(html, site) {
+    const $ = cheerio.load(html, { normalizeWhitespace: true });
+    const scenesElements = $('.update_details').toArray();
+
+    return scenesElements.map((element) => {
+        const sceneLinkElement = $(element).children('a').eq(1);
+        const url = sceneLinkElement.attr('href');
+        const title = sceneLinkElement.text();
+
+        const date = moment
+            .utc($(element).find('.update_date').text(), 'MM/DD/YYYY')
+            .toDate();
+
+        const actors = $(element).find('.update_models a')
+            .map((actorIndex, actorElement) => $(actorElement).text())
+            .toArray();
+
+        return {
+            url,
+            title,
+            actors,
+            date,
+            rating: null,
+            site,
+        };
+    });
+}
+
+function scrapeUpcoming(html, site) {
+    const $ = cheerio.load(html, { normalizeWhitespace: true });
+    const scenesElements = $('#coming_soon_carousel').find('.table').toArray();
+
+    return scenesElements.map((element) => {
+        const details = $(element).find('.update_details_comingsoon')
+            .eq(1)
+            .children()
+            .remove();
+
+        const title = details
+            .end()
+            .text()
+            .trim();
+
+        const actors = details
+            .text()
+            .trim()
+            .split(', ');
+
+        const date = moment
+            .utc($(element).find('.update_date_comingsoon').text().slice(7), 'MM/DD/YYYY')
+            .toDate();
+
+        return {
+            url: null,
+            title,
+            actors,
+            date,
+            rating: null,
+            site,
+        };
+    });
+}
+
+
+async function fetchReleases(site) {
+    const [latestRes, upcomingRes] = await Promise.all([
+        bhttp.get(`${site.url}/categories/movies_1_d.html`),
+        bhttp.get(`${site.url}/index.php`),
+    ]);
+
+    return [
+        ...scrapeUpcoming(upcomingRes.body.toString(), site, true),
+        ...scrapeLatest(latestRes.body.toString(), site),
+    ];
+}
+
+module.exports = fetchReleases;

src/scrapers/pervcity.js

@@ -14,7 +14,10 @@ function scrape(html, site) {
     const actors = $('.home_model_name a').toArray().map(element => $(element).text().replace(/,[\u0020\u00A0\u202F]/, '')); // replace weird commas
     const date = moment.utc($('.add_date').text(), 'DD-MM-YYYY').toDate();
 
-    const stars = $('img[src*="/star.png"]').toArray().map(element => $(element).attr('src')).length || null;
+    const stars = $('img[src*="/star.png"]')
+        .toArray()
+        .map(element => $(element).attr('src'))
+        .length || null;
 
     return {
         url,
@@ -31,8 +34,6 @@ function scrape(html, site) {
 }
 
 async function fetchReleases(site) {
-    // const session = bhttp.session();
-
     const res = await bhttp.get(`${site.url}/final_latestupdateview.php?limitstart=0&limitend=9&websiteid=0&deviceview=browser&tourId=${site.parameters.tourId}`);
     const elements = JSON.parse(res.body.toString());
 

src/scrapers/xempire.js

@@ -13,16 +13,18 @@ function scrape(html, site) {
         const url = `${site.url}${sceneLinkElement.attr('href')}`;
         const title = sceneLinkElement.attr('title');
 
-        const [likes, dislikes] = $(element).find('.value')
-            .toArray()
-            .map(value => Number($(value).text()));
-        const stars = likes || dislikes ? Math.floor(((likes * 5 + dislikes) / (likes + dislikes)) * 100) / 100 : null;
+        const date = moment
+            .utc($(element).find('.sceneDate').text(), 'MM-DD-YYYY')
+            .toDate();
 
         const actors = $(element).find('.sceneActors a')
             .map((actorIndex, actorElement) => $(actorElement).attr('title'))
             .toArray();
 
-        const date = moment.utc($(element).find('.sceneDate').text(), 'MM-DD-YYYY').toDate();
+        const [likes, dislikes] = $(element).find('.value')
+            .toArray()
+            .map(value => Number($(value).text()));
+        const stars = likes || dislikes ? Math.floor(((likes * 5 + dislikes) / (likes + dislikes)) * 100) / 100 : null;
 
         return {
             url,

src/tui/formatters.js

@@ -7,6 +7,10 @@ const formatters = {
     date: (date, column) => moment(date).format(column.format || 'MMM DD, YYYY'),
     actors: actors => actors.join(', '),
     rating: (rating) => {
+        if (rating === null) {
+            return '\x1b[90mNot available\x1b[0m';
+        }
+
         if (rating.stars === null) {
             return '\x1b[90mUnrated\x1b[0m';
         }

src/tui/render.js

@@ -21,7 +21,7 @@ function render(scenes, screen) {
                 : scene[column.value])
                 .toString();
 
-            const realLength = value.replace(/\x1b\[\d+m/g, '').length;
+            const realLength = value.replace(/\x1b\[\d+m/g, '').length; // eslint-disable-line no-control-regex
             const entityLength = value.length - realLength;
 
             const truncatedValue = realLength > column.width - 2 ? `${value.slice(0, column.width - 2 - 3)}...` : value;
@@ -40,7 +40,30 @@ function render(scenes, screen) {
         return `${row}${sceneIndex}`;
     });
 
-    function search(cb) {
+    const menu = blessed.List({
+        style: {
+            selected: {
+                bold: true,
+            },
+        },
+        top: 1,
+        height: screen.rows - 3,
+        width: 161,
+        keys: true,
+        vi: true,
+        mouse: true,
+        scrollbar: {
+            style: {
+                bg: 'red',
+            },
+            track: {
+                bg: 'blue',
+            },
+        },
+        items,
+    });
+
+    menu.search = (cb) => {
         const searchbox = blessed.Textbox({
             inputOnFocus: true,
         });
@@ -57,22 +80,7 @@ function render(scenes, screen) {
             screen.append(menu);
             screen.render();
         });
-    }
-
-    const menu = blessed.List({
-        style: {
-            selected: {
-                bold: true,
-            },
-        },
-        top: 1,
-        height: screen.rows - 3,
-        keys: true,
-        vi: true,
-        mouse: true,
-        search,
-        items,
-    });
+    };
 
     const tableBottom = blessed.Text({
         content: config.columns.reduce((acc, column, index) => `${acc}${'─'.repeat(column.width)}${index < config.columns.length - 1 ? '┴' : '┘\x1b[0m\n'}`, '\x1b[30m└'),