Skip to content

Commit b838180

Browse files
committed
fix more styling issue
1 parent ebeebeb commit b838180

File tree

4 files changed

+69
-89
lines changed

4 files changed

+69
-89
lines changed

server/config/env.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
"use strict";
2-
3-
const env = process.env;
1+
const { env } = process;
42

53
module.exports = {
64
isDev: env.NODE_ENV === 'dev',
75
port: env.PORT || 8080,
86
ip: 'localhost',
9-
};
7+
};

server/resource/mysqlConnection.js

Lines changed: 19 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,24 @@
1-
var mysql = require('mysql');
1+
const mysql = require('mysql');
22

3-
var pool = mysql.createPool({
4-
connectionLimit : 2,
5-
host : process.env['SQL_HOST'],
6-
port : process.env['SQL_PORT'],
7-
user : process.env['SQL_USERNAME'],
8-
password : process.env['SQL_PASSWORD'],
9-
database : process.env['SQL_DATABASE']
3+
const pool = mysql.createPool({
4+
connectionLimit: 2,
5+
host: process.env.SQL_HOST,
6+
port: process.env.SQL_PORT,
7+
user: process.env.SQL_USERNAME,
8+
password: process.env.SQL_PASSWORD,
9+
database: process.env.SQL_DATABASE,
1010
});
1111

1212
module.exports = {
13-
getPool: function(){
14-
return pool;
15-
},
16-
sqlExecOne: function(qr){
17-
return new Promise(function(resolve, reject){
18-
pool.query(qr, function(err, rows, fields){
19-
if(err){
20-
console.error(err.message);
21-
reject(err);
22-
}else{
23-
resolve(rows);
24-
}
25-
});
13+
getPool: () => pool,
14+
sqlExecOne: qr => new Promise((resolve, reject) => {
15+
pool.query(qr, (err, rows) => {
16+
if (err) {
17+
console.error(err.message);
18+
reject(err);
19+
} else {
20+
resolve(rows);
21+
}
2622
});
27-
}
28-
};
23+
}),
24+
};

server/task/crawler/github.js

Lines changed: 34 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,52 @@
1-
"use strict";
1+
const cheerio = require('cheerio');
2+
const async = require('async');
3+
const rp = require('request-promise');
4+
const sqlConn = require('../../resource/mysqlConnection');
5+
const globalConfig = require('../../config/env');
26

3-
const cheerio = require('cheerio'),
4-
async = require('async'),
5-
fs = require('fs'),
6-
rp = require('request-promise'),
7-
sqlConn = require('../../resource/mysqlConnection'),
8-
globalConfig = require('../../config/env'),
9-
10-
CONCURRENCY = 10,
11-
TIMEOUT = 5 * 1000,
12-
JOBFLAG = '_JOBDONE';
7+
const CONCURRENCY = 10;
8+
const TIMEOUT = 5 * 1000;
9+
const JOBFLAG = '_JOBDONE';
1310

1411
let finished = null;
1512
const privateFn = {
16-
checkNameExist: (v) => {
17-
if(v.name.length === 0){
18-
let gitList = v.github.split('/');
19-
v.name = gitList[1];
20-
}
21-
},
22-
2313
promiseLoop: (data0, resolve, reject) => {
2414
console.log(`downloading ${data0.length} packages...`);
2515
async.mapLimit(data0, CONCURRENCY, (v, cb) => {
26-
privateFn.checkNameExist(v);
16+
if (v.name.length === 0) {
17+
const gitList = v.github.split('/');
18+
v.name = gitList[1];
19+
}
2720
privateFn.getNum(v, cb);
2821
}, (error, data) => {
29-
let unfinished = data.filter(v => !v[JOBFLAG]);
22+
const unfinished = data.filter(v => !v[JOBFLAG]);
3023
finished = finished.concat(data.filter(v => v[JOBFLAG]));
31-
if(unfinished.length > 0){
24+
if (unfinished.length > 0) {
3225
return privateFn.promiseLoop(unfinished, resolve, reject);
33-
}else{
34-
let result = finished.filter(v => v[JOBFLAG]);
35-
resolve(result);
3626
}
27+
const result = finished.filter(v => v[JOBFLAG]);
28+
resolve(result);
29+
return 0;
3730
});
3831
},
3932

40-
getNum: (obj, cb)=> {
41-
//console.log('download ' + obj.name);
33+
getNum: (obj0, cb) => {
34+
const obj = Object.assign({}, obj0);
4235
rp({
43-
uri: 'https://github.com/' + obj.github,
36+
uri: `https://github.com/${obj.github}`,
4437
timeout: TIMEOUT,
45-
transform: function (body) {
46-
return cheerio.load(body);
47-
}
38+
transform: body => cheerio.load(body),
4839
})
49-
.then(function ($) {
50-
let elems = $('.social-count.js-social-count');
51-
let starElem = elems[0];
52-
let num = starElem.children[0].data.trim();
53-
obj['star'] = num;
40+
.then(($) => {
41+
const elems = $('.social-count.js-social-count');
42+
const starElem = elems[0];
43+
const num = starElem.children[0].data.trim();
44+
obj.star = num;
5445
obj[JOBFLAG] = true;
5546
cb(null, obj);
5647
})
57-
.catch(function (err) {
58-
console.error('crawler timeout on ' + obj.name);
48+
.catch(() => {
49+
console.error(`crawler timeout on ${obj.name}`);
5950
cb(null, obj);
6051
});
6152
},
@@ -65,19 +56,19 @@ const publicFn = {
6556
start: () => {
6657
finished = [];
6758
const deferred = new Promise((resolve, reject) => {
68-
var qr = "SELECT * FROM git WHERE `group` IS NOT NULL";
69-
if(globalConfig.isDev){
70-
qr = "SELECT * FROM git WHERE `group` IS NOT NULL AND id > 419";
59+
let qr = 'SELECT * FROM git WHERE `group` IS NOT NULL';
60+
if (globalConfig.isDev) {
61+
qr = 'SELECT * FROM git WHERE `group` IS NOT NULL AND id > 419';
7162
}
7263
sqlConn.sqlExecOne(qr).then((db) => {
73-
privateFn.promiseLoop(db, resolve, reject)
74-
}, (err) => {
64+
privateFn.promiseLoop(db, resolve, reject);
65+
}, () => {
7566
console.error('sql executed fails1.');
7667
});
7768
});
7869

7970
return deferred;
80-
}
71+
},
8172
};
8273

8374
module.exports = publicFn;

server/task/index.js

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,27 @@
1-
'use strict';
1+
const inst1 = require('./render/main');
2+
const inst2 = require('./render/site');
3+
const inst3 = require('./render/article2');
4+
const inst4 = require('./render/article1');
5+
const vm = require('./render/viewModel_article.json');
26

3-
const globalConfig = require('../config/env'),
4-
mysql = require('../resource/mysqlConnection'),
5-
path = require('path'),
6-
inst1 = require('./render/main'),
7-
inst2 = require('./render/site'),
8-
inst3 = require('./render/article2'),
9-
inst4 = require('./render/article1'),
10-
vm = require('./render/viewModel_article.json');
117

12-
13-
console.log("================================");
14-
console.log(`updating the article...`);
15-
console.log("================================");
8+
console.log('================================');
9+
console.log('updating the article...');
10+
console.log('================================');
1611

1712
inst3.start();
18-
vm.article.forEach(v => {
19-
if(v.fileName){
13+
vm.article.forEach((v) => {
14+
if (v.fileName) {
2015
inst4.start(v.id);
2116
}
2217
});
2318

24-
console.log("================================");
25-
console.log(`updating the views...`);
26-
console.log("================================");
19+
console.log('================================');
20+
console.log('updating the views...');
21+
console.log('================================');
2722

2823
inst1.start(() => {
2924
console.log('Finished Sucess!');
3025
process.exit();
3126
});
32-
inst2.start();
27+
inst2.start();

0 commit comments

Comments
 (0)