Skip to content

Commit de15fb0

Browse files
fixes
1 parent 028febf commit de15fb0

12 files changed

+299
-251
lines changed

.dockerignore

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ config.user.bak
1414
/windbot
1515
/decks
1616
/decks_save*
17+
/deck_log
1718
/replays
1819
/node_modules
1920
/ssl

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ config.user.bak
1414
/windbot
1515
/decks
1616
/decks_save*
17+
/deck_log
1718
/replays
1819
/node_modules
1920
/ssl

Replay.coffee

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ class Replay
117117
@header == null ? false : @header.isTag
118118

119119
@fromFile: (filePath) ->
120-
Replay.fromBuffer fs.readFileSync filePath
120+
Replay.fromBuffer await fs.promises.readFile filePath
121121

122122
@fromBuffer: (buffer) ->
123123
reader = new ReplayReader buffer

Replay.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

data-manager/DataManager.js

+11-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

data-manager/DataManager.ts

+15-7
Original file line numberDiff line numberDiff line change
@@ -262,13 +262,21 @@ export class DataManager {
262262
return allDuelLogs.map(duelLog => duelLog.replayFileName);
263263
}
264264
async clearDuelLog() {
265-
const repo = this.db.getRepository(DuelLog);
266-
try {
267-
await repo.clear();
268-
} catch (e) {
269-
this.log.warn(`Failed to clear duel logs: ${e.toString()}`);
270-
return [];
271-
}
265+
//await this.db.transaction(async (mdb) => {
266+
const runner = this.db.createQueryRunner();
267+
try {
268+
await runner.connect();
269+
await runner.startTransaction();
270+
await runner.query("SET FOREIGN_KEY_CHECKS = 0; ");
271+
await runner.clearTable("duel_log_player");
272+
await runner.clearTable("duel_log");
273+
await runner.query("SET FOREIGN_KEY_CHECKS = 1; ");
274+
await runner.commitTransaction();
275+
} catch (e) {
276+
await runner.rollbackTransaction();
277+
this.log.warn(`Failed to clear duel logs: ${e.toString()}`);
278+
}
279+
//});
272280
}
273281
async saveDuelLog(name: string, roomId: number, cloudReplayId: number, replayFilename: string, roomMode: number, duelCount: number, playerInfos: DuelLogPlayerInfo[]) {
274282
const duelLog = new DuelLog();

data-manager/entities/DuelLog.js

+2-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

data-manager/entities/DuelLog.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export class DuelLog {
4444
getViewJSON(tournamentModeSettings: any) {
4545
const data = {
4646
id: this.id,
47-
time: moment(this.time).format("YYYY-MM-DD HH-mm-ss"),
47+
time: moment(this.time).format("YYYY-MM-DD HH:mm:ss"),
4848
name: this.name + (tournamentModeSettings.show_info ? " (Duel:" + this.duelCount + ")" : ""),
4949
roomid: this.roomId,
5050
cloud_replay_id: "R#" + this.cloudReplayId,
@@ -59,5 +59,6 @@ export class DuelLog {
5959
}
6060
})
6161
}
62+
return data;
6263
}
6364
}

package-lock.json

+10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"axios": "^0.19.2",
1919
"bunyan": "^1.8.14",
2020
"challonge": "latest",
21+
"coffeescript": "^2.5.1",
2122
"deepmerge": "latest",
2223
"formidable": "latest",
2324
"geoip-country-lite": "latest",
@@ -32,12 +33,14 @@
3233
"request": "latest",
3334
"sqlite3": "latest",
3435
"typeorm": "^0.2.29",
36+
"typescript": "^4.0.5",
3537
"underscore": "latest",
3638
"underscore.string": "latest",
3739
"ws": "^1.1.1"
3840
},
3941
"license": "AGPL-3.0",
4042
"scripts": {
43+
"build": "coffee -c *.coffee && tsc",
4144
"start": "node ygopro-server.js",
4245
"tournament": "node ygopro-tournament.js",
4346
"pre": "node ygopro-pre.js",

0 commit comments

Comments
 (0)