added task preview execution mode

ADClock · Apr 4, 2021 · a3bc832 · a3bc832
1 parent cb3ccde
commit a3bc832
Showing 1 changed file with 26 additions and 6 deletions.
diff --git a/src/instructionset/Task.kt b/src/instructionset/Task.kt
@@ -2,7 +2,6 @@ package com.adclock.instructionset
 
 import com.adclock.instructionset.instructions.Instruction
 import com.adclock.model.ClockWall
-import com.adclock.services.WallInteractionService
 
 data class Task(val name: String, val instructions: MutableList<Instruction> = mutableListOf()) {
     private var current: Int = 0
@@ -11,17 +10,38 @@ data class Task(val name: String, val instructions: MutableList<Instruction> = m
 
     fun isCompleted() = current >= instructions.size
 
-    fun apply(wall: ClockWall) {
+    fun apply(wall: ClockWall, preview: Boolean = false) {
         if (isCompleted())
             throw IllegalStateException("This task is already completed. Can't perform more steps.")
 
-        if (sleepUntil > System.currentTimeMillis())
+        if (sleepUntil > System.currentTimeMillis() && !preview)
             return
 
-        val instruction = instructions[current]
-        if (instruction.apply(this, wall))
+        if (applyInstruction(wall, current(), preview))
             current++
     }
 
-    internal fun restart() { current = 0 }
+    fun current() = instructions[current]
+
+    internal fun restart() {
+        current = 0
+    }
+
+    /**
+     * Apply instruction to wall.
+     * In normal Mode just execute once.
+     * In preview Mode execute until a significant step was made.
+     *
+     * @param wall ClockWall
+     * @param instruction Instruction
+     * @param preview Boolean
+     * @return Boolean
+     */
+    private fun applyInstruction(wall: ClockWall, instruction: Instruction, preview: Boolean): Boolean {
+        var stepMade: Boolean
+        do {
+           stepMade = instruction.apply(this, wall)
+        } while (preview && !stepMade)
+        return stepMade
+    }
 }