From 0649e0757bac842565b8a82727ae90cadfe29a7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Sverre=20Lien=20Sell=C3=A6g?= Date: Fri, 29 May 2020 15:26:42 +0200 Subject: [PATCH] use correct syntax for importing files and fix param list --- scrape.sh | 2 +- src/constants.js | 2 +- src/logic.js | 7 ++++++- src/scrape.js | 4 ++-- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/scrape.sh b/scrape.sh index d468873..9e6277c 100755 --- a/scrape.sh +++ b/scrape.sh @@ -64,7 +64,7 @@ function check_dependencies { } function scrape { - node src/scrape.js "$1" || usage + node src/scrape.js "$@" || usage } check_dependencies \ diff --git a/src/constants.js b/src/constants.js index 4fa439f..d2df7a3 100644 --- a/src/constants.js +++ b/src/constants.js @@ -1 +1 @@ -export const graphql_endpoint = 'https://www.facebook.com/api/graphql/'; +exports.graphql_endpoint = 'https://www.facebook.com/api/graphql/'; diff --git a/src/logic.js b/src/logic.js index 0b9eab3..ab7b032 100644 --- a/src/logic.js +++ b/src/logic.js @@ -15,7 +15,7 @@ const parse_output = (argv) => { return res; }; -export const parse_args = (args) => { +const parse_args = (args) => { const argv = parseArgs(args); const has_help_param = @@ -45,3 +45,8 @@ export const parse_args = (args) => { output, }; }; + +module.exports = { + parse_args, + event_url, +}; diff --git a/src/scrape.js b/src/scrape.js index 38c8801..061587b 100644 --- a/src/scrape.js +++ b/src/scrape.js @@ -5,8 +5,8 @@ const path = require('path'); const fs = require('fs').promises; const gm = require('gm').subClass({ imageMagick: true }); -import { graphql_endpoint } from './constants'; -import { event_url } from './logic'; +const { graphql_endpoint } = require('./constants.js'); +const { event_url, parse_args } = require('./logic'); const get_upcoming_events = pathOr( null,