albert/mrfrys-node-server
1
0
Fork 0
mirror of https://gitlab.com/MrFry/mrfrys-node-server synced 2025-04-01 20:24:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

ranklist using files.ts, minor loggin improvements

Browse source
This commit is contained in:
mrfry 2023-04-12 15:11:27 +02:00
parent 0f66411b96
commit c009a6f7d4
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/modules/api/submodules/ranklist.ts
View file

@ -21,6 +21,7 @@
import logger from '../../../utils/logger' import logger from '../../../utils/logger'
import utils from '../../../utils/utils' import utils from '../../../utils/utils'
import { Request, SubmoduleData, User } from '../../../types/basicTypes' import { Request, SubmoduleData, User } from '../../../types/basicTypes'
import { paths } from '../../../utils/files'
interface Subjects { interface Subjects {
[key: string]: number [key: string]: number
@ -41,9 +42,6 @@ interface IdStatWithUID extends IdStat {
userId: number userId: number
} }
const idStatFile = 'stats/idstats'
const idvStatFile = 'stats/idvstats'
function mergeObjSum(a: Subjects, b: Subjects) { function mergeObjSum(a: Subjects, b: Subjects) {
const res = { ...b } const res = { ...b }
Object.keys(a).forEach((key) => { Object.keys(a).forEach((key) => {
@ -67,14 +65,14 @@ function setup(data: SubmoduleData): void {
const user: User = req.session.user const user: User = req.session.user
if (!querySince) { if (!querySince) {
result = utils.ReadJSON(idStatFile) result = utils.ReadJSON(paths.idstatsFile)
} else { } else {
try { try {
const since = new Date(querySince) const since = new Date(querySince)
if (!(since instanceof Date) || isNaN(since.getTime())) { if (!(since instanceof Date) || isNaN(since.getTime())) {
throw new Error('Not a date') throw new Error('Not a date')
} }
const data = utils.ReadJSON(idvStatFile) const data = utils.ReadJSON(paths.idvstatsFile)
result = {} result = {}
Object.keys(data).forEach((key) => { Object.keys(data).forEach((key) => {

6
src/utils/files.ts
View file

@ -44,7 +44,9 @@ export const validateAndSetupFiles = (): boolean => {
} }
if (file.warningIfMissing && !fileExists) { if (file.warningIfMissing && !fileExists) {
const warningMsg = [`File "${file.path}" does not exist! (${key})`] const warningMsg = [
`Optional file "${file.path}" does not exist! (${key})`,
]
if (file.description) { if (file.description) {
warningMsg.push(`Should be: ${file.description}`) warningMsg.push(`Should be: ${file.description}`)
} }
@ -81,7 +83,7 @@ const filesFiles = {
httpsFiles: { httpsFiles: {
path: 'data/httpsfiles.json', path: 'data/httpsfiles.json',
description: description:
'file paths for https functionality (privkey, chain files). Optional if https server is not used', 'file paths for https functionality (privkey, chain files)',
schema: HttpsFilesSchema, schema: HttpsFilesSchema,
warningIfMissing: true, warningIfMissing: true,
}, },

2
submodules/qmining-page

@ -1 +1 @@
Subproject commit 8267534a3f4279169c9ed11d0bef019b12cac2a2 Subproject commit 338db8e1417ba4aa647a74e0a5bad70fb04bc79e