Added bash CLI shorthand. Properly setting parameters in site results. Removed obsolete URL restriction from Reality Kings scraper.

seeds/01_sites.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const upsert = require('../src/utils/upsert');
 
 function getSites(networksMap) {

src/app.js

@@ -7,7 +7,6 @@ const initServer = require('./web/server');
 const scrapeSites = require('./scrape-sites');
 const scrapeRelease = require('./scrape-release');
 
-
 async function init() {
     if (argv.url) {
         await scrapeRelease(argv.url);
@@ -17,7 +16,7 @@ async function init() {
     }
 
 
-    if (argv.networks || argv.sites) {
+    if (argv.scrape || argv.networks || argv.sites) {
         await scrapeSites();
         knex.destroy();
 

src/argv.js

@@ -5,13 +5,17 @@ const yargs = require('yargs');
 
 const { argv } = yargs
     .command('npm start')
+    .option('scrape', {
+        describe: 'Scrape sites and networks defined in configuration',
+        type: 'boolean',
+    })
     .option('networks', {
-        describe: 'Networks to scrape (overrides config)',
+        describe: 'Networks to scrape (overrides configuration)',
         type: 'array',
         alias: 'network',
     })
     .option('sites', {
-        describe: 'Sites to scrape (overrides config)',
+        describe: 'Sites to scrape (overrides configuration)',
         type: 'array',
         alias: 'site',
     })

src/scrape-release.js

@@ -20,6 +20,7 @@ async function findSite(url, release) {
     if (network) {
         return {
             ...network,
+            network,
             isFallback: true,
         };
     }

src/scrapers/realitykings.js

@@ -134,11 +134,7 @@ async function fetchLatest(site, page = 1) {
 }
 
 async function fetchScene(url, site) {
-    if (site.isFallback) {
-        throw new Error('Cannot fetch scene details from this resource');
-    }
-
-    const entryId = url.split('/').slice(-1)[0];
+    const entryId = url.match(/\d+/)[0];
 
     const cookieJar = new CookieJar();
     const session = bhttp.session({ cookieJar });

src/sites.js

@@ -16,7 +16,7 @@ async function curateSite(site, includeParameters = false) {
         description: site.description,
         slug: site.slug,
         independent: !!parameters && parameters.independent,
-        parameters: includeParameters ? JSON.parse(site.parameters) : null,
+        parameters: includeParameters ? parameters : null,
         network: {
             id: site.network_id,
             name: site.network_name,
@@ -28,8 +28,8 @@ async function curateSite(site, includeParameters = false) {
     };
 }
 
-function curateSites(sites) {
-    return Promise.all(sites.map(async site => curateSite(site)));
+function curateSites(sites, includeParameters) {
+    return Promise.all(sites.map(async site => curateSite(site, includeParameters)));
 }
 
 function destructConfigNetworks(networks) {

src/utils/rename.js

@@ -3,7 +3,7 @@
 const path = require('path');
 const Promise = require('bluebird');
 const fs = require('fs-extra');
-const fetchScene = require('../fetch-scene');
+const fetchScene = require('../scrape-release');
 
 const argv = require('../argv');