From d5cfb7d36e41c0b77053db471f78857a5c345f86 Mon Sep 17 00:00:00 2001
From: InsanusMokrassar <ovsyannikov.alexey95@gmail.com>
Date: Thu, 10 Oct 2019 23:23:05 +0600
Subject: [PATCH] update consts calling

---
 .../insanusmokrassar/SauceNaoAPI/Constants.kt      |  4 ----
 .../insanusmokrassar/SauceNaoAPI/SauceNaoAPI.kt    | 14 ++++++++------
 2 files changed, 8 insertions(+), 10 deletions(-)
 delete mode 100644 src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/Constants.kt

diff --git a/src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/Constants.kt b/src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/Constants.kt
deleted file mode 100644
index 9698774..0000000
--- a/src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/Constants.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.github.insanusmokrassar.SauceNaoAPI
-
-const val LONG_TIME_LIMIT_MILLIS: Int = 1 * 24 * 60 * 60 * 1000
-const val SHORT_TIME_LIMIT_MILLIS: Int = 30 * 1000
diff --git a/src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/SauceNaoAPI.kt b/src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/SauceNaoAPI.kt
index 0493761..95ea7d7 100644
--- a/src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/SauceNaoAPI.kt
+++ b/src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/SauceNaoAPI.kt
@@ -1,5 +1,7 @@
 package com.github.insanusmokrassar.SauceNaoAPI
 
+import com.github.insanusmokrassar.SauceNaoAPI.additional.LONG_TIME_RECALCULATING_MILLIS
+import com.github.insanusmokrassar.SauceNaoAPI.additional.SHORT_TIME_RECALCULATING_MILLIS
 import com.github.insanusmokrassar.SauceNaoAPI.exceptions.sauceNaoAPIException
 import com.github.insanusmokrassar.SauceNaoAPI.models.SauceNaoAnswer
 import io.ktor.client.HttpClient
@@ -44,11 +46,11 @@ data class SauceNaoAPI(
                     val answer = makeRequest(requestBuilder)
                     callback.resumeWith(Result.success(answer))
 
-                    val sleepUntil = if (answer.header.longRemaining == 0) {
-                        getMostOldestInLongPeriod() ?.plusMillis(LONG_TIME_LIMIT_MILLIS)
+                    val sleepUntil = if (answer.header.longRemaining < 1) {
+                        getMostOldestInLongPeriod() ?.plusMillis(LONG_TIME_RECALCULATING_MILLIS)
                     } else {
-                        if (answer.header.shortRemaining == 0) {
-                            getMostOldestInShortPeriod() ?.plusMillis(SHORT_TIME_LIMIT_MILLIS)
+                        if (answer.header.shortRemaining < 1) {
+                            getMostOldestInShortPeriod() ?.plusMillis(SHORT_TIME_RECALCULATING_MILLIS)
                         } else {
                             null
                         }
@@ -137,7 +139,7 @@ data class SauceNaoAPI(
     }
 
     private fun clearRequestTimes(relatedTo: DateTime = DateTime.now()) {
-        val limitValue = relatedTo.minusMillis(LONG_TIME_LIMIT_MILLIS)
+        val limitValue = relatedTo.minusMillis(LONG_TIME_RECALCULATING_MILLIS)
 
         requestsSendTimes.removeAll {
             it < limitValue
@@ -153,7 +155,7 @@ data class SauceNaoAPI(
     private fun getMostOldestInShortPeriod(): DateTime? {
         val now = DateTime.now()
 
-        val limitTime = now.minusMillis(SHORT_TIME_LIMIT_MILLIS)
+        val limitTime = now.minusMillis(SHORT_TIME_RECALCULATING_MILLIS)
 
         clearRequestTimes(now)