Weishen/Hydro
2
0 Fork 0
mirror of https://gitcode.com/gh_mirrors/hy/Hydro.git synced 2026-10-20 01:38:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

core: fix problem_files.git

Browse Source
This commit is contained in:
undefined committed 2021-05-06 18:31:50 +08:00
1 parent e89c5cd10e
commit a44055d54a
4 files changed
+5 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/hydrooj/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "hydrooj", "name": "hydrooj",
"version": "2.24.16", "version": "2.24.17",
"bin": "bin/hydrooj.js", "bin": "bin/hydrooj.js",
"main": "dist/loader.js", "main": "dist/loader.js",
"typings": "dist/loader.d.ts", "typings": "dist/loader.d.ts",
packages/hydrooj/src/handler/problem.ts
+2 -2
View File
@@ -382,8 +382,8 @@ export class ProblemFilesHandler extends ProblemDetailHandler {
@param('additional_file', Types.Boolean) @param('additional_file', Types.Boolean)
async get(domainId: string, getTestdata = true, getAdditionalFile = true) { async get(domainId: string, getTestdata = true, getAdditionalFile = true) {
const canReadData = !this.user.own(this.pdoc) || this.user.hasPerm(PERM.PERM_READ_PROBLEM_DATA); const canReadData = !this.user.own(this.pdoc) || this.user.hasPerm(PERM.PERM_READ_PROBLEM_DATA);
this.response.body.testdata = (getTestdata && canReadData) ? sortFiles(this.pdoc.data) : []; this.response.body.testdata = (getTestdata && canReadData) ? sortFiles(this.pdoc.data || []) : [];
this.response.body.additional_file = getAdditionalFile ? sortFiles(this.pdoc.additional_file) : []; this.response.body.additional_file = getAdditionalFile ? sortFiles(this.pdoc.additional_file || []) : [];
this.response.template = 'problem_files.html'; this.response.template = 'problem_files.html';
} }
packages/utils/lib/utils.ts
+1
View File
@@ -393,6 +393,7 @@ CallableInstance.prototype = Object.create(Function.prototype);
const fSortR = /[^\d]+|\d+/g; const fSortR = /[^\d]+|\d+/g;
export function sortFiles(files: { _id: string }[] | string[]) { export function sortFiles(files: { _id: string }[] | string[]) {
if (!files?.length) return [];
const isString = typeof files[0] === 'string'; const isString = typeof files[0] === 'string';
const result = files const result = files
.map((i) => (isString ? { name: i, weights: i.match(fSortR) } : { ...i, weights: i._id.match(fSortR) })) .map((i) => (isString ? { name: i, weights: i.match(fSortR) } : { ...i, weights: i._id.match(fSortR) }))
packages/utils/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "@hydrooj/utils", "name": "@hydrooj/utils",
"version": "1.0.12", "version": "1.0.13",
"description": "hydrooj utils", "description": "hydrooj utils",
"main": "package.json", "main": "package.json",
"repository": "https://github.com/hydro-dev/Hydro.git", "repository": "https://github.com/hydro-dev/Hydro.git",