Skip to content

Commit 66eee76

Browse files
committed
style(grabber): re-config eslint & re-format code
1 parent 43ff3cd commit 66eee76

File tree

9 files changed

+657
-559
lines changed

9 files changed

+657
-559
lines changed

.babelrc

Lines changed: 0 additions & 7 deletions
This file was deleted.

.eslintrc.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ module.exports = {
66
es2020: true,
77
node: true,
88
},
9-
parser: 'babel-eslint',
9+
parserOptions: {
10+
parser: 'babel-eslint',
11+
},
1012
extends: [
1113
'eslint:recommended',
1214
],

helper.js

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
1-
import fs from 'fs-extra';
2-
import axios from 'axios';
3-
import inquirer from 'inquirer';
1+
const fs = require('fs-extra')
2+
const axios = require('axios')
3+
const inquirer = require('inquirer')
44

5-
import * as logger from './logger';
5+
const logger = require('./logger')
66

7-
export async function download(apiPath, dest) {
8-
logger.Assets.info('DOWNLOAD', apiPath);
7+
exports.download = async function download (apiPath, dest) {
8+
logger.Assets.info('DOWNLOAD', apiPath)
99
const {data} = await axios.get(apiPath, {responseType: 'stream'})
10-
.catch(err => logger.Assets.error('DOWNLOAD', apiPath, err.toJSON()));
11-
data.pipe(fs.createWriteStream(dest));
10+
.catch(err => logger.Assets.error('DOWNLOAD', apiPath, err.toJSON()))
11+
data.pipe(fs.createWriteStream(dest))
1212
}
1313

14-
export function writeJSON(dest, data) {
14+
exports.writeJSON = function writeJSON (dest, data) {
1515
fs.writeFile(dest, JSON.stringify(data), (err) => {
1616
if (err) {
17-
logger.WriteJSON.error('CREATE', dest, err);
17+
logger.WriteJSON.error('CREATE', dest, err)
1818
} else {
19-
logger.WriteJSON.info('CREATE', dest);
19+
logger.WriteJSON.info('CREATE', dest)
2020
}
21-
});
21+
})
2222
}
2323

24-
export function mergeStats(data) {
25-
let merged = {};
26-
if (data.hasOwnProperty('stats')) {
24+
exports.mergeStats = function mergeStats (data) {
25+
let merged = {}
26+
if (Object.prototype.hasOwnProperty.call(data, 'stats')) {
2727
for (let key in data.stats) {
2828
for (let s in data.stats[key]) {
2929
merged[key + '/' + s] = data.stats[key][s]
3030
}
3131
}
32-
return merged;
32+
return merged
3333
}
34-
return data;
34+
return data
3535
}
3636

37-
export function defaultSkin(uuid) {
37+
exports.defaultSkin = function defaultSkin (uuid) {
3838
// great thanks to Minecrell for research into Minecraft and Java's UUID hashing!
3939
// https://git.io/xJpV
4040
// MC uses `uuid.hashCode() & 1` for alex
@@ -43,34 +43,34 @@ export function defaultSkin(uuid) {
4343
// XOR-ing all the LSBs gives us 1 for alex and 0 for steve
4444
const isEven = (c) => {
4545
if (c >= '0' && c <= '9') {
46-
return (c & 1) === 0; // eslint-disable-line
46+
return (c & 1) === 0
4747
} else if (c >= 'a' && c <= 'f') {
48-
return (c & 1) === 1; // eslint-disable-line
48+
return (c & 1) === 1
4949
}
50-
console.log('Invalid digit', c);
51-
return null;
52-
};
50+
console.log('Invalid digit', c)
51+
return null
52+
}
5353
const lsbsEven =
54-
(isEven(uuid[7]) !== isEven(uuid[23])) !== (isEven(uuid[15]) !== isEven(uuid[31]));
55-
return lsbsEven ? 'Alex' : 'Steve';
54+
(isEven(uuid[7]) !== isEven(uuid[23])) !== (isEven(uuid[15]) !== isEven(uuid[31]))
55+
return lsbsEven ? 'Alex' : 'Steve'
5656
}
5757

58-
export async function confirm(message, _default = true) {
59-
const prompt = inquirer.createPromptModule();
58+
exports.confirm = async function confirm (message, _default = true) {
59+
const prompt = inquirer.createPromptModule()
6060
try {
6161
const res = await prompt({
6262
type: 'confirm',
6363
name: 'confirm',
6464
default: _default,
6565
message,
66-
});
67-
return res.confirm;
66+
})
67+
return res.confirm
6868
} catch (error) {
69-
logger.Default.error('Cannot get user input.');
70-
return false;
69+
logger.Default.error('Cannot get user input.')
70+
return false
7171
}
7272
}
7373

74-
export function delay(ms) {
75-
return new Promise(resolve => setTimeout(resolve, ms));
74+
exports.delay = function delay (ms) {
75+
return new Promise(resolve => setTimeout(resolve, ms))
7676
}

index.js

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,99 +1,99 @@
1-
import fs from 'fs-extra';
2-
import path from 'path';
1+
const fs = require('fs-extra')
2+
const path = require('path')
33

4-
import Utils from './utils';
5-
import { writeJSON, confirm } from './helper';
6-
import * as logger from './logger';
7-
import ProgressBar from './progressbar';
4+
const Utils = require('./utils')
5+
const {writeJSON, confirm} = require('./helper')
6+
const logger = require('./logger')
7+
const ProgressBar = require('./progressbar')
88

99
process.on('SIGINT', () => {
10-
process.exit();
11-
});
10+
process.exit()
11+
})
1212

13-
process.stdout.write('\x1Bc');
13+
process.stdout.write('\x1Bc')
1414

15-
const utils = new Utils();
16-
const config = utils.getConfig();
15+
const utils = new Utils()
16+
const config = utils.getConfig()
1717

18-
let playerlist = [];
18+
let playerlist = []
1919
if (config.render.whitelist) {
20-
playerlist = utils.getWhitelistedPlayers();
20+
playerlist = utils.getWhitelistedPlayers()
2121
} else {
22-
playerlist = utils.getAllPlayers();
22+
playerlist = utils.getAllPlayers()
2323
}
24-
logger.Default.info('Players found', playerlist.length);
24+
logger.Default.info('Players found', playerlist.length)
2525

2626
if (config.render.advancements) {
27-
logger.Default.info('Advancements is set: Render mode set to 1.12+');
27+
logger.Default.info('Advancements is set: Render mode set to 1.12+')
2828
if (!config['advancements-progress']) {
29-
logger.Default.warn('You do not have advancements progresses defined. Please visit github.com/NyaaCat/NyaaStats for a new version of config file.');
29+
logger.Default.warn('You do not have advancements progresses defined. Please visit github.com/NyaaCat/NyaaStats for a new version of config file.')
3030
}
3131
} else {
32-
logger.Default.info('Advancements not set: Render mode set to 1.11');
32+
logger.Default.info('Advancements not set: Render mode set to 1.11')
3333
}
3434

35-
const output = path.join(config.BASEPATH, config.render.output);
36-
logger.Default.info('CREATE OUTPUT DIR', output);
35+
const output = path.join(config.BASEPATH, config.render.output)
36+
logger.Default.info('CREATE OUTPUT DIR', output)
3737

3838

39-
(async () => {
39+
;(async () => {
4040
if (config.render['confirm-clear-data'] || config.render['confirm-clear-data'] === undefined) {
41-
const prompt = await confirm('Do you want to clean the output folder?');
41+
const prompt = await confirm('Do you want to clean the output folder?')
4242
if (prompt) {
4343
try {
44-
fs.emptyDirSync(output);
44+
fs.emptyDirSync(output)
4545
} catch (err) {
46-
throw new Error(err);
46+
throw new Error(err)
4747
}
4848
}
4949
}
5050

51-
let banlist = [];
52-
const players = [];
51+
let banlist = []
52+
const players = []
5353
if (config.render['banned-players']) {
54-
banlist = utils.getBannedPlayers();
54+
banlist = utils.getBannedPlayers()
5555
}
5656
if (!config.render['render-banned']) {
57-
playerlist = playerlist.filter(uuid => !banlist.some(ban => ban === uuid));
57+
playerlist = playerlist.filter(uuid => !banlist.some(ban => ban === uuid))
5858
}
59-
playerlist = playerlist.sort(() => 0.5 - Math.random());
59+
playerlist = playerlist.sort(() => 0.5 - Math.random())
6060

61-
const totalTasks = playerlist.length;
62-
const progress = new ProgressBar(totalTasks);
63-
progress.start();
61+
const totalTasks = playerlist.length
62+
const progress = new ProgressBar(totalTasks)
63+
progress.start()
6464
for (const uuid of playerlist) {
65-
let banned = false;
65+
let banned = false
6666
if (config.render['render-banned']) {
67-
banned = banlist.some(ban => ban === uuid);
67+
banned = banlist.some(ban => ban === uuid)
6868
}
69-
let data;
69+
let data
7070
try {
71-
data = await utils.createPlayerData(uuid, banned);
71+
data = await utils.createPlayerData(uuid, banned)
7272
} catch (error) {
73-
progress.tick(uuid);
74-
continue;
73+
progress.tick(uuid)
74+
continue
7575
}
7676
players.push({
7777
uuid: data.data.uuid_short,
7878
playername: data.data.playername,
7979
names: data.data.names,
8080
seen: data.data.seen,
81-
});
82-
progress.tick(uuid);
81+
})
82+
progress.tick(uuid)
8383
}
84-
progress.stop();
84+
progress.stop()
8585

86-
players.sort((a, b) => b.seen - a.seen); // eslint-disable-line
86+
players.sort((a, b) => b.seen - a.seen)
8787
writeJSON(
8888
path.join(config.BASEPATH, config.render.output, 'players.json'),
8989
players,
90-
);
90+
)
9191

92-
let worldTime;
92+
let worldTime
9393
try {
94-
worldTime = await utils.getWorldTime();
94+
worldTime = await utils.getWorldTime()
9595
} catch (error) {
96-
throw new Error(error);
96+
throw new Error(error)
9797
}
9898
writeJSON(
9999
path.join(config.BASEPATH, config.render.output, 'info.json'),
@@ -104,5 +104,5 @@ logger.Default.info('CREATE OUTPUT DIR', output);
104104
advancementsProgress: config['advancements-progress'],
105105
...config.web,
106106
},
107-
);
108-
})();
107+
)
108+
})()

logger.js

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
import log4js from 'log4js';
1+
const log4js = require('log4js')
22

33
log4js.configure({
44
level: 'info',
55
appenders: {
6-
Default: { type: 'stdout' },
7-
Config: { type: 'stdout' },
8-
PlayerData: { type: 'stdout' },
9-
MojangAPI: { type: 'stdout' },
10-
Assets: { type: 'stdout' },
11-
WriteJSON: { type: 'stdout' },
6+
Default: {type: 'stdout'},
7+
Config: {type: 'stdout'},
8+
PlayerData: {type: 'stdout'},
9+
MojangAPI: {type: 'stdout'},
10+
Assets: {type: 'stdout'},
11+
WriteJSON: {type: 'stdout'},
1212
},
1313
categories: {
1414
default: {
1515
appenders: ['Default'],
1616
level: 'info',
1717
},
1818
},
19-
});
19+
})
2020

21-
export const Default = log4js.getLogger('Default');
22-
export const Config = log4js.getLogger('Config');
23-
export const PlayerData = log4js.getLogger('PlayerData');
24-
export const MojangAPI = log4js.getLogger('MojangAPI');
25-
export const Assets = log4js.getLogger('Assets');
26-
export const WriteJSON = log4js.getLogger('WriteJSON');
21+
exports.Default = log4js.getLogger('Default')
22+
exports.Config = log4js.getLogger('Config')
23+
exports.PlayerData = log4js.getLogger('PlayerData')
24+
exports.MojangAPI = log4js.getLogger('MojangAPI')
25+
exports.Assets = log4js.getLogger('Assets')
26+
exports.WriteJSON = log4js.getLogger('WriteJSON')

0 commit comments

Comments
 (0)