MyFavMirrors/lc-core
1
0
Fork 0
mirror of https://github.com/librecaptcha/lc-core.git synced 2025-01-27 04:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #152 from scala-steward/update/scalafmt-core-3.5.0

Browse Source 
Update scalafmt-core to 3.5.0
This commit is contained in:
hrj 2022-04-03 07:15:01 +05:30 committed by GitHub
commit 595815921f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.scalafmt.conf
View File

@ -1,3 +1,3 @@
version="3.4.3" version="3.5.0"
maxColumn = 120 maxColumn = 120
runner.dialect = scala3 runner.dialect = scala3

11
src/main/scala/lc/Main.scala
View File

@ -26,13 +26,12 @@ object LCFramework {
corsHeader = config.corsHeader corsHeader = config.corsHeader
) )
Runtime.getRuntime.addShutdownHook( new Thread { Runtime.getRuntime.addShutdownHook(new Thread {
override def run(): Unit = { override def run(): Unit = {
println("Shutting down gracefully...") println("Shutting down gracefully...")
backgroundTask.shutdown() backgroundTask.shutdown()
}
} }
) })
server.start() server.start()
} }

10
src/main/scala/lc/background/taskThread.scala
View File

@ -26,7 +26,7 @@ class BackgroundTask(config: Config, captchaManager: CaptchaManager) {
val countExisting = captchaManager.getCount(param).getOrElse(0) val countExisting = captchaManager.getCount(param).getOrElse(0)
val countRequired = requiredCountPerCombination - countExisting val countRequired = requiredCountPerCombination - countExisting
if (countRequired > 0) { if (countRequired > 0) {
val countCreate = Math.min(1.0 + requiredCountPerCombination/10.0, countRequired).toInt val countCreate = Math.min(1.0 + requiredCountPerCombination / 10.0, countRequired).toInt
println(s"Creating $countCreate of $countRequired captchas for $param") println(s"Creating $countCreate of $countRequired captchas for $param")
for (i <- 0 until countCreate) { for (i <- 0 until countCreate) {
@ -42,10 +42,10 @@ class BackgroundTask(config: Config, captchaManager: CaptchaManager) {
} }
private def allParameterCombinations(): List[Parameters] = { private def allParameterCombinations(): List[Parameters] = {
(config.captchaConfig).flatMap {captcha => (config.captchaConfig).flatMap { captcha =>
(captcha.allowedLevels).flatMap {level => (captcha.allowedLevels).flatMap { level =>
(captcha.allowedMedia).flatMap {media => (captcha.allowedMedia).flatMap { media =>
(captcha.allowedInputType).map {inputType => (captcha.allowedInputType).map { inputType =>
Parameters(level, media, inputType, Some(Size(0, 0))) Parameters(level, media, inputType, Some(Size(0, 0)))
} }
} }

6
src/main/scala/lc/core/captchaManager.scala
View File

@ -37,10 +37,10 @@ class CaptchaManager(config: Config, captchaProviders: CaptchaProviders) {
captchaProviders.getProvider(param).flatMap { provider => captchaProviders.getProvider(param).flatMap { provider =>
val providerId = provider.getId() val providerId = provider.getId()
val challenge = provider.returnChallenge() val challenge = provider.returnChallenge()
val blob = new ByteArrayInputStream(challenge.content) val blob = new ByteArrayInputStream(challenge.content)
val token = insertCaptcha(provider, challenge, providerId, param, blob) val token = insertCaptcha(provider, challenge, providerId, param, blob)
// println("Added new challenge: " + token.toString) // println("Added new challenge: " + token.toString)
token.map(_.toInt) token.map(_.toInt)
} }
} }

3
src/main/scala/lc/database/DB.scala
View File

@ -3,7 +3,8 @@ package lc.database
import java.sql.{Connection, DriverManager, Statement} import java.sql.{Connection, DriverManager, Statement}
class DBConn() { class DBConn() {
val con: Connection = DriverManager.getConnection("jdbc:h2:./data/H2/captcha2;MAX_COMPACT_TIME=8000;DB_CLOSE_ON_EXIT=FALSE", "sa", "") val con: Connection =
DriverManager.getConnection("jdbc:h2:./data/H2/captcha2;MAX_COMPACT_TIME=8000;DB_CLOSE_ON_EXIT=FALSE", "sa", "")
def getStatement(): Statement = { def getStatement(): Statement = {
con.createStatement() con.createStatement()

8
src/main/scala/lc/server/Server.scala
View File

@ -13,7 +13,13 @@ import java.net.InetSocketAddress
import java.util import java.util
import scala.jdk.CollectionConverters._ import scala.jdk.CollectionConverters._
class Server(address: String, port: Int, captchaManager: CaptchaManager, playgroundEnabled: Boolean, corsHeader: String) { class Server(
address: String,
port: Int,
captchaManager: CaptchaManager,
playgroundEnabled: Boolean,
corsHeader: String
) {
var headerMap: util.Map[String, util.List[String]] = _ var headerMap: util.Map[String, util.List[String]] = _
if (corsHeader.nonEmpty) { if (corsHeader.nonEmpty) {
headerMap = Map("Access-Control-Allow-Origin" -> List(corsHeader).asJava).asJava headerMap = Map("Access-Control-Allow-Origin" -> List(corsHeader).asJava).asJava