av/travian
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add time format

Browse Source
This commit is contained in:
Anton Vakhrushev 2020-03-31 12:37:17 +03:00
parent 847ad57f66
commit 0ffbf1c1a9
6 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
package-lock.json generated
View File

@ -330,6 +330,12 @@
"integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
"dev": true
},
"@types/dateformat": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/@types/dateformat/-/dateformat-3.0.1.tgz",
"integrity": "sha512-KlPPdikagvL6ELjWsljbyDIPzNCeliYkqRpI+zea99vBBbCIA5JNshZAwQKTON139c87y9qvTFVgkFd14rtS4g==",
"dev": true
},
"@types/jquery": {
"version": "3.3.34",
"resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.34.tgz",
@ -1978,6 +1984,12 @@
"integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=",
"dev": true
},
"dateformat": {
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz",
"integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==",
"dev": true
},
"debug": {
"version": "3.2.6",
"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",

2
package.json
View File

@ -22,12 +22,14 @@
},
"devDependencies": {
"@types/chai": "^4.2.11",
"@types/dateformat": "^3.0.1",
"@types/jquery": "^3.3.34",
"@types/mocha": "^7.0.2",
"@types/nanoid": "^2.1.0",
"@types/node": "^13.9.4",
"@types/url-parse": "^1.4.3",
"chai": "^4.2.0",
"dateformat": "^3.0.3",
"jquery": "^3.4.1",
"mocha": "^7.1.1",
"mocha-junit-reporter": "^1.23.3",

2
src/Action/UpgradeBuildingAction.ts
View File

@ -21,7 +21,7 @@ export default class UpgradeBuildingAction extends ActionController {
this.scheduler.completeTask(task.id);
btn.trigger('click');
} else {
throw new TryLaterError(60, 'No upgrade button, try later');
throw new TryLaterError(5 * 60, 'No upgrade button, try later');
}
return null;
}

2
src/Scheduler.ts
View File

@ -148,7 +148,7 @@ export default class Scheduler {
if (e instanceof TryLaterError) {
console.warn('TRY', task.id, 'AFTER', e.seconds);
this.actionQueue.clear();
this.taskQueue.postpone(task.id, e.seconds);
this.taskQueue.postpone(task.id, timestamp() + e.seconds);
this.nextSleepLong();
}
}

4
src/Storage/TaskQueue.ts
View File

@ -54,11 +54,11 @@ export class TaskQueue {
this.flushItems(items);
}
postpone(id: TaskId, deltaSeconds: number) {
postpone(id: TaskId, newTs: number) {
const [task, items] = this.shiftTask(id);
if (task) {
this.log('POSTPONE', task);
items.push(task.withTime(task.ts + deltaSeconds));
items.push(task.withTime(newTs));
}
this.flushItems(items);
}

8
src/TaskQueueRenderer.ts
View File

@ -1,8 +1,14 @@
import { TaskList } from './Storage/TaskQueue';
import { uniqId } from './utils';
import dateFormat = require('dateformat');
const ID = uniqId();
function formatDate(ts: number) {
const d = new Date(ts * 1000);
return dateFormat(d, 'HH:MM:ss');
}
export default class TaskQueueRenderer {
render(tasks: TaskList) {
const ul = jQuery('<ul></ul>')
@ -19,7 +25,7 @@ export default class TaskQueueRenderer {
tasks.forEach(task => {
ul.append(
jQuery('<li></li>').text(
task.ts +
formatDate(task.ts) +
' ' +
task.cmd.name +
' ' +