From 5cb003e51b7388a6acc50b8fd9acb0c69c119eb4 Mon Sep 17 00:00:00 2001 From: schneefux Date: Wed, 2 May 2018 09:15:09 +0200 Subject: rm ISource & FileSource, combine request & parsing, split filter from parser --- src/index.ts | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/index.ts') diff --git a/src/index.ts b/src/index.ts index 47bc00c..4fa7c20 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,13 +1,13 @@ import * as moment from 'moment'; -import {SplusParser} from './core/SplusParser'; import {config} from './config'; +import {SplusApi} from './core/SplusApi'; import {IEvent} from './core/IEvent'; -const baseDate = moment().startOf('week'); - -config.source.getData(baseDate.weeks()).then(async data => { - const lectures = new SplusParser(data.toString()).getLectures(config.lectureFilter); +async function main() { + const baseDate = moment().startOf('week'); + const unfilteredLectures = await SplusApi.getData(config.course, baseDate.weeks()); + const lectures = unfilteredLectures.filter(config.lectureFilter); for (let i = 0; i < lectures.length; i++) { const lec = lectures[i]; @@ -38,4 +38,6 @@ config.source.getData(baseDate.weeks()).then(async data => { } await config.sink.commit(); -}); +} + +main(); -- cgit v1.3.1