clean up code
This commit is contained in:
@ -1,7 +1,7 @@
|
||||
export {Task,ITaskFunction} from './taskbuffer.classes.task';
|
||||
export {Taskchain} from './taskbuffer.classes.taskchain';
|
||||
export {Taskparallel} from './taskbuffer.classes.taskparallel';
|
||||
export {Taskspace} from './taskbuffer.classes.taskspace';
|
||||
export {Task,ITaskFunction} from './taskbuffer.classes.task'
|
||||
export {Taskchain} from './taskbuffer.classes.taskchain'
|
||||
export {Taskparallel} from './taskbuffer.classes.taskparallel'
|
||||
export {Taskspace} from './taskbuffer.classes.taskspace'
|
||||
|
||||
// import for naming only
|
||||
import './taskbuffer.classes.helpers'
|
||||
|
@ -1,4 +1,4 @@
|
||||
import plugins = require('./taskbuffer.plugins');
|
||||
import plugins = require('./taskbuffer.plugins')
|
||||
import { Task, ITaskFunction } from './taskbuffer.classes.task'
|
||||
|
||||
export let emptyTaskFunction: ITaskFunction = function (x) {
|
||||
@ -18,7 +18,6 @@ export let isTask = function (taskArg: Task): boolean {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
export let isTaskTouched = (taskArg: Task, touchedTasksArray: Task[]): boolean => {
|
||||
let result = false
|
||||
for (let keyArg in touchedTasksArray) {
|
||||
@ -79,7 +78,6 @@ export let runTask = function (taskArg: Task, optionsArg: { x?, touchedTasksArra
|
||||
return done.promise
|
||||
}
|
||||
|
||||
|
||||
export interface cycleObject {
|
||||
cycleCounter: number,
|
||||
deferred: plugins.q.Deferred<any>
|
||||
@ -90,8 +88,8 @@ export class CycleCounter {
|
||||
cycleObjectArray: cycleObject[] = []
|
||||
constructor(taskArg: Task) {
|
||||
this.task = taskArg
|
||||
};
|
||||
getPromiseForCycle(cycleCountArg: number) {
|
||||
}
|
||||
getPromiseForCycle (cycleCountArg: number) {
|
||||
let done = plugins.q.defer()
|
||||
let cycleObject: cycleObject = {
|
||||
cycleCounter: cycleCountArg,
|
||||
@ -99,8 +97,8 @@ export class CycleCounter {
|
||||
}
|
||||
this.cycleObjectArray.push(cycleObject)
|
||||
return done.promise
|
||||
};
|
||||
informOfCycle(x) {
|
||||
}
|
||||
informOfCycle (x) {
|
||||
let newCycleObjectArray: cycleObject[] = []
|
||||
this.cycleObjectArray.forEach(cycleObjectArg => {
|
||||
cycleObjectArg.cycleCounter--
|
||||
@ -108,7 +106,7 @@ export class CycleCounter {
|
||||
cycleObjectArg.deferred.resolve(x)
|
||||
} else {
|
||||
newCycleObjectArray.push(cycleObjectArg)
|
||||
};
|
||||
}
|
||||
})
|
||||
this.cycleObjectArray = newCycleObjectArray
|
||||
}
|
||||
@ -122,8 +120,24 @@ export class BufferRunner {
|
||||
running: boolean = false
|
||||
constructor(taskArg: Task) {
|
||||
this.task = taskArg
|
||||
};
|
||||
private _run(x) {
|
||||
}
|
||||
|
||||
setBufferMax (bufferMaxArg: number) {
|
||||
this.bufferMax = bufferMaxArg
|
||||
}
|
||||
|
||||
trigger (x): Promise<any> {
|
||||
if (!(this.bufferCounter >= this.bufferMax)) {
|
||||
this.bufferCounter++
|
||||
}
|
||||
let returnPromise: Promise<any> = this.task.cycleCounter.getPromiseForCycle(this.bufferCounter + 1)
|
||||
if (!this.running) {
|
||||
this._run(x)
|
||||
}
|
||||
return returnPromise
|
||||
}
|
||||
|
||||
private _run (x) {
|
||||
let recursiveBufferRunner = (x) => {
|
||||
if (this.bufferCounter >= 0) {
|
||||
this.running = true
|
||||
@ -140,18 +154,6 @@ export class BufferRunner {
|
||||
}
|
||||
}
|
||||
recursiveBufferRunner(x)
|
||||
};
|
||||
setBufferMax(bufferMaxArg: number) {
|
||||
this.bufferMax = bufferMaxArg
|
||||
};
|
||||
trigger(x): Promise<any> {
|
||||
if (!(this.bufferCounter >= this.bufferMax)) {
|
||||
this.bufferCounter++
|
||||
};
|
||||
let returnPromise: Promise<any> = this.task.cycleCounter.getPromiseForCycle(this.bufferCounter + 1)
|
||||
if (!this.running) {
|
||||
this._run(x)
|
||||
}
|
||||
return returnPromise
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -2,11 +2,11 @@ import * as plugins from './taskbuffer.plugins'
|
||||
import * as helpers from './taskbuffer.classes.helpers'
|
||||
|
||||
export interface ITaskFunction {
|
||||
(x?: any): PromiseLike<any>;
|
||||
(x?: any): PromiseLike<any>
|
||||
}
|
||||
|
||||
export class Task {
|
||||
name: string;
|
||||
name: string
|
||||
taskFunction: ITaskFunction
|
||||
buffered: boolean
|
||||
preTask: Task
|
||||
@ -40,37 +40,36 @@ export class Task {
|
||||
/**
|
||||
* trigger the task. Will trigger buffered if this.buffered is true
|
||||
*/
|
||||
trigger(x?): Promise<any> {
|
||||
trigger (x?): Promise<any> {
|
||||
if (this.buffered) {
|
||||
return this.triggerBuffered(x)
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
return this.triggerUnBuffered(x)
|
||||
};
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* trigger task unbuffered.
|
||||
*/
|
||||
triggerUnBuffered(x?): Promise<any> {
|
||||
triggerUnBuffered (x?): Promise<any> {
|
||||
return helpers.runTask(this, { x: x })
|
||||
}
|
||||
|
||||
/**
|
||||
* trigger task buffered.
|
||||
*/
|
||||
triggerBuffered(x?): Promise<any> {
|
||||
triggerBuffered (x?): Promise<any> {
|
||||
return this.bufferRunner.trigger(x)
|
||||
}
|
||||
|
||||
get state(): string {
|
||||
get state (): string {
|
||||
return this._state
|
||||
}
|
||||
set state(stateArg: string) {
|
||||
set state (stateArg: string) {
|
||||
if (stateArg === 'locked') {
|
||||
this._state = 'locked'
|
||||
} else {
|
||||
plugins.beautylog.error('state type ' + stateArg + ' could not be set')
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
import * as plugins from './taskbuffer.plugins';
|
||||
import { Task } from './taskbuffer.classes.task';
|
||||
import helpers = require('./taskbuffer.classes.helpers');
|
||||
import * as plugins from './taskbuffer.plugins'
|
||||
import { Task } from './taskbuffer.classes.task'
|
||||
import helpers = require('./taskbuffer.classes.helpers')
|
||||
|
||||
export class Taskchain extends Task {
|
||||
taskArray: Task[]
|
||||
@ -46,15 +46,15 @@ export class Taskchain extends Task {
|
||||
this._oraObject = plugins.beautylog.ora
|
||||
if (optionsArg.log === true) {
|
||||
this._oraObject.start()
|
||||
};
|
||||
}
|
||||
}
|
||||
addTask(taskArg: Task) {
|
||||
addTask (taskArg: Task) {
|
||||
this.taskArray.push(taskArg)
|
||||
};
|
||||
removeTask(taskArg: Task) {
|
||||
// TODO
|
||||
};
|
||||
shiftTask() {
|
||||
|
||||
};
|
||||
}
|
||||
removeTask (taskArg: Task) {
|
||||
// TODO:
|
||||
}
|
||||
shiftTask () {
|
||||
// TODO:
|
||||
}
|
||||
}
|
||||
|
@ -1 +1 @@
|
||||
import * as plugins from './taskbuffer.plugins'
|
||||
import * as plugins from './taskbuffer.plugins'
|
||||
|
Reference in New Issue
Block a user