fix issue with retry count

SpoilerRules · Mar 20, 2024 · 94d8e05 · 94d8e05
1 parent c439da8
commit 94d8e05
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/src/main/kotlin/com/spoiligaming/generator/NitroValidatorAdvancedMt.kt b/src/main/kotlin/com/spoiligaming/generator/NitroValidatorAdvancedMt.kt
@@ -36,11 +36,11 @@ object NitroValidatorAdvancedMt {
                     threadIdentity
                 ) {
                     nitroValidationRetries++
-                    NitroValidationWrapper.retryValidation(nitroCode, config, retryCount, threadIdentity) { code, _, count ->
+                    NitroValidationWrapper.retryValidation(nitroCode, config, retryCount, threadIdentity) { code, _, _ ->
                         validateNitro(
                             code,
                             BaseConfigurationFactory.getInstance(),
-                            count,
+                            nitroValidationRetries,
                             threadIdentity
                         )
                     }
@@ -54,11 +54,11 @@ object NitroValidatorAdvancedMt {
 
             if (config.generalSettings.retryTillValid) {
                 nitroValidationRetries++
-                NitroValidationWrapper.retryValidation(nitroCode, config, retryCount, threadIdentity) { code, _, count ->
+                NitroValidationWrapper.retryValidation(nitroCode, config, retryCount, threadIdentity) { code, _, _ ->
                     validateNitro(
                         code,
                         BaseConfigurationFactory.getInstance(),
-                        count,
+                        nitroValidationRetries,
                         threadIdentity
                     )
                 }

diff --git a/src/main/kotlin/com/spoiligaming/generator/NitroValidatorOrdinary.kt b/src/main/kotlin/com/spoiligaming/generator/NitroValidatorOrdinary.kt
@@ -49,11 +49,11 @@ object NitroValidatorOrdinary {
                     null
                 ) {
                     nitroValidationRetries++
-                    NitroValidationWrapper.retryValidation(nitroCode, config, retryCount, null) { code, _, count ->
+                    NitroValidationWrapper.retryValidation(nitroCode, config, retryCount, null) { code, _, _ ->
                         validateNitro(
                             code,
                             BaseConfigurationFactory.getInstance(),
-                            count,
+                            nitroValidationRetries,
                         )
                     }
                 }
@@ -65,9 +65,9 @@ object NitroValidatorOrdinary {
             Logger.printError("Occurred while validating a nitro code: ${it.message}")
 
             if (config.generalSettings.retryTillValid) {
-                nitroValidationRetries++
-                NitroValidationWrapper.retryValidation(nitroCode, config, retryCount, null) { code, _, count ->
-                    validateNitro(code, BaseConfigurationFactory.getInstance(), count)
+                NitroValidationWrapper.retryValidation(nitroCode, config, retryCount, null) { code, _, _ ->
+                    nitroValidationRetries++
+                    validateNitro(code, BaseConfigurationFactory.getInstance(), nitroValidationRetries)
                 }
             }
         }

diff --git a/src/main/kotlin/com/spoiligaming/generator/NitroValidatorSimpleMt.kt b/src/main/kotlin/com/spoiligaming/generator/NitroValidatorSimpleMt.kt
@@ -56,11 +56,11 @@ object NitroValidatorSimpleMt {
                     threadIdentity
                 ) {
                     nitroValidationRetries++
-                    NitroValidationWrapper.retryValidation(nitroCode, config, retryCount, threadIdentity) { code, _, count ->
+                    NitroValidationWrapper.retryValidation(nitroCode, config, retryCount, threadIdentity) { code, _, _ ->
                         validateNitro(
                             code,
                             BaseConfigurationFactory.getInstance(),
-                            count,
+                            nitroValidationRetries,
                             threadIdentity
                         )
                     }
@@ -74,8 +74,8 @@ object NitroValidatorSimpleMt {
 
             if (config.generalSettings.retryTillValid) {
                 nitroValidationRetries++
-                NitroValidationWrapper.retryValidation(nitroCode, config, retryCount, threadIdentity) { code, _, count ->
-                    validateNitro(code, BaseConfigurationFactory.getInstance(), count, threadIdentity)
+                NitroValidationWrapper.retryValidation(nitroCode, config, retryCount, threadIdentity) { code, _, _ ->
+                    validateNitro(code, BaseConfigurationFactory.getInstance(), nitroValidationRetries, threadIdentity)
                 }
             }
         }.onSuccess {