build: 1.6.5

cssxsh · Sep 24, 2022 · 078eb63 · 078eb63
1 parent ef7946e
commit 078eb63
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 }
 
 group = "xyz.cssxsh"
-version = "1.6.4"
+version = "1.6.5"
 
 repositories {
  mavenLocal()
@@ -19,29 +19,29 @@ mavenCentralPublish {
  singleDevGithubProject("cssxsh", "bilibili-helper")
  licenseFromGitHubProject("AGPL-3.0")
  workingDir = System.getenv("PUBLICATION_TEMP")?.let { file(it).resolve(projectName) }
- ?: project.buildDir.resolve("publishing-tmp")
+ ?: buildDir.resolve("publishing-tmp")
  publication {
- artifact(tasks.getByName("buildPlugin"))
+ artifact(tasks["buildPlugin"])
  }
 }
 
 dependencies {
- implementation("io.ktor:ktor-client-okhttp:2.1.0") {
+ implementation("io.ktor:ktor-client-okhttp:2.1.1") {
  exclude(group = "org.jetbrains.kotlin")
  exclude(group = "org.jetbrains.kotlinx")
  exclude(group = "org.slf4j")
  }
- implementation("io.ktor:ktor-client-encoding:2.1.0") {
+ implementation("io.ktor:ktor-client-encoding:2.1.1") {
  exclude(group = "org.jetbrains.kotlin")
  exclude(group = "org.jetbrains.kotlinx")
  exclude(group = "org.slf4j")
  }
- implementation("io.ktor:ktor-client-content-negotiation:2.1.0") {
+ implementation("io.ktor:ktor-client-content-negotiation:2.1.1") {
  exclude(group = "org.jetbrains.kotlin")
  exclude(group = "org.jetbrains.kotlinx")
  exclude(group = "org.slf4j")
  }
- implementation("io.ktor:ktor-serialization-kotlinx-json:2.1.0") {
+ implementation("io.ktor:ktor-serialization-kotlinx-json:2.1.1") {
  exclude(group = "org.jetbrains.kotlin")
  exclude(group = "org.jetbrains.kotlinx")
  exclude(group = "org.slf4j")
@@ -61,7 +61,8 @@ dependencies {
  compileOnly("javax.validation:validation-api:2.0.1.Final")
 
  testImplementation(kotlin("test"))
- testImplementation("net.mamoe:mirai-slf4j-bridge:1.2.0")
+ testImplementation("org.slf4j:slf4j-simple:2.0.0")
+ testImplementation("net.mamoe:mirai-logging-slf4j:2.13.0-M1")
  testImplementation("xyz.cssxsh.mirai:mirai-selenium-plugin:2.2.3")
 }
 

diff --git a/src/main/kotlin/xyz/cssxsh/mirai/bilibili/BiliHelperPlugin.kt b/src/main/kotlin/xyz/cssxsh/mirai/bilibili/BiliHelperPlugin.kt
@@ -15,7 +15,7 @@ import xyz.cssxsh.bilibili.api.*
 import xyz.cssxsh.mirai.bilibili.data.*
 
 object BiliHelperPlugin : KotlinPlugin(
- JvmPluginDescription(id = "xyz.cssxsh.mirai.plugin.bilibili-helper", version = "1.6.4") {
+ JvmPluginDescription(id = "xyz.cssxsh.mirai.plugin.bilibili-helper", version = "1.6.5") {
  name("bilibili-helper")
  author("cssxsh")
 

diff --git a/src/main/kotlin/xyz/cssxsh/mirai/bilibili/BiliUtils.kt b/src/main/kotlin/xyz/cssxsh/mirai/bilibili/BiliUtils.kt
@@ -70,6 +70,8 @@ internal val client by lazy {
  logger.warning { "Ignore ${cause.message}" }
  true
  }
+ is java.net.NoRouteToHostException,
+ is java.net.UnknownHostException -> false
  is java.io.IOException -> {
  logger.warning { "Ignore $cause" }
  true
@@ -205,7 +207,8 @@ private suspend fun Url.screenshot(type: CacheType, path: String, refresh: Boole
  driver.findElement(By.cssSelector(".read-more .back-icon")).click()
 
  for (element in driver.findElements(By.cssSelector(".normal-img"))) {
- driver.manage().window().position = element.location
+ // driver.manage().window().position = element.location
+ driver.executeScript("window.scrollTo(${element.location.x}, ${element.location.y})")
  }
 
  val start = System.currentTimeMillis()