AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-17 19:35:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

save favicon again

Browse Source
This commit is contained in:
Bixilon 2021-12-09 11:13:07 +01:00
parent ea3e15fc09
commit 2bdb4b9c79
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
6 changed files with 55 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/de/bixilon/minosoft/config/profile/profiles/eros/server/entries/Server.kt
View File

@ -33,12 +33,12 @@ class Server(
/**
* Server-address as string. May contain the port
*/
var address by delegate(address)
var address by delegate(address) { check(it.isNotBlank()) { "Server address must not be blank!" } }
/**
* Server name (showed in eros)
*/
var name by delegate(name)
var name by delegate(name) { check(it.message.isNotBlank()) { "Server name must not be blank!" } }
/**
* Profiles to use for the connection to the server.
@ -56,5 +56,5 @@ class Server(
var forcedVersion by backingDelegate(getter = { Versions.getVersionByName(_forcedVersion) }, setter = { _forcedVersion = it?.name })
@get:JsonInclude(JsonInclude.Include.NON_DEFAULT)
var faviconHash: String? by delegate(null)
var faviconHash: String? by delegate(null) { if (it != null) check(it.length == 40) { "Not a valid sha1 hash!" } }
}

3
src/main/java/de/bixilon/minosoft/gui/eros/main/play/server/ServerListController.kt
View File

@ -26,6 +26,7 @@ import de.bixilon.minosoft.gui.eros.controller.EmbeddedJavaFXController
import de.bixilon.minosoft.gui.eros.dialog.ServerModifyDialog
import de.bixilon.minosoft.gui.eros.dialog.SimpleErosConfirmationDialog
import de.bixilon.minosoft.gui.eros.dialog.connection.KickDialog
import de.bixilon.minosoft.gui.eros.main.play.server.card.FaviconManager.saveFavicon
import de.bixilon.minosoft.gui.eros.main.play.server.card.ServerCard
import de.bixilon.minosoft.gui.eros.main.play.server.card.ServerCardController
import de.bixilon.minosoft.gui.eros.main.play.server.type.types.ServerType
@ -270,7 +271,7 @@ class ServerListController : EmbeddedJavaFXController<Pane>(), Refreshable {
server.forcedVersion = forcedVersion
server.profiles = profiles.toMutableMap()
if (server.address != address) {
serverCard.rawFavicon = null
server.faviconHash?.let { hash -> server.saveFavicon(null, hash) }
server.address = address

45
src/main/java/de/bixilon/minosoft/gui/eros/main/play/server/card/FaviconManager.kt Normal file
View File

@ -0,0 +1,45 @@
package de.bixilon.minosoft.gui.eros.main.play.server.card
import de.bixilon.minosoft.config.profile.profiles.eros.server.entries.Server
import de.bixilon.minosoft.data.assets.AssetsUtil
import de.bixilon.minosoft.util.Util
import javafx.scene.image.Image
import java.io.File
import java.io.FileInputStream
import java.io.FileOutputStream
import java.util.zip.GZIPInputStream
import java.util.zip.GZIPOutputStream
object FaviconManager {
val Server.favicon: Image?
get() {
val hash = this.faviconHash ?: return null
try {
val path = AssetsUtil.getAssetDiskPath(hash, true)
return Image(GZIPInputStream(FileInputStream(path)))
} catch (exception: Throwable) {
this.faviconHash = null
}
return null
}
fun Server.saveFavicon(favicon: ByteArray?, faviconHash: String = Util.sha1(favicon)) {
if (this.faviconHash == faviconHash) {
return
}
this.faviconHash = faviconHash
val file = File(AssetsUtil.getAssetDiskPath(faviconHash, true))
if (file.exists()) {
return
}
if (favicon == null) {
file.delete() // ToDo: Check if other servers are using it
return
}
val outputStream = GZIPOutputStream(FileOutputStream(file))
outputStream.write(favicon)
outputStream.close()
}
}

4
src/main/java/de/bixilon/minosoft/gui/eros/main/play/server/card/ServerCard.kt
View File

@ -22,7 +22,6 @@ import de.bixilon.minosoft.protocol.network.connection.status.StatusConnectionSt
import de.bixilon.minosoft.util.KUtil.synchronizedMapOf
import de.bixilon.minosoft.util.KUtil.synchronizedSetOf
import de.bixilon.minosoft.util.collections.SynchronizedMap
import javafx.scene.image.Image
class ServerCard(
val server: Server,
@ -30,9 +29,6 @@ class ServerCard(
var ping: StatusConnection? = null
val connections: MutableSet<PlayConnection> = synchronizedSetOf()
var rawFavicon: ByteArray? = null
val favicon: Image? = null // ToDo: Image(ByteArrayInputStream(it))
var statusReceiveInvoker: EventInvoker? = null
set(value) {
field = value

7
src/main/java/de/bixilon/minosoft/gui/eros/main/play/server/card/ServerCardController.kt
View File

@ -19,6 +19,8 @@ import de.bixilon.minosoft.data.text.ChatComponent
import de.bixilon.minosoft.gui.eros.card.AbstractCardController
import de.bixilon.minosoft.gui.eros.card.CardFactory
import de.bixilon.minosoft.gui.eros.main.play.server.ServerListController
import de.bixilon.minosoft.gui.eros.main.play.server.card.FaviconManager.favicon
import de.bixilon.minosoft.gui.eros.main.play.server.card.FaviconManager.saveFavicon
import de.bixilon.minosoft.gui.eros.modding.invoker.JavaFXEventInvoker
import de.bixilon.minosoft.gui.eros.util.JavaFXUtil
import de.bixilon.minosoft.gui.eros.util.JavaFXUtil.ctext
@ -30,6 +32,7 @@ import de.bixilon.minosoft.modding.event.events.connection.status.StatusPongRece
import de.bixilon.minosoft.util.KUtil.text
import de.bixilon.minosoft.util.KUtil.thousands
import de.bixilon.minosoft.util.KUtil.toResourceLocation
import de.bixilon.minosoft.util.task.pool.DefaultThreadPool
import javafx.fxml.FXML
import javafx.scene.control.Label
import javafx.scene.image.Image
@ -74,7 +77,7 @@ class ServerCardController : AbstractCardController<ServerCard>() {
item.unregister()
item.ping()
item.favicon?.let { faviconFX.image = it }
item.server.favicon?.let { faviconFX.image = it }
item.statusReceiveInvoker = JavaFXEventInvoker.of<ServerStatusReceiveEvent> {
if (this.item != item || it.connection.error != null) {
@ -87,7 +90,7 @@ class ServerCardController : AbstractCardController<ServerCard>() {
faviconFX.image = it.status.favicon?.let { favicon -> Image(ByteArrayInputStream(favicon)) } ?: JavaFXUtil.MINOSOFT_LOGO
it.status.favicon?.let { favicon -> item.rawFavicon = favicon }
it.status.favicon?.let { favicon -> DefaultThreadPool += { item.server.saveFavicon(favicon) } } // ToDo: This is running every event?
serverList?.onPingUpdate(item)
}

4
src/main/java/de/bixilon/minosoft/protocol/status/ServerStatus.kt
View File

@ -15,7 +15,6 @@ package de.bixilon.minosoft.protocol.status
import de.bixilon.minosoft.data.text.ChatComponent
import de.bixilon.minosoft.util.KUtil.toInt
import de.bixilon.minosoft.util.Util
import de.bixilon.minosoft.util.nbt.tag.NBTUtil.compoundCast
import java.util.*
@ -37,8 +36,6 @@ class ServerStatus(
var favicon: ByteArray? = null
private set
var faviconHash: String? = null
private set
init {
data["version"]?.compoundCast()?.let {
@ -55,7 +52,6 @@ class ServerStatus(
data["favicon"]?.toString()?.let {
val favicon = Base64.getDecoder().decode(it.replace("data:image/png;base64,", "").replace("\n", ""))
faviconHash = Util.sha1(favicon)
this.favicon = favicon
}
}