From aa47f654fa1b15ef05110afbb939ead02689f4ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Sverre=20Lien=20Sell=C3=A6g?= Date: Sun, 8 Nov 2020 01:45:36 +0100 Subject: [PATCH] move sort to own file --- src/logic.js | 13 +++++++++++++ src/scrape.js | 13 ++----------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/logic.js b/src/logic.js index cc81383..7392bc5 100644 --- a/src/logic.js +++ b/src/logic.js @@ -141,6 +141,18 @@ const has_past_events = (body) => const merge_events = (a, b) => uniqBy(eqBy(prop('event_id')))(union(a, b)); +const by_date = (a, b) => { + const b_date = b.date.start; + const a_date = a.date.start; + if (a_date > b_date) { + return 1; + } + if (a_date == b_date) { + return 0; + } + return -1; +}; + const event_date_to_date_obj = (event) => { const start = pathOr(null, ['date', 'start'], event); if (start !== null) { @@ -155,6 +167,7 @@ const event_date_to_date_obj = (event) => { }; module.exports = { + by_date, event_date_to_date_obj, get_body_inner_text, get_past_events_from_page, diff --git a/src/scrape.js b/src/scrape.js index 70c04d4..c48a148 100644 --- a/src/scrape.js +++ b/src/scrape.js @@ -1,4 +1,5 @@ const { + by_date, event_date_to_date_obj, merge_events, parse_args, @@ -39,17 +40,7 @@ const { let all_events = events .reduce(to_unique_events, previous_events) .map(event_date_to_date_obj) - .sort((a, b) => { - const b_date = b.date.start; - const a_date = a.date.start; - if (a_date > b_date) { - return 1; - } - if (a_date == b_date) { - return 0; - } - return -1; - }); + .sort(by_date); if (output === null) { console.log(JSON.stringify(all_events));