diff --git a/src/main/scala/lc/background/taskThread.scala b/src/main/scala/lc/background/taskThread.scala index 6df95a5..bc23d9f 100644 --- a/src/main/scala/lc/background/taskThread.scala +++ b/src/main/scala/lc/background/taskThread.scala @@ -18,22 +18,33 @@ class BackgroundTask(config: Config, captchaManager: CaptchaManager) { val challengeGCPstmt = Statements.tlStmts.get.challengeGCPstmt challengeGCPstmt.executeUpdate() - val imageNumResult = Statements.tlStmts.get.getCountChallengeTable.executeQuery() - val imageNum = if (imageNumResult.next()) { - imageNumResult.getInt("total") - } else { - 0 - } + for (param <- allParameterCombinations()) { + val imageNum = captchaManager.getCount(param).getOrElse(0) + val countCreate = (config.throttle * 1.1).toInt - imageNum + if (countCreate > 0) { + println(s"Creating $countCreate captchas for $param") - val throttle = (config.throttle * 1.1).toInt - imageNum - - for (i <- 0 until throttle) { - captchaManager.generateChallenge(getRandomParam()) + for (i <- 0 until countCreate) { + captchaManager.generateChallenge(param) + } + } } } catch { case exception: Exception => println(exception) } } } + private def allParameterCombinations(): List[Parameters] = { + (config.captchaConfig).flatMap {captcha => + (captcha.allowedLevels).flatMap {level => + (captcha.allowedMedia).flatMap {media => + (captcha.allowedInputType).map {inputType => + Parameters(level, media, inputType, Some(Size(0, 0))) + } + } + } + } + } + private def getRandomParam(): Parameters = { val captcha = pickRandom(config.captchaConfig) val level = pickRandom(captcha.allowedLevels) diff --git a/src/main/scala/lc/core/captchaManager.scala b/src/main/scala/lc/core/captchaManager.scala index 8d41cf7..b1cd177 100644 --- a/src/main/scala/lc/core/captchaManager.scala +++ b/src/main/scala/lc/core/captchaManager.scala @@ -105,8 +105,8 @@ class CaptchaManager(config: Config, captchaProviders: CaptchaProviders) { } } - private def getCount(param: Parameters): Option[Int] = { - val countPstmt = Statements.tlStmts.get.countPstmt + def getCount(param: Parameters): Option[Int] = { + val countPstmt = Statements.tlStmts.get.countForParameterPstmt countPstmt.setString(1, param.level) countPstmt.setString(2, param.media) countPstmt.setString(3, param.input_type) @@ -123,16 +123,16 @@ class CaptchaManager(config: Config, captchaProviders: CaptchaProviders) { if (count == 0) { None } else { - val tokenPstmt = Statements.tlStmts.get.tokenPstmt - tokenPstmt.setString(1, param.level) - tokenPstmt.setString(2, param.media) - tokenPstmt.setString(3, param.input_type) + val tokenPstmt = Statements.tlStmts.get.tokenPstmt + tokenPstmt.setString(1, param.level) + tokenPstmt.setString(2, param.media) + tokenPstmt.setString(3, param.input_type) tokenPstmt.setInt(4, count) - val rs = tokenPstmt.executeQuery() - if (rs.next()) { - Some(rs.getInt("token")) - } else { - None + val rs = tokenPstmt.executeQuery() + if (rs.next()) { + Some(rs.getInt("token")) + } else { + None } } } diff --git a/src/main/scala/lc/database/statements.scala b/src/main/scala/lc/database/statements.scala index b1b7a0f..262d9be 100644 --- a/src/main/scala/lc/database/statements.scala +++ b/src/main/scala/lc/database/statements.scala @@ -70,7 +70,7 @@ class Statements(dbConn: DBConn, maxAttempts: Int) { "WHERE token = ?;" ) - val countPstmt: PreparedStatement = dbConn.con.prepareStatement( + val countForParameterPstmt: PreparedStatement = dbConn.con.prepareStatement( s""" SELECT count(*) as count FROM challenge