\r\n
\r\n';
+ var front = '\r\n \r\n \r\n \r\n
Spellbinder - Chapter \r\n
\r\n
\r\n \r\n \r\n
';
- var source = req.body.source;
+ var source = req.body.source;
// console.log(source);
- var output = source.replace(r.msoTags, "");
- output = output.replace(r.msoParagraphs, '
');
- output = output.replace(/(\r\n)/g, " ");
- output = output.replace(/(\\r\\n)/g, " ");
+ var output = source.replace(r.msoTags, '');
+ output = output.replace(r.msoParagraphs, '
');
+ output = output.replace(/(\r\n)/g, ' ');
+ output = output.replace(/(\\r\\n)/g, ' ');
- output = output.replace(/<\/i>/g, "");
- output = output.replace(/[“|”]/g, '"');
- output = output.replace(/’/g, "'");
- output = output.replace(/…/g, "…");
- output = output.replace(/(.*?)<\/i>/g, "$1");
- output = output.replace(/(.*?)<\/b>/g, "$1");
- output = output.replace(/
\*\*\*<\/p>/g, "
* * *
");
+ output = output.replace(/
<\/i>/g, '');
+ output = output.replace(/[“|”]/g, '"');
+ output = output.replace(/’/g, '\'');
+ output = output.replace(/…/g, '…');
+ output = output.replace(/(.*?)<\/i>/g, '$1');
+ output = output.replace(/(.*?)<\/b>/g, '$1');
+ output = output.replace(/\*\*\*<\/p>/g, '
* * *
');
- output = output.replace(/
CHAPTER\s(\d.?)<\/p>/, "
$1
");
- output = output.replace(/
( |\s|\s<\/em>)<\/p>/g, "");
- output = output.replace(/ /g, " ");
+ output = output.replace(/CHAPTER\s(\d.?)<\/p>/, '
$1
');
+ output = output.replace(/( |\s|\s<\/em>)<\/p>/g, '');
+ output = output.replace(/ /g, ' ');
- output = output.replace(/\s<\/em><\/p>/g, "");
- output = output.replace(/\s<\/p>/g, "");
+ output = output.replace(/
\s<\/em><\/p>/g, '');
+ output = output.replace(/\s<\/p>/g, '');
- output = output.replace(/\s+/g, " ");
- output = output.replace(/<\/p>/g, "
\r\n");
+ output = output.replace(/\s+/g, ' ');
+ output = output.replace(/<\/p>/g, '
\r\n');
// sys.puts(sys.inspect(output, false, null));
- res.setHeader('Content-Type', 'application/html');
- res.end(front + output + back);
- }
-};
\ No newline at end of file
+ res.setHeader('Content-Type', 'application/html');
+ res.end(front + output + back);
+ }
+};
diff --git a/lib/events.js b/lib/events.js
index 4437783..d4220d7 100644
--- a/lib/events.js
+++ b/lib/events.js
@@ -1,145 +1,142 @@
-var http = require('http'), request = require('request'), cheerio = require('cheerio');
+const http = require('http'), request = require('request'), cheerio = require('cheerio');
-var eventTimer = 0;
-var eventCache = {
- last: 0,
- data: {},
- expire: ((60 * 1000) * 60) * 12,
- cinema: {}
+const eventTimer = 0;
+const eventCache = {
+ 'last': 0,
+ 'data': {},
+ 'expire': ((60 * 1000) * 60) * 12,
+ 'cinema': {}
};
// 'cwr':{data: {}, last:0};
-var cinemas = [{id: 'cwr', url: 'https://film.list.co.uk/cinema/14982-cineworld-renfrew-street/'},
- {id: 'gsc', url: 'https://film.list.co.uk/cinema/13590-cineworld-glasgow-science-centre/'},
- {id: 'pho', url: 'https://film.list.co.uk/cinema/12500-showcase-cinema-paisley/'}];
+const cinemas = [{ 'id': 'cwr', 'url': 'https://film.list.co.uk/cinema/14982-cineworld-renfrew-street/' },
+ { 'id': 'gsc', 'url': 'https://film.list.co.uk/cinema/13590-cineworld-glasgow-science-centre/' },
+ { 'id': 'pho', 'url': 'https://film.list.co.uk/cinema/12500-showcase-cinema-paisley/' }];
module.exports = {
- getEvents: function (req, res) {
+ 'getEvents': function (req, res) {
+ console.log('Getting events...');
+ const j = [], url = 'https://www.list.co.uk/events/days-out/when:this%20weekend/location:Dumbarton(55.9460,-4.5556)/distance:20/';
- console.log('Getting events...');
- var j = [], url = 'https://www.list.co.uk/events/days-out/when:this%20weekend/location:Dumbarton(55.9460,-4.5556)/distance:20/';
+ const now = new Date();
- var now = new Date();
-
- if ((now - eventCache.last) > eventCache.expire) {
- request(url, function (err, resp, body) {
- if (err)
- throw err;
- $ = cheerio.load(body);
+ if ((now - eventCache.last) > eventCache.expire)
+ request(url, function (err, resp, body) {
+ if (err)
+ throw err;
+ $ = cheerio.load(body);
// console.log($);
// TODO: scraping goes here!
- $('.resultsRow').each(function (div) {
- var item = {};
- var eventSummary = $(this).find('.eventSummary').first();
- var byDate = $(this).find('.byDate').first();
+ $('.resultsRow').each(function (div) {
+ const item = {};
+ const eventSummary = $(this).find('.eventSummary').first();
+ const byDate = $(this).find('.byDate').first();
- var title = eventSummary.find('.head').first();
- var description = eventSummary.find('P').first();
- var link = ' https://www.list.co.uk' + eventSummary.find('A').first().attr('href');
+ const title = eventSummary.find('.head').first();
+ const description = eventSummary.find('P').first();
+ const link = ` https://www.list.co.uk${ eventSummary.find('A').first().attr('href')}`;
- var price = byDate.find('.price').first();
- var dt = byDate.find('.dtstart').first().attr('title');
+ const price = byDate.find('.price').first();
+ const dt = byDate.find('.dtstart').first().attr('title');
- item.title = title.text();
- item.description = description.text();
- item.link = link;
- item.price = price.text();
- item.date = dt;
+ item.title = title.text();
+ item.description = description.text();
+ item.link = link;
+ item.price = price.text();
+ item.date = dt;
- j.push(item);
- });
+ j.push(item);
+ });
- eventCache.last = now;
- eventCache.data = j;
+ eventCache.last = now;
+ eventCache.data = j;
- res.render('pages/events', eventCache);
-
- }, function(error, response, body) {
- if(response.statusCode !== 200) {
- logger.error(response.statusCode);
- logger.error(body);
- }
- });
- } else {
- console.log('Using event cache...');
-
- res.render('pages/events', eventCache);
+ res.render('pages/events', eventCache);
+ }, function(error, response, body) {
+ if(response.statusCode !== 200) {
+ logger.error(response.statusCode);
+ logger.error(body);
}
+ });
+ else {
+ console.log('Using event cache...');
- },
- doGetCinema: function (id) {
- var cinemaID = cinemas[id].id;
- var url = cinemas[id].url;
- var thisCinema = eventCache[cinemaID] || {data: {}, last: 0};
- console.log(cinemaID);
- console.log(url);
- var j = [];
-
- var now = new Date();
-
- if ((now - thisCinema.last) > eventCache.expire) {
- request(url, function (err, resp, body) {
- console.log('Working');
- if (err)
- throw err;
- $ = cheerio.load(body);
-
- $('.byEvent').each(function (div) {
- var item = {};
- var title = $(this).find('H4').first();
- var eventSummary = $(this).find('.eventSummary').first();
-
- var description = eventSummary.find('P').first();
- var link = ' https://www.list.co.uk' + eventSummary.find('A').first().attr('href');
-
- item.title = title.text();
- item.description = description.text();
- item.link = link;
-
- j.push(item);
- });
-
- thisCinema.last = now;
- thisCinema.data = j;
-
- eventCache[cinemaID] = thisCinema;
- console.log('returning');
-
- return thisCinema;
-
- }, function(error, response, body) {
- if(response.statusCode !== 200) {
- console.error(response.statusCode);
- console.error(body);
- }
- });
- } else {
- console.log('Using event cache...');
- return thisCinema;
- }
- },
- getCinema: function (req, res) {
- var id = parseInt(req.params.id);
- console.log('Getting cinema: ' +id);
-
- var output = module.exports.doGetCinema(id);
- res.render('pages/cinema', output);
- },
- preLoad: function () {
- var output = module.exports.doGetCinema(0);
- output = module.exports.doGetCinema(1);
- output = module.exports.doGetCinema(2);
-
- setTimeout(function () {
- module.exports.preLoad();
- }, eventCache.expire);
+ res.render('pages/events', eventCache);
}
+ },
+ 'doGetCinema': function (id) {
+ const cinemaID = cinemas[id].id;
+ const url = cinemas[id].url;
+ const thisCinema = eventCache[cinemaID] || { 'data': {}, 'last': 0 };
+ console.log(cinemaID);
+ console.log(url);
+ const j = [];
+
+ const now = new Date();
+
+ if ((now - thisCinema.last) > eventCache.expire)
+ request(url, function (err, resp, body) {
+ console.log('Working');
+ if (err)
+ throw err;
+ $ = cheerio.load(body);
+
+ $('.byEvent').each(function (div) {
+ const item = {};
+ const title = $(this).find('H4').first();
+ const eventSummary = $(this).find('.eventSummary').first();
+
+ const description = eventSummary.find('P').first();
+ const link = ` https://www.list.co.uk${ eventSummary.find('A').first().attr('href')}`;
+
+ item.title = title.text();
+ item.description = description.text();
+ item.link = link;
+
+ j.push(item);
+ });
+
+ thisCinema.last = now;
+ thisCinema.data = j;
+
+ eventCache[cinemaID] = thisCinema;
+ console.log('returning');
+
+ return thisCinema;
+ }, function(error, response, body) {
+ if(response.statusCode !== 200) {
+ console.error(response.statusCode);
+ console.error(body);
+ }
+ });
+ else {
+ console.log('Using event cache...');
+
+ return thisCinema;
+ }
+ },
+ 'getCinema': function (req, res) {
+ const id = parseInt(req.params.id);
+ console.log(`Getting cinema: ${ id}`);
+
+ const output = module.exports.doGetCinema(id);
+ res.render('pages/cinema', output);
+ },
+ 'preLoad': function () {
+ let output = module.exports.doGetCinema(0);
+ output = module.exports.doGetCinema(1);
+ output = module.exports.doGetCinema(2);
+
+ setTimeout(function () {
+ module.exports.preLoad();
+ }, eventCache.expire);
+ }
};
setTimeout(function () {
- console.log('Pre loading cinemas...');
- module.exports.preLoad();
+ console.log('Pre loading cinemas...');
+ module.exports.preLoad();
}, 10000);
diff --git a/lib/fx.js b/lib/fx.js
index d3e2252..def928e 100644
--- a/lib/fx.js
+++ b/lib/fx.js
@@ -4,17 +4,17 @@ const trend = require('trend');
const logger = require('log4js').getLogger('fx');
const delay = 2764800; // 32 days divided by 1000
let fxCache = {};
-let history = new LimitedArray(48); // one days worth in 5 minute chunks
+const history = new LimitedArray(48); // one days worth in 5 minute chunks
function getFx() {
logger.info('FX request');
function fxQuery(callback) {
- let options = {
- host: 'openexchangerates.org',
- // port: 80,
- path: '/api/latest.json?app_id=0eb932cee3bc40259f824d4b4c96c7d2',
+ const options = {
+ 'host': 'openexchangerates.org',
+ // port: 80,
+ 'path': '/api/latest.json?app_id=0eb932cee3bc40259f824d4b4c96c7d2',
// method: 'GET',
- headers: { }
+ 'headers': { }
};
http.request(options).on('response', response => {
@@ -36,12 +36,10 @@ function getFx() {
logger.info('Got FX data. Storing it');
fxCache = a;
- let minRates = {USD:fxCache.rates.USD, GBP:fxCache.rates.GBP, SEK:fxCache.rates.SEK};
- fxCache.rates = minRates;
+ fxCache.rates = { 'USD': fxCache.rates.USD, 'GBP': fxCache.rates.GBP, 'SEK': fxCache.rates.SEK };
history.push(a.rates.GBP);
fxCache.history = history.get();
- fxCache.trend = trend(fxCache.history, {avgPoints: 12});
-
+ fxCache.trend = trend(fxCache.history, { 'avgPoints': 12 });
});
}
@@ -55,7 +53,7 @@ function updateFX() {
const mod = delay - (now.getTime() % delay);
- let fxUpdateFn = () => {
+ const fxUpdateFn = () => {
updateFX();
};
setTimeout(fxUpdateFn.bind(this), mod + 10);
@@ -67,5 +65,4 @@ exports.doFx = (req, res) => {
logger.info('FX request');
res.setHeader('Content-Type', 'application/json');
res.end(JSON.stringify(fxCache));
-
};
diff --git a/lib/password.js b/lib/password.js
index f9b8656..e35bfba 100644
--- a/lib/password.js
+++ b/lib/password.js
@@ -46,19 +46,18 @@ var numberCluster = function () {
var randomAmount = function (i) {
var str = '';
- for (var t = 0; t < i; t++) {
+ for (var t = 0; t < i; t++)
str = str + alpha.random();
- }
return str;
};
module.exports = {
- generate: function (req, res) {
+ 'generate': function (req, res) {
var reply = {
- long: (left.random() + ' ' + right.random() + ' ' + numberCluster() + ' ' + numberCluster()).split(' ').join(whitespace.random()),
- short: randomAmount(10)
+ 'long': (`${left.random() } ${ right.random() } ${ numberCluster() } ${ numberCluster()}`).split(' ').join(whitespace.random()),
+ 'short': randomAmount(10)
};
res.setHeader('Content-Type', 'application/json');
diff --git a/views/pages/slackV2-min.ejs b/views/pages/slackV2-min.ejs
index 9b4c413..b1160ab 100644
--- a/views/pages/slackV2-min.ejs
+++ b/views/pages/slackV2-min.ejs
@@ -24,7 +24,7 @@
diff --git a/web-server.js b/web-server.js
index a8a2510..e9e6d19 100644
--- a/web-server.js
+++ b/web-server.js
@@ -20,24 +20,23 @@ const errorhandler = require('errorhandler');
const jsonfile = require('jsonfile');
const Events = require('events');
-let busEmitter = new Events.EventEmitter();
+const busEmitter = new Events.EventEmitter();
-//busEmitter.on('update', today.broadcast);
+// busEmitter.on('update', today.broadcast);
const WebSocketServer = require('ws').Server;
-const wss = new WebSocketServer({server: server});
+const wss = new WebSocketServer({ 'server': server });
const SocketHandler = require('./lib/wshandlerv2');
-let webSocket = new SocketHandler(busEmitter, wss);
+const webSocket = new SocketHandler(busEmitter, wss);
-//today.setEmitter(busEmitter);
+// today.setEmitter(busEmitter);
// train = require('lib/train')
/* ,submit = require('./routes/mongo/submit') */
-
-let fs = require('fs');
+const fs = require('fs');
const config = require('./config/config.json');
const Fitbit = require('fitbit-oauth2');
@@ -51,20 +50,20 @@ let btcCache = {}, fxCache = {}, trainCache = {};
const port = process.env.PORT || 9000;
-
// app.configure(function () {
app.set('port', port);
app.set('view engine', 'ejs');
app.use(morgan('dev'));
app.use(cookieParser('your secret here'));
app.use(session({
- secret: 'd2jRT6ZpYFsXsF3kGS21ZszKbPAaEa', resave: false,
- saveUninitialized: false
+ 'secret': 'd2jRT6ZpYFsXsF3kGS21ZszKbPAaEa', 'resave': false,
+ 'saveUninitialized': false
}));
+
/* 'default', 'short', 'tiny', 'dev' */
app.use(methodoverride());
-app.use(bodyparser.urlencoded({extended: false}));
+app.use(bodyparser.urlencoded({ 'extended': false }));
// parse application/json
app.use(bodyparser.json());
@@ -77,7 +76,7 @@ app.use(function(req, res, next) {
// app.use(app.router);
app.use(express.static(path.join(__dirname, 'app')));
-app.use(errorhandler({dumpExceptions: true, showStack: true}));
+app.use(errorhandler({ 'dumpExceptions': true, 'showStack': true }));
app.use('/btc', btc.doBTC);
app.use('/balance', btc.doBalance);
@@ -94,26 +93,22 @@ app.use('/generate', password.generate);
app.use('/cleanit', clean.cleanit);
-
-
app.use('/events', events.getEvents);
app.get('/cinema/:id', events.getCinema);
// app.get('/today', today.getToday);
// app.get('/today/data', today.getData);
-//app.route('/clock').get(today.getClock);
+// app.route('/clock').get(today.getClock);
app.route('/poly').get(polys);
-
-/*app.use('/lot', function(req, res) {
+/* app.use('/lot', function(req, res) {
const pg = require('pg');
const conString = 'postgres://pguser:1V3D4m526i@localhost/silver';
console.log(conString);
-
const client = new pg.Client(conString);
const q = 'select * from lot order by d desc';
client.connect(function(err) {
@@ -140,15 +135,11 @@ app.get('/temp', function(req, res) {
res.render('pages/temp');
});
-
-
const tfile = 'fb-token.json';
-
// Instanciate a fitbit client. See example config below.
//
-
const fitbit = new Fitbit(config.fitbit);
// In a browser, http://localhost:4000/fitbit to authorize a user for the first time.
@@ -157,11 +148,10 @@ app.get('/fitbit', function(req, res) {
res.redirect(fitbit.authorizeURL());
});
-
app.get( '/fb-profile', function( req, res, next ) {
fitbit.request({
- uri: 'https://api.fitbit.com/1/user/-/profile.json',
- method: 'GET',
+ 'uri': 'https://api.fitbit.com/1/user/-/profile.json',
+ 'method': 'GET'
}, function( err, body, token ) {
if ( err ) return next( err );
var profile = JSON.parse( body );
@@ -169,20 +159,20 @@ app.get( '/fb-profile', function( req, res, next ) {
if ( token )
persist.write( tfile, token, function( err ) {
if ( err ) return next( err );
- res.send( '
' + JSON.stringify( profile, null, 2 ) + '
' );
+ res.send( `
${ JSON.stringify( profile, null, 2 ) }` );
});
else
- res.send( '
' + JSON.stringify( profile, null, 2 ) + '
' );
+ res.send( `
${ JSON.stringify( profile, null, 2 ) }` );
});
});
app.get( '/fb-today', function( req, res, next ) {
const today = Date.create('today').format('{yyyy}-{MM}-{dd}');
- const url = 'https://api.fitbit.com/1/user/-/activities/date/' + today + '.json';
+ const url = `https://api.fitbit.com/1/user/-/activities/date/${ today }.json`;
fitbit.request({
- uri: url,
- method: 'GET',
+ 'uri': url,
+ 'method': 'GET'
}, function( err, body, token ) {
if ( err ) return next( err );
var profile = JSON.parse( body );
@@ -190,10 +180,10 @@ app.get( '/fb-today', function( req, res, next ) {
if ( token )
persist.write( tfile, token, function( err ) {
if ( err ) return next( err );
- res.send( '
' + JSON.stringify( profile, null, 2 ) + '
' );
+ res.send( `
${ JSON.stringify( profile, null, 2 ) }` );
});
else
- res.send( '
' + JSON.stringify( profile, null, 2 ) + '
' );
+ res.send( `
${ JSON.stringify( profile, null, 2 ) }` );
});
});
@@ -206,7 +196,6 @@ app.get('/fitbit_auth_callback', function(req, res, next) {
fitbit.fetchToken(code, function(err, token) {
if (err)
return next(err);
-
// persist the token
jsonfile.writeFile(tfile, token, function(err) {
@@ -215,21 +204,17 @@ app.get('/fitbit_auth_callback', function(req, res, next) {
console.log('!!!! Fitbit token saved');
res.redirect('/fb-profile');
-
});
});
});
-
jsonfile.readFile('./fb-token.json', function(err, obj) {
if (err)
logger.error(err);
else
fitbit.setToken(obj);
-
});
-
// });
/**
@@ -242,10 +227,8 @@ http.createServer(app).listen(app.get('port'), function () {
});
*/
-
-
server.on('request', app);
server.listen(port, () => {
- logger.info('New server listening on ' + server.address().port);
+ logger.info(`New server listening on ${ server.address().port}`);
});