修复CF提交空间使用不准确的bug

This commit is contained in:
Himit_ZH 2021-07-07 18:59:05 +08:00
parent c63f8b0237
commit 2345c56d4c
4 changed files with 38 additions and 3 deletions

View File

@ -143,7 +143,7 @@ public class CodeForcesJudge implements RemoteJudgeStrategy {
.put("status", statusType.getStatus()).build(); .put("status", statusType.getStatus()).build();
} }
resultMap.put("time", result.get("timeConsumedMillis")); resultMap.put("time", result.get("timeConsumedMillis"));
resultMap.put("memory", result.get("memoryConsumedBytes")); resultMap.put("memory", (int) result.get("memoryConsumedBytes") / 1024);
Constants.Judge resultStatus = statusMap.get(verdict); Constants.Judge resultStatus = statusMap.get(verdict);
if (resultStatus == Constants.Judge.STATUS_COMPILE_ERROR) { if (resultStatus == Constants.Judge.STATUS_COMPILE_ERROR) {

View File

@ -17,6 +17,40 @@ function duration (startTime, endTime) {
return duration.humanize() return duration.humanize()
} }
function formatSpecificDuration(startTime, endTime){
let start = moment(startTime)
let end = moment(endTime)
let ms = moment.duration(start.diff(end, 'seconds'), 'seconds')
if (ms < 0) ms = -ms;
let arr=[86400000,3600000,60000,1000];
let en_time=['day','hour','minute','second'];
let zh_time=['天','小时','分','秒'];
let res = '';
if(i18n.locale=='en-US'){
for(let i=0;i<arr.length;i++){
let tmp = parseFloat((ms / arr[i]).toFixed(1));
if(tmp>=1){
res+=tmp+' '+en_time[i];
if(tmp!=1){
res+='s';
}
return res;
}
}
}else if(i18n.locale=='zh-CN'){
for(let i=0;i<arr.length;i++){
let tmp = parseFloat((ms / arr[i]).toFixed(1));
if(tmp>=1){
return tmp+zh_time[i];
}
}
}
};
function formatDuration(time){ function formatDuration(time){
let duration = moment.duration(time) let duration = moment.duration(time)
return duration.humanize() return duration.humanize()
@ -38,6 +72,7 @@ function durationMs (startTime, endTime) { // 计算时间段的时间戳
export default { export default {
utcToLocal: utcToLocal, utcToLocal: utcToLocal,
duration: duration, duration: duration,
formatSpecificDuration:formatSpecificDuration,
secondFormat: secondFormat, secondFormat: secondFormat,
durationMs:durationMs, durationMs:durationMs,
formatDuration:formatDuration formatDuration:formatDuration

View File

@ -312,7 +312,7 @@ export default {
}); });
}, },
getDuration(startTime, endTime) { getDuration(startTime, endTime) {
return time.duration(startTime, endTime); return time.formatSpecificDuration(startTime, endTime);
}, },
getRankTagClass(rowIndex) { getRankTagClass(rowIndex) {
return 'rank-tag no' + (rowIndex + 1); return 'rank-tag no' + (rowIndex + 1);

View File

@ -287,7 +287,7 @@ export default {
} }
}, },
getDuration(startTime, endTime) { getDuration(startTime, endTime) {
return time.duration(startTime, endTime); return time.formatSpecificDuration(startTime, endTime);
}, },
getborderColor(contest) { getborderColor(contest) {
return ( return (