Merge pull request #122 from izumiya-keisuke/bug

[bug] web permute
24ik · May 18, 2024 · c2bebda · c2bebda
2 parents f8dad23 + 0e17812
commit c2bebda
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/pon2.nimble b/pon2.nimble
@@ -1,6 +1,6 @@
 # Package
 
-version = "0.16.2"
+version = "0.16.3"
 author = "Keisuke Izumiya"
 description = "Application for Puyo Puyo and Nazo Puyo"
 license = "Apache-2.0"

diff --git a/src/pon2pkg/private/app/gui/web/webworker.nim b/src/pon2pkg/private/app/gui/web/webworker.nim
@@ -221,8 +221,7 @@ proc asyncPermute*[F: TsuField or WaterField](
 
       var nazo2 = nazo
       nazo2.puyoPuyo.pairsPositions = pairsPositionsSeq[pairsPositionsIdx]
-      worker.run $Permute,
-        $pairsPositionsIdx, $nazo2.toUriQuery Izumiya, $nazo2.puyoPuyo.field.rule
+      worker.run $Permute, $nazo2.toUriQuery Izumiya, $nazo2.puyoPuyo.field.rule
       pairsPositionsIdx.inc
 
   interval = runWorkers.setInterval WaitLoopIntervalMs
diff --git a/src/pon2pkg/private/main/web.nim b/src/pon2pkg/private/main/web.nim
@@ -43,20 +43,20 @@ proc workerTask*(
       result.returnCode = Failure
       result.messages = @["Caught invalid number of arguments: " & $args]
   of $Permute:
-    if args2.len == 3:
+    if args2.len == 2:
       result.returnCode = Success
 
       let nazoPuyoWrap: NazoPuyoWrap
-      case args2[2].parseRule
+      case args2[1].parseRule
       of Tsu:
-        nazoPuyoWrap = parseNazoPuyo[TsuField](args2[1], Izumiya).initNazoPuyoWrap
+        nazoPuyoWrap = parseNazoPuyo[TsuField](args2[0], Izumiya).initNazoPuyoWrap
       of Water:
-        nazoPuyoWrap = parseNazoPuyo[WaterField](args2[1], Izumiya).initNazoPuyoWrap
+        nazoPuyoWrap = parseNazoPuyo[WaterField](args2[0], Izumiya).initNazoPuyoWrap
 
       nazoPuyoWrap.get:
         let answers = wrappedNazoPuyo.solve(earlyStopping = true)
         if answers.len == 1:
-          result.messages = @[$true, args2[0], answers[0].toUriQuery Izumiya]
+          result.messages = @[$true, answers[0].toUriQuery Izumiya]
         else:
           result.messages = @[$false]
     else: