hfbcast 1.0.0 → 1.0.2

package/sqlite/build.ts

@@ -1,127 +1,127 @@
-import * as fs from 'fs';
-import * as url from 'url';
-import { AppDataSource } from "./data-source";
-import {Site} from "./entity/Site";
-import {Broadcast} from "./entity/Broadcast";
-import {JSDOM} from "jsdom";
-const jquery = require("jquery");
-
-function parseBroadcasts(sourceName) {
-
-    return new Promise(resolve => {
-
-        const broadcasts = [];
-        const sites = [];
-
-        fs.readFile(`../sources/shortwave_${sourceName}.html`, 'utf8', async function(err, testHTML) {
-
-            global.document = new JSDOM( testHTML );
-            const $ = jquery(global.document.window);
-            const rows = $('table.results tr');
-
-            rows.each(async (i, row) => {
-
-                // if (i===0 || i>100) return false;
-                if (i===0) return false;
-                if (i%1000 === 0) console.log(sourceName, i);
-
-                const cells = $(row).find('td');
-
-                const fq = Number.parseFloat($(cells[0]).html());
-                const startStopTime = $(cells[1]).html().split('-');
-                const station = $(cells[2]).html();
-                const country = $(cells[3]).html();
-                const language = $(cells[4]).html();
-                const days = $(cells[5]).html();
-                const link = $(cells[6]).html();
-                let lon=0, lat=0, siteName='unknown';
-                try {
-                    const a = $(link);
-                    // console.log(a.length);
-                    siteName = a.length === 1 ? a.html() : link;
-                    const coordString = (new url.URL(a.attr('href'))).searchParams.get('center').split(',');
-                    lat = Number.parseFloat(coordString[0]);
-                    lon = Number.parseFloat(coordString[1]);
-                }
-                catch (e) {
-                }
-
-                const startHour = Number.parseInt(startStopTime[0].substring(0,2));
-                const startMin = Number.parseInt(startStopTime[0].substring(2,4));
-                const stopHour = Number.parseInt(startStopTime[1].substring(0,2));
-                const stopMin = Number.parseInt(startStopTime[1].substring(2,4));
-
-                let daysInteger = 0;
-                for (let i = 0; i < days.length; i++) {
-                    const dayInt = parseInt(days.charAt(i));
-                    if (!isNaN(dayInt)) {
-                        daysInteger += Math.pow(2, dayInt-1);
-                    }
-                }
-
-                // console.log(fq, lon, lat, startStopTime, startHour, stopHour, days);
-
-                const site = new Site();
-                site.name = siteName;
-                site.power = 0;
-                site.lon = lon;
-                site.lat = lat;
-
-                const broadcast = new Broadcast();
-                broadcast.frequency = fq;
-                broadcast.site = site;
-                broadcast.days = daysInteger;
-                broadcast.startTime = startMin + 60*startHour;
-                broadcast.endTime = stopMin + 60*stopHour;
-                broadcast.station = station;
-                broadcast.country = country;
-                broadcast.language = language;
-                broadcast.source = sourceName;
-
-                sites.push(site);
-                broadcasts.push(broadcast);
-            })
-
-            resolve(broadcasts);
-        });
-    })
-}
-
-AppDataSource.initialize().then(async () => {
-
-    console.log('PARSING HTML ...');
-
-    const broadcasts1: any = await parseBroadcasts('AOKI');
-    console.log('...', broadcasts1.length, 'BROADCASTS FOUND IN AOKI');
-    const broadcasts2: any = await parseBroadcasts('EIBI');
-    console.log('...', broadcasts2.length, 'BROADCASTS FOUND IN EIBI');
-    const broadcasts3: any = await parseBroadcasts('HFCC');
-    console.log('...', broadcasts3.length, 'BROADCASTS FOUND IN HFCC');
-
-    const broadcasts = [... broadcasts1, ... broadcasts2, ... broadcasts3]
-
-    console.log(broadcasts.length, 'BROADCASTS FOUND IN TOTAL');
-
-    console.log('POPULATING DATABASE ...');
-
-    for (let i=0; i<broadcasts.length; i++) {
-        try {
-            if (i%1000 === 0) console.log(i);
-            // await siteRepository.save(broadcasts[i].site);
-
-            const siteName = broadcasts[i].site.name;
-            const site = await AppDataSource.manager.findOne(Site, {where: {name: siteName}});
-            if (site) {
-                broadcasts[i].site = site;
-            }
-            else {
-               await AppDataSource.manager.save(broadcasts[i].site);
-            }
-            await AppDataSource.manager.save(broadcasts[i]);
-        }
-        catch (e) {
-            console.log(i, 'NOT UNIQUE', broadcasts[i]);
-        }
-    }
-
-}).catch(error => console.log(error))
+import * as fs from 'fs';
+import * as url from 'url';
+import { AppDataSource } from "./data-source";
+import {Site} from "./entity/Site";
+import {Broadcast} from "./entity/Broadcast";
+import {JSDOM} from "jsdom";
+const jquery = require("jquery");
+
+function parseBroadcasts(sourceName) {
+
+    return new Promise(resolve => {
+
+        const broadcasts = [];
+        const sites = [];
+
+        fs.readFile(`../sources/shortwave_${sourceName}.html`, 'utf8', async function(err, testHTML) {
+
+            global.document = new JSDOM( testHTML );
+            const $ = jquery(global.document.window);
+            const rows = $('table.results tr');
+
+            rows.each(async (i, row) => {
+
+                // if (i===0 || i>100) return false;
+                if (i===0) return false;
+                if (i%1000 === 0) console.log(sourceName, i);
+
+                const cells = $(row).find('td');
+
+                const fq = Number.parseFloat($(cells[0]).html());
+                const startStopTime = $(cells[1]).html().split('-');
+                const station = $(cells[2]).html();
+                const country = $(cells[3]).html();
+                const language = $(cells[4]).html();
+                const days = $(cells[5]).html();
+                const link = $(cells[6]).html();
+                let lon=0, lat=0, siteName='unknown';
+                try {
+                    const a = $(link);
+                    // console.log(a.length);
+                    siteName = a.length === 1 ? a.html() : link;
+                    const coordString = (new url.URL(a.attr('href'))).searchParams.get('center').split(',');
+                    lat = Number.parseFloat(coordString[0]);
+                    lon = Number.parseFloat(coordString[1]);
+                }
+                catch (e) {
+                }
+
+                const startHour = Number.parseInt(startStopTime[0].substring(0,2));
+                const startMin = Number.parseInt(startStopTime[0].substring(2,4));
+                const stopHour = Number.parseInt(startStopTime[1].substring(0,2));
+                const stopMin = Number.parseInt(startStopTime[1].substring(2,4));
+
+                let daysInteger = 0;
+                for (let i = 0; i < days.length; i++) {
+                    const dayInt = parseInt(days.charAt(i));
+                    if (!isNaN(dayInt)) {
+                        daysInteger += Math.pow(2, dayInt-1);
+                    }
+                }
+
+                // console.log(fq, lon, lat, startStopTime, startHour, stopHour, days);
+
+                const site = new Site();
+                site.name = siteName;
+                site.power = 0;
+                site.lon = lon;
+                site.lat = lat;
+
+                const broadcast = new Broadcast();
+                broadcast.frequency = fq;
+                broadcast.site = site;
+                broadcast.days = daysInteger;
+                broadcast.startTime = startMin + 60*startHour;
+                broadcast.endTime = stopMin + 60*stopHour;
+                broadcast.station = station;
+                broadcast.country = country;
+                broadcast.language = language;
+                broadcast.source = sourceName;
+
+                sites.push(site);
+                broadcasts.push(broadcast);
+            })
+
+            resolve(broadcasts);
+        });
+    })
+}
+
+AppDataSource.initialize().then(async () => {
+
+    console.log('PARSING HTML ...');
+
+    const broadcasts1: any = await parseBroadcasts('AOKI');
+    console.log('...', broadcasts1.length, 'BROADCASTS FOUND IN AOKI');
+    const broadcasts2: any = await parseBroadcasts('EIBI');
+    console.log('...', broadcasts2.length, 'BROADCASTS FOUND IN EIBI');
+    const broadcasts3: any = await parseBroadcasts('HFCC');
+    console.log('...', broadcasts3.length, 'BROADCASTS FOUND IN HFCC');
+
+    const broadcasts = [... broadcasts1, ... broadcasts2, ... broadcasts3]
+
+    console.log(broadcasts.length, 'BROADCASTS FOUND IN TOTAL');
+
+    console.log('POPULATING DATABASE ...');
+
+    for (let i=0; i<broadcasts.length; i++) {
+        try {
+            if (i%1000 === 0) console.log(i);
+            // await siteRepository.save(broadcasts[i].site);
+
+            const siteName = broadcasts[i].site.name;
+            const site = await AppDataSource.manager.findOne(Site, {where: {name: siteName}});
+            if (site) {
+                broadcasts[i].site = site;
+            }
+            else {
+               await AppDataSource.manager.save(broadcasts[i].site);
+            }
+            await AppDataSource.manager.save(broadcasts[i]);
+        }
+        catch (e) {
+            console.log(i, 'NOT UNIQUE', broadcasts[i]);
+        }
+    }
+
+}).catch(error => console.log(error))

package/sqlite/data-source.ts

@@ -1,17 +1,17 @@
-import "reflect-metadata"
-import { DataSource } from "typeorm"
-import { Site } from "./entity/Site"
-import { Broadcast } from "./entity/Broadcast"
-
-const currentTime = new Date();
-
-export const AppDataSource = new DataSource({
-    type: "sqlite",
-    // database: `database_${currentTime.getFullYear()}-${currentTime.getMonth()}-${currentTime.getDate()}_${currentTime.getHours()}${currentTime.getMinutes()}${currentTime.getSeconds()}.sqlite`,
-    database: `database.sqlite`,
-    synchronize: true,
-    logging: false,
-    entities: [Site, Broadcast],
-    migrations: [],
-    subscribers: [],
-})
+import "reflect-metadata"
+import { DataSource } from "typeorm"
+import { Site } from "./entity/Site"
+import { Broadcast } from "./entity/Broadcast"
+
+const currentTime = new Date();
+
+export const AppDataSource = new DataSource({
+    type: "sqlite",
+    // database: `database_${currentTime.getFullYear()}-${currentTime.getMonth()}-${currentTime.getDate()}_${currentTime.getHours()}${currentTime.getMinutes()}${currentTime.getSeconds()}.sqlite`,
+    database: `database.sqlite`,
+    synchronize: true,
+    logging: false,
+    entities: [Site, Broadcast],
+    migrations: [],
+    subscribers: [],
+})

package/sqlite/entity/Broadcast.ts

@@ -1,38 +1,38 @@
-import {Entity, PrimaryGeneratedColumn, Column, ManyToOne, JoinColumn, Unique} from "typeorm";
-import {Site} from "./Site";
-
-@Entity()
-@Unique(['frequency', 'days', 'startTime', 'endTime', 'station', 'country', 'language', 'site'])
-export class Broadcast {
-
-    @PrimaryGeneratedColumn()
-    id: number;
-
-    @Column({nullable: true})
-    frequency: number;
-
-    @Column({nullable: true})
-    days: number;
-
-    @Column({nullable: true})
-    startTime: number;
-
-    @Column({nullable: true})
-    endTime: number;
-
-    @Column({nullable: true})
-    station: string;
-
-    @Column({nullable: true})
-    country: string;
-
-    @Column({nullable: true})
-    language: string;
-
-    @Column({nullable: true})
-    source: string;
-
-    @ManyToOne(type => Site)
-    @JoinColumn()
-    site: Site;
-}
+import {Entity, PrimaryGeneratedColumn, Column, ManyToOne, JoinColumn, Unique} from "typeorm";
+import {Site} from "./Site";
+
+@Entity()
+@Unique(['frequency', 'days', 'startTime', 'endTime', 'station', 'country', 'language', 'site'])
+export class Broadcast {
+
+    @PrimaryGeneratedColumn()
+    id: number;
+
+    @Column({nullable: true})
+    frequency: number;
+
+    @Column({nullable: true})
+    days: number;
+
+    @Column({nullable: true})
+    startTime: number;
+
+    @Column({nullable: true})
+    endTime: number;
+
+    @Column({nullable: true})
+    station: string;
+
+    @Column({nullable: true})
+    country: string;
+
+    @Column({nullable: true})
+    language: string;
+
+    @Column({nullable: true})
+    source: string;
+
+    @ManyToOne(type => Site)
+    @JoinColumn()
+    site: Site;
+}

package/sqlite/entity/Site.ts

@@ -1,26 +1,26 @@
-import {Entity, PrimaryGeneratedColumn, Column, Unique, OneToMany} from "typeorm";
-import {Broadcast} from "./Broadcast";
-
-@Entity()
-@Unique(['name'])
-export class Site {
-
-    @PrimaryGeneratedColumn()
-    id: number;
-
-    @Column()
-    name: string;
-
-    @Column()
-    power: number;
-
-    @Column()
-    lon: number;
-
-    @Column()
-    lat: number;
-
-    @OneToMany(type => Broadcast, broadcasts => broadcasts.site)
-    broadcasts: Broadcast[];
-
-}
+import {Entity, PrimaryGeneratedColumn, Column, Unique, OneToMany} from "typeorm";
+import {Broadcast} from "./Broadcast";
+
+@Entity()
+@Unique(['name'])
+export class Site {
+
+    @PrimaryGeneratedColumn()
+    id: number;
+
+    @Column()
+    name: string;
+
+    @Column()
+    power: number;
+
+    @Column()
+    lon: number;
+
+    @Column()
+    lat: number;
+
+    @OneToMany(type => Broadcast, broadcasts => broadcasts.site)
+    broadcasts: Broadcast[];
+
+}