Compare commits
No commits in common. "67babeac1555b1a9e1aaf00d1cfee23ca3b859f5" and "8c764da185a22c910e36c8f66d94c797cdcb613b" have entirely different histories.
67babeac15
...
8c764da185
7 changed files with 17 additions and 169 deletions
5
.gitignore
vendored
5
.gitignore
vendored
|
|
@ -10,7 +10,4 @@ tmp
|
|||
|
||||
## ENV Vars ##
|
||||
.env
|
||||
config/client_google_auth.json
|
||||
|
||||
## output ##
|
||||
*.ics
|
||||
config/client_google_auth.json
|
||||
90
package-lock.json
generated
90
package-lock.json
generated
|
|
@ -8,7 +8,6 @@
|
|||
"axios": "^1.3.4",
|
||||
"dotenv": "^16.0.3",
|
||||
"googleapis": "^113.0.0",
|
||||
"ics": "^3.1.0",
|
||||
"moment": "^2.29.4",
|
||||
"node-html-parser": "^6.1.5"
|
||||
},
|
||||
|
|
@ -16,22 +15,6 @@
|
|||
"@types/node": "^18.15.5"
|
||||
}
|
||||
},
|
||||
"node_modules/@babel/runtime": {
|
||||
"version": "7.21.0",
|
||||
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.21.0.tgz",
|
||||
"integrity": "sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw==",
|
||||
"dependencies": {
|
||||
"regenerator-runtime": "^0.13.11"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=6.9.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@types/lodash": {
|
||||
"version": "4.14.192",
|
||||
"resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.192.tgz",
|
||||
"integrity": "sha512-km+Vyn3BYm5ytMO13k9KTp27O75rbQ0NFw+U//g+PX7VZyjCioXaRFisqSIJRECljcTv73G3i6BpglNGHgUQ5A=="
|
||||
},
|
||||
"node_modules/@types/node": {
|
||||
"version": "18.15.5",
|
||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.5.tgz",
|
||||
|
|
@ -462,15 +445,6 @@
|
|||
"node": ">= 6"
|
||||
}
|
||||
},
|
||||
"node_modules/ics": {
|
||||
"version": "3.1.0",
|
||||
"resolved": "https://registry.npmjs.org/ics/-/ics-3.1.0.tgz",
|
||||
"integrity": "sha512-O48TZKyLYagLlXoZwDmjetXc6SoT54wFkTu2MEYe7zse8kL+C/dgSynYCjRG1OTAv3iHtGtG0PWKG81LbcrKFA==",
|
||||
"dependencies": {
|
||||
"nanoid": "^3.1.23",
|
||||
"yup": "^0.32.9"
|
||||
}
|
||||
},
|
||||
"node_modules/is-stream": {
|
||||
"version": "2.0.1",
|
||||
"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
|
||||
|
|
@ -509,16 +483,6 @@
|
|||
"safe-buffer": "^5.0.1"
|
||||
}
|
||||
},
|
||||
"node_modules/lodash": {
|
||||
"version": "4.17.21",
|
||||
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
|
||||
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
|
||||
},
|
||||
"node_modules/lodash-es": {
|
||||
"version": "4.17.21",
|
||||
"resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
|
||||
"integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
|
||||
},
|
||||
"node_modules/lru-cache": {
|
||||
"version": "6.0.0",
|
||||
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
|
||||
|
|
@ -562,28 +526,6 @@
|
|||
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
|
||||
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
|
||||
},
|
||||
"node_modules/nanoclone": {
|
||||
"version": "0.2.1",
|
||||
"resolved": "https://registry.npmjs.org/nanoclone/-/nanoclone-0.2.1.tgz",
|
||||
"integrity": "sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA=="
|
||||
},
|
||||
"node_modules/nanoid": {
|
||||
"version": "3.3.6",
|
||||
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
|
||||
"integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==",
|
||||
"funding": [
|
||||
{
|
||||
"type": "github",
|
||||
"url": "https://github.com/sponsors/ai"
|
||||
}
|
||||
],
|
||||
"bin": {
|
||||
"nanoid": "bin/nanoid.cjs"
|
||||
},
|
||||
"engines": {
|
||||
"node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
|
||||
}
|
||||
},
|
||||
"node_modules/node-fetch": {
|
||||
"version": "2.6.9",
|
||||
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.9.tgz",
|
||||
|
|
@ -639,11 +581,6 @@
|
|||
"url": "https://github.com/sponsors/ljharb"
|
||||
}
|
||||
},
|
||||
"node_modules/property-expr": {
|
||||
"version": "2.0.5",
|
||||
"resolved": "https://registry.npmjs.org/property-expr/-/property-expr-2.0.5.tgz",
|
||||
"integrity": "sha512-IJUkICM5dP5znhCckHSv30Q4b5/JA5enCtkRHYaOVOAocnH/1BQEYTC5NMfT3AVl/iXKdr3aqQbQn9DxyWknwA=="
|
||||
},
|
||||
"node_modules/proxy-from-env": {
|
||||
"version": "1.1.0",
|
||||
"resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
|
||||
|
|
@ -663,11 +600,6 @@
|
|||
"url": "https://github.com/sponsors/ljharb"
|
||||
}
|
||||
},
|
||||
"node_modules/regenerator-runtime": {
|
||||
"version": "0.13.11",
|
||||
"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
|
||||
"integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
|
||||
},
|
||||
"node_modules/safe-buffer": {
|
||||
"version": "5.2.1",
|
||||
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
|
||||
|
|
@ -700,11 +632,6 @@
|
|||
"url": "https://github.com/sponsors/ljharb"
|
||||
}
|
||||
},
|
||||
"node_modules/toposort": {
|
||||
"version": "2.0.2",
|
||||
"resolved": "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz",
|
||||
"integrity": "sha512-0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg=="
|
||||
},
|
||||
"node_modules/tr46": {
|
||||
"version": "0.0.3",
|
||||
"resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
|
||||
|
|
@ -741,23 +668,6 @@
|
|||
"version": "4.0.0",
|
||||
"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
|
||||
"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
|
||||
},
|
||||
"node_modules/yup": {
|
||||
"version": "0.32.11",
|
||||
"resolved": "https://registry.npmjs.org/yup/-/yup-0.32.11.tgz",
|
||||
"integrity": "sha512-Z2Fe1bn+eLstG8DRR6FTavGD+MeAwyfmouhHsIUgaADz8jvFKbO/fXc2trJKZg+5EBjh4gGm3iU/t3onKlXHIg==",
|
||||
"dependencies": {
|
||||
"@babel/runtime": "^7.15.4",
|
||||
"@types/lodash": "^4.14.175",
|
||||
"lodash": "^4.17.21",
|
||||
"lodash-es": "^4.17.21",
|
||||
"nanoclone": "^0.2.1",
|
||||
"property-expr": "^2.0.4",
|
||||
"toposort": "^2.0.2"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=10"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
"axios": "^1.3.4",
|
||||
"dotenv": "^16.0.3",
|
||||
"googleapis": "^113.0.0",
|
||||
"ics": "^3.1.0",
|
||||
"moment": "^2.29.4",
|
||||
"node-html-parser": "^6.1.5"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -8,8 +8,9 @@ import moment from 'moment'; // require
|
|||
// search for upcomming games
|
||||
|
||||
export default class GameSource {
|
||||
constructor() { }
|
||||
|
||||
async getGamesFromHaifa(): Promise<GoogleCalendarEvent[]> {
|
||||
async getGamesFromHaifa() {
|
||||
const sourceUrl = `https://mhaifafc.com/games?lang=en`;
|
||||
const result = await axios.get(sourceUrl);
|
||||
const parsedResult = parse(result.data.toString())
|
||||
|
|
@ -20,9 +21,12 @@ export default class GameSource {
|
|||
for (let gameBox of gameBoxs) {
|
||||
|
||||
const teamsPlaying = gameBox.querySelectorAll(".team-name").map((team: any) => team.text);
|
||||
console.log("TEAMS PLAYING", teamsPlaying)
|
||||
const regex = /[\r\n\s]+/g;
|
||||
const gameHeader = gameBox.querySelector(".game-header").text.replace(regex, " ").trim();
|
||||
console.log("GAME HEADER", gameHeader)
|
||||
const headerSplit = gameHeader.split(",");
|
||||
console.log("HEADER SPLIT", headerSplit)
|
||||
// In data, if there is no time, it means it's the last game for the calender
|
||||
const lastGameForCalender = headerSplit.length < 4;
|
||||
if (lastGameForCalender) break;
|
||||
|
|
@ -30,13 +34,10 @@ export default class GameSource {
|
|||
const gameDate = headerSplit[2].trim();
|
||||
const gameTime = headerSplit[3].trim();
|
||||
|
||||
const startOriginal = moment(gameDate + gameTime, "DD/MM/YYYYHH:mm").format("DD/MM/YYYY HH:mm");
|
||||
const endOriginal = moment(gameDate + gameTime, "DD/MM/YYYYHH:mm").add(2, "hours").format("DD/MM/YYYY HH:mm");
|
||||
const start = moment(gameDate + gameTime, "DD/MM/YYYYHH:mm").format("YYYY-MM-DDTHH:mm:ss");
|
||||
const end = moment(gameDate + gameTime, "DD/MM/YYYYHH:mm").add(2, "hours").format("YYYY-MM-DDTHH:mm:ss");
|
||||
|
||||
const start = [moment(startOriginal, 'DD/MM/YYYYHH:mm').year(), moment(startOriginal, 'DD/MM/YYYYHH:mm').month() + 1, moment(startOriginal, 'DD/MM/YYYYHH:mm').date(), moment(startOriginal, 'DD/MM/YYYYHH:mm').hour(), moment(startOriginal, 'DD/MM/YYYYHH:mm').minute()];
|
||||
const end = [moment(endOriginal, 'DD/MM/YYYYHH:mm').year(), moment(endOriginal, 'DD/MM/YYYYHH:mm').month() + 1, moment(endOriginal, 'DD/MM/YYYYHH:mm').date(), moment(endOriginal, 'DD/MM/YYYYHH:mm').hour(), moment(endOriginal, 'DD/MM/YYYYHH:mm').minute()]
|
||||
|
||||
games.push({
|
||||
games.push({
|
||||
summary: 'Maccabi Haifa F.C.',
|
||||
location: "Sammy Ofer Stadium",
|
||||
description: `${teamsPlaying[0]} vs. ${teamsPlaying[1]}`,
|
||||
|
|
|
|||
47
src/Ics.ts
47
src/Ics.ts
|
|
@ -1,47 +0,0 @@
|
|||
import { GoogleCalendarEvent } from "./types";
|
||||
import * as ics from 'ics';
|
||||
|
||||
const uuid = require('uuid').v4;
|
||||
|
||||
|
||||
export default class Ics {
|
||||
|
||||
generateIcsOutputFromGames = (games: GoogleCalendarEvent[]) => {
|
||||
// let icsOutput = '';
|
||||
// for (let game of games) {
|
||||
// icsOutput += this.generateIcsOutputFromGame(game);
|
||||
// }
|
||||
// console.log(icsOutput)
|
||||
// return icsOutput;
|
||||
return this.generateIcsOutputFromGame(games[0])
|
||||
|
||||
}
|
||||
|
||||
generateIcsOutputFromGame = (game: GoogleCalendarEvent) => {
|
||||
const { summary, location, description, start, end } = game;
|
||||
const icsEvent: ics.EventAttributes = {
|
||||
title: summary,
|
||||
description,
|
||||
location,
|
||||
start: [start.dateTime[0], start.dateTime[1], start.dateTime[2], start.dateTime[3], start.dateTime[4]],
|
||||
end: [end.dateTime[0], end.dateTime[1], end.dateTime[2], end.dateTime[3], end.dateTime[4]],
|
||||
url: 'https://mhaifafc.com/',
|
||||
status: 'CONFIRMED',
|
||||
busyStatus: 'BUSY',
|
||||
productId: 'https://mhaifafc.com/',
|
||||
recurrenceRule: '',
|
||||
attendees: [],
|
||||
alarms: [],
|
||||
categories: [],
|
||||
organizer: { name: 'Maccabi Haifa F.C.', email: '' },
|
||||
uid: uuid
|
||||
};
|
||||
|
||||
const { error, value } = ics.createEvent(icsEvent);
|
||||
if (error) {
|
||||
console.log(error);
|
||||
return '';
|
||||
}
|
||||
return value;
|
||||
}
|
||||
}
|
||||
24
src/index.ts
24
src/index.ts
|
|
@ -1,22 +1,14 @@
|
|||
import GoogleCalendar from './GoogleCalendar';
|
||||
import GameSource from './GameSource';
|
||||
// import ics from 'ics';
|
||||
import fs from 'fs';
|
||||
import { GoogleCalendarEvent } from './types';
|
||||
import Ics from './Ics';
|
||||
|
||||
|
||||
class App {
|
||||
googleCalendar: GoogleCalendar;
|
||||
gameSource: GameSource;
|
||||
ics: Ics;
|
||||
googleToken: string;
|
||||
gameSource: any;
|
||||
googleToken: any;
|
||||
|
||||
constructor() {
|
||||
this.googleCalendar = new GoogleCalendar();
|
||||
this.gameSource = new GameSource();
|
||||
this.ics = new Ics();
|
||||
|
||||
}
|
||||
|
||||
async init() {
|
||||
|
|
@ -26,6 +18,8 @@ class App {
|
|||
|
||||
async getNewGamesAndUpdateCalendar() {
|
||||
console.log("GET NEW GAMES AND UPDATE CALENDAR")
|
||||
|
||||
|
||||
const games = await this.gameSource.getGamesFromHaifa();
|
||||
this.googleCalendar.updateNewEvent(games);
|
||||
}
|
||||
|
|
@ -34,13 +28,7 @@ class App {
|
|||
const app = new App();
|
||||
|
||||
const start = async () => {
|
||||
const games = await app.gameSource.getGamesFromHaifa();
|
||||
const icsEvents = app.ics.generateIcsOutputFromGames(games);
|
||||
console.log(icsEvents)
|
||||
await app.init();
|
||||
await app.getNewGamesAndUpdateCalendar();
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
start();
|
||||
|
|
@ -3,11 +3,11 @@ export interface GoogleCalendarEvent {
|
|||
location: string;
|
||||
description: string;
|
||||
start: {
|
||||
dateTime: number[];
|
||||
dateTime: string;
|
||||
timeZone: string;
|
||||
};
|
||||
end: {
|
||||
dateTime: number[];
|
||||
dateTime: string;
|
||||
timeZone: string;
|
||||
};
|
||||
}
|
||||
Loading…
Reference in a new issue