Displaying results in terminal table with select, scroll and experimental search. Expanded broken character handling for PervCity scraper.

src/app.js

@@ -1,11 +1,29 @@
 'use strict';
 
 const config = require('config');
-const { terminal } = require('terminal-kit');
 const moment = require('moment');
+const blessed = require('neo-blessed');
 
 const networks = require('../networks.js');
 const scrapers = require('./scrapers');
+const render = require('./tui/render');
+
+function initScreen() {
+    const screen = blessed.screen({
+        title: `traxxx ${new Date().getTime()}`,
+        smartCSR: true,
+        mouse: false,
+    });
+
+    screen.enableInput();
+
+    screen.key(['escape', 'q', 'C-c'], () => {
+        screen.render();
+        screen.destroy();
+    });
+
+    return screen;
+}
 
 function accumulateIncludedSites() {
     return config.include.reduce((acc, network) => {
@@ -83,7 +101,7 @@ function accumulateSites() {
 }
 
 async function fetchScenes(sites) {
-    return Promise.all(sites.map(async (site) => {
+    const scenesPerSite = await Promise.all(sites.map(async (site) => {
         const scraper = scrapers[site.id] || scrapers[site.network];
 
         if (scraper) {
@@ -92,25 +110,18 @@ async function fetchScenes(sites) {
 
         return [];
     }));
-}
 
-function exit() {
-    terminal.grabInput(false);
-    terminal.clear();
-    terminal.processExit();
+    return scenesPerSite.reduce((acc, siteScenes) => ([...acc, ...siteScenes]), []);
 }
 
 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));
 
-    terminal.singleColumnMenu(scenes[0].latest.map(scene => `[${scene.siteId} ${moment(scene.date).format('YYYY-MM-DD')}] ${scene.title} (${scene.actors.join(', ')}) ★ ${scene.rating.stars.toFixed(2)}`));
-
-    terminal.on('key', (name) => {
-        if (name === 'CTRL_C') {
-            exit();
-        }
-    });
+    render(sortedScenes, screen);
 }
 
 init();

src/scrapers/pervcity.js

@@ -9,9 +9,9 @@ function scrape(html, site) {
 
     const sceneLinkElement = $('#scene_title_border a');
     const url = `${site.url}/${sceneLinkElement.attr('href')}`;
-    const title = sceneLinkElement.attr('title');
+    const title = sceneLinkElement.attr('title').replace(/\u00E2\u0080\u0099/g, '\''); // replace weird apostrophes
 
-    const actors = $('.home_model_name a').toArray().map(element => $(element).text().replace(/,[\u0020\u00A0\u202F]/, ''));
+    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;
@@ -26,11 +26,10 @@ function scrape(html, site) {
             dislikes: null,
             stars,
         },
-        siteId: site.id,
+        site,
     };
 }
 
-
 async function fetchReleases(site) {
     // const session = bhttp.session();
 
@@ -39,9 +38,7 @@ async function fetchReleases(site) {
 
     const latest = elements.total_arr.map(html => scrape(html, site));
 
-    return {
-        latest,
-    };
+    return latest;
 }
 
 module.exports = fetchReleases;

src/scrapers/xempire.js

@@ -16,7 +16,7 @@ function scrape(html, site) {
         const [likes, dislikes] = $(element).find('.value')
             .toArray()
             .map(value => Number($(value).text()));
-        const stars = Math.floor(((likes * 5 + dislikes) / (likes + dislikes)) * 100) / 100;
+        const stars = likes || dislikes ? Math.floor(((likes * 5 + dislikes) / (likes + dislikes)) * 100) / 100 : null;
 
         const actors = $(element).find('.sceneActors a')
             .map((actorIndex, actorElement) => $(actorElement).attr('title'))
@@ -34,7 +34,7 @@ function scrape(html, site) {
                 dislikes,
                 stars,
             },
-            siteId: site.id,
+            site,
         };
     });
 }
@@ -45,10 +45,10 @@ async function fetchReleases(site) {
         bhttp.get(`${site.url}/en/videos/AllCategories/0/1/upcoming`),
     ]);
 
-    return {
-        latest: scrape(latestRes.body.toString(), site),
-        upcoming: scrape(upcomingRes.body.toString(), site),
-    };
+    return [
+        ...scrape(upcomingRes.body.toString(), site, true),
+        ...scrape(latestRes.body.toString(), site),
+    ];
 }
 
 module.exports = fetchReleases;

src/tui/formatters.js

@@ -0,0 +1,22 @@
+'use strict';
+
+const moment = require('moment');
+
+const formatters = {
+    site: site => site.name,
+    date: (date, column) => moment(date).format(column.format || 'MMM DD, YYYY'),
+    actors: actors => actors.join(', '),
+    rating: (rating) => {
+        if (rating.stars === null) {
+            return 'Unrated';
+        }
+
+        if (rating.likes === null || rating.dislikes === null) {
+            return `★ ${rating.stars.toFixed(2)}`;
+        }
+
+        return `★ ${rating.stars.toFixed(2)} ▲ ${String(rating.likes).padEnd(3)} ▼ ${String(rating.dislikes).padEnd(3)}`;
+    },
+};
+
+module.exports = formatters;

src/tui/render.js

@@ -0,0 +1,94 @@
+'use strict';
+
+const config = require('config');
+const blessed = require('neo-blessed');
+const moment = require('moment');
+const opn = require('opn');
+
+const formatters = require('./formatters');
+
+function render(scenes, screen) {
+    const tableTop = blessed.Text({
+        content: config.columns.reduce((acc, column, index) => `${acc}${'─'.repeat(column.width)}${index < config.columns.length - 1 ? '┬' : '┐\x1b[0m'}`, '\x1b[30m┌'),
+    });
+
+    const items = scenes.map((scene, sceneIndex) => {
+        const isFuture = moment(scene.date).isAfter();
+
+        const row = config.columns.reduce((acc, column) => {
+            const value = (formatters[column.value]
+                ? formatters[column.value](scene[column.value], column)
+                : scene[column.value])
+                .toString();
+
+            const truncatedValue = value.length > column.width - 2 ? `${value.slice(0, column.width - 2 - 3)}...` : value;
+            const paddedValue = truncatedValue.padEnd(column.width - 1).padStart(column.width);
+            const coloredValue = isFuture ? `\x1b[92m${paddedValue}\x1b[0m` : `\x1b[97m${paddedValue}\x1b[0m`;
+
+            return `${acc}${coloredValue}\x1b[90m│\x1b[0m`;
+        }, '\x1b[90m│\x1b[0m');
+
+        if (sceneIndex < scenes.length - 1) {
+            const line = config.columns.reduce((acc, column, index) => `${acc}${'─'.repeat(column.width)}${index < config.columns.length - 1 ? '┼' : '┤\x1b[0m'}`, '\n\x1b[30m├');
+
+            return `${row}${line}`;
+        }
+
+        return `${row}${sceneIndex}`;
+    });
+
+    function search(cb) {
+        const searchbox = blessed.Textbox({
+            inputOnFocus: true,
+        });
+
+        screen.append(searchbox);
+        searchbox.focus();
+
+        screen.render();
+
+        searchbox.on('submit', () => {
+            menu.focus();
+            cb(null, searchbox.value);
+
+            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└'),
+        top: screen.rows - 2,
+    });
+
+    screen.append(tableTop);
+    screen.append(menu);
+    screen.append(tableBottom);
+
+    menu.focus();
+
+    menu.on('select', (child) => {
+        const scene = scenes[menu.getItemIndex(child)];
+
+        opn(scene.url);
+    });
+
+    screen.render();
+}
+
+module.exports = render;