From 69994d9856307e99a8b032f314c5359a98aa70db Mon Sep 17 00:00:00 2001 From: sunglocto Date: Sat, 18 Apr 2026 11:09:59 +0100 Subject: [PATCH] remove base64 encoding/decoding which was not needed for embedding assets --- assets.go | 113 ++++++++++++++---------------------------------------- 1 file changed, 28 insertions(+), 85 deletions(-) diff --git a/assets.go b/assets.go index c3ef4a7..a3f23ce 100644 --- a/assets.go +++ b/assets.go @@ -2,344 +2,287 @@ package main import ( _ "embed" - "encoding/base64" "github.com/diamondburned/gotk4/pkg/gdk/v4" "github.com/diamondburned/gotk4/pkg/gdkpixbuf/v2" ) //go:embed debug.png var defaultAvatarBytes []byte -var defaultAvatarB64 string = base64.StdEncoding.EncodeToString(defaultAvatarBytes) //go:embed failed_load.png var failedBytes []byte -var failedB64 string = base64.StdEncoding.EncodeToString(failedBytes) //go:embed assets/owner.png var ownerMedalBytes []byte -var ownerMedalB64 string = base64.StdEncoding.EncodeToString(ownerMedalBytes) //go:embed assets/admin.png var adminMedalBytes []byte -var adminMedalB64 string = base64.StdEncoding.EncodeToString(adminMedalBytes) //go:embed assets/member.png var memberMedalBytes []byte -var memberMedalB64 string = base64.StdEncoding.EncodeToString(memberMedalBytes) //go:embed assets/noaffiliation.png var noneMedalBytes []byte -var noneMedalB64 string = base64.StdEncoding.EncodeToString(noneMedalBytes) //go:embed assets/outcast.png var outcastMedalBytes []byte -var outcastMedalB64 string = base64.StdEncoding.EncodeToString(outcastMedalBytes) //go:embed assets/cancel.png var cancelBytes []byte -var cancelB64 string = base64.StdEncoding.EncodeToString(cancelBytes) //go:embed assets/status_away.png var sABytes []byte -var sAB64 string = base64.StdEncoding.EncodeToString(sABytes) //go:embed assets/status_busy.png var sBBytes []byte -var sBB64 string = base64.StdEncoding.EncodeToString(sBBytes) //go:embed assets/status_chatty.png var sCBytes []byte -var sCB64 string = base64.StdEncoding.EncodeToString(sCBytes) //go:embed assets/status_online.png var sOBytes []byte -var sOB64 string = base64.StdEncoding.EncodeToString(sOBytes) //go:embed assets/status_xa.png var xaBytes []byte -var xaB64 string = base64.StdEncoding.EncodeToString(xaBytes) //go:embed assets/tag.png var tagBytes []byte -var tagB64 string = base64.StdEncoding.EncodeToString(tagBytes) //go:embed assets/lambda-disabled.png var logoDisabledBytes []byte -var logoDisabledB64 string = base64.StdEncoding.EncodeToString(logoDisabledBytes) //go:embed assets/group.png var groupBytes []byte -var groupB64 string = base64.StdEncoding.EncodeToString(groupBytes) //go:embed assets/door_in.png var doorInBytes []byte -var doorInB64 string = base64.StdEncoding.EncodeToString(doorInBytes) //go:embed assets/door_out.png var doorOutBytes []byte -var doorOutB64 string = base64.StdEncoding.EncodeToString(doorOutBytes) //go:embed assets/large_group.png var largeGroupBytes []byte -var largeGroupB64 string = base64.StdEncoding.EncodeToString(largeGroupBytes) //go:embed assets/world.png var worldBytes []byte -var worldB64 string = base64.StdEncoding.EncodeToString(worldBytes) //go:embed assets/disconnect.png var disconnectBytes []byte -var disconnectB64 string = base64.StdEncoding.EncodeToString(disconnectBytes) //go:embed assets/chart_bar.png var barBytes []byte -var barB64 string = base64.StdEncoding.EncodeToString(barBytes) //go:embed assets/ok.png var okBytes []byte -var okB64 string = base64.StdEncoding.EncodeToString(okBytes) //go:embed assets/hourglass.png var hourglassBytes []byte -var hourglassB64 string = base64.StdEncoding.EncodeToString(hourglassBytes) //go:embed assets/connect_tls.png var connectBytes []byte -var connectB64 string = base64.StdEncoding.EncodeToString(connectBytes) //go:embed assets/comment.png var commentBytes []byte -var commentB64 string = base64.StdEncoding.EncodeToString(commentBytes) //go:embed assets/information.png var informationBytes []byte -var informationB64 string = base64.StdEncoding.EncodeToString(informationBytes) //go:embed assets/car.png var carBytes []byte -var carB64 string = base64.StdEncoding.EncodeToString(carBytes) func init() { loader := gdkpixbuf.NewPixbufLoader() - defaultAvatarData, _ := base64.StdEncoding.DecodeString(defaultAvatarB64) - loader.Write(defaultAvatarData) + loader.Write(defaultAvatarBytes) loader.Close() clientAssets["DefaultAvatar"] = gdk.NewTextureForPixbuf(loader.Pixbuf()) loader = gdkpixbuf.NewPixbufLoader() - failedData, _ := base64.StdEncoding.DecodeString(failedB64) - loader.Write(failedData) + loader.Write(failedBytes) loader.Close() clientAssets["FailedAvatar"] = gdk.NewTextureForPixbuf(loader.Pixbuf()) loader = gdkpixbuf.NewPixbufLoader() - ownerMedalData, _ := base64.StdEncoding.DecodeString(ownerMedalB64) - loader.Write(ownerMedalData) + loader.Write(ownerMedalBytes) loader.Close() clientAssets["owner"] = gdk.NewTextureForPixbuf(loader.Pixbuf()) loader = gdkpixbuf.NewPixbufLoader() - cancelData, _ := base64.StdEncoding.DecodeString(cancelB64) - loader.Write(cancelData) + loader.Write(cancelBytes) loader.Close() clientAssets["cancel"] = gdk.NewTextureForPixbuf(loader.Pixbuf()) loader = gdkpixbuf.NewPixbufLoader() - tagData, _ := base64.StdEncoding.DecodeString(tagB64) - loader.Write(tagData) + loader.Write(tagBytes) loader.Close() clientAssets["tag"] = gdk.NewTextureForPixbuf(loader.Pixbuf()) loader = gdkpixbuf.NewPixbufLoader() - adminMedalData, _ := base64.StdEncoding.DecodeString(adminMedalB64) - loader.Write(adminMedalData) + loader.Write(adminMedalBytes) loader.Close() clientAssets["admin"] = gdk.NewTextureForPixbuf(loader.Pixbuf()) loader = gdkpixbuf.NewPixbufLoader() - memberMedalData, _ := base64.StdEncoding.DecodeString(memberMedalB64) - loader.Write(memberMedalData) + loader.Write(memberMedalBytes) loader.Close() clientAssets["member"] = gdk.NewTextureForPixbuf(loader.Pixbuf()) loader = gdkpixbuf.NewPixbufLoader() - noneMedalData, _ := base64.StdEncoding.DecodeString(noneMedalB64) - loader.Write(noneMedalData) + loader.Write(noneMedalBytes) loader.Close() clientAssets["none"] = gdk.NewTextureForPixbuf(loader.Pixbuf()) loader = gdkpixbuf.NewPixbufLoader() - outcastMedalData, _ := base64.StdEncoding.DecodeString(outcastMedalB64) - loader.Write(outcastMedalData) + loader.Write(outcastMedalBytes) loader.Close() clientAssets["outcast"] = gdk.NewTextureForPixbuf(loader.Pixbuf()) loader = gdkpixbuf.NewPixbufLoader() - disabledLogoData, _ := base64.StdEncoding.DecodeString(logoDisabledB64) - loader.Write(disabledLogoData) + loader.Write(logoDisabledBytes) loader.Close() clientAssets["disabled_logo"] = gdk.NewTextureForPixbuf(loader.Pixbuf()) loader = gdkpixbuf.NewPixbufLoader() - groupData, _ := base64.StdEncoding.DecodeString(groupB64) - loader.Write(groupData) + loader.Write(groupBytes) loader.Close() clientAssets["group"] = gdk.NewTextureForPixbuf(loader.Pixbuf()) loader = gdkpixbuf.NewPixbufLoader() - doorInData, _ := base64.StdEncoding.DecodeString(doorInB64) - loader.Write(doorInData) + loader.Write(doorInBytes) loader.Close() clientAssets["door_in"] = gdk.NewTextureForPixbuf(loader.Pixbuf()) loader = gdkpixbuf.NewPixbufLoader() - doorOutData, _ := base64.StdEncoding.DecodeString(doorOutB64) - loader.Write(doorOutData) + loader.Write(doorOutBytes) loader.Close() clientAssets["door_out"] = gdk.NewTextureForPixbuf(loader.Pixbuf()) loader = gdkpixbuf.NewPixbufLoader() - largeGroupData, _ := base64.StdEncoding.DecodeString(largeGroupB64) - loader.Write(largeGroupData) + loader.Write(largeGroupBytes) loader.Close() clientAssets["large_group"] = gdk.NewTextureForPixbuf(loader.Pixbuf()) loader = gdkpixbuf.NewPixbufLoader() - worldData, _ := base64.StdEncoding.DecodeString(worldB64) - loader.Write(worldData) + loader.Write(worldBytes) loader.Close() clientAssets["world"] = gdk.NewTextureForPixbuf(loader.Pixbuf()) loader = gdkpixbuf.NewPixbufLoader() - disconnectData, _ := base64.StdEncoding.DecodeString(disconnectB64) - loader.Write(disconnectData) + loader.Write(disconnectBytes) loader.Close() clientAssets["disconnect"] = gdk.NewTextureForPixbuf(loader.Pixbuf()) loader = gdkpixbuf.NewPixbufLoader() - barData, _ := base64.StdEncoding.DecodeString(barB64) - loader.Write(barData) + loader.Write(barBytes) loader.Close() clientAssets["chart_bar"] = gdk.NewTextureForPixbuf(loader.Pixbuf()) loader = gdkpixbuf.NewPixbufLoader() - okData, _ := base64.StdEncoding.DecodeString(okB64) - loader.Write(okData) + loader.Write(okBytes) loader.Close() clientAssets["ok"] = gdk.NewTextureForPixbuf(loader.Pixbuf()) loader = gdkpixbuf.NewPixbufLoader() - hourglassData, _ := base64.StdEncoding.DecodeString(hourglassB64) - loader.Write(hourglassData) + loader.Write(hourglassBytes) loader.Close() clientAssets["hourglass"] = gdk.NewTextureForPixbuf(loader.Pixbuf()) loader = gdkpixbuf.NewPixbufLoader() - connectData, _ := base64.StdEncoding.DecodeString(connectB64) - loader.Write(connectData) + loader.Write(connectBytes) loader.Close() clientAssets["connect"] = gdk.NewTextureForPixbuf(loader.Pixbuf()) loader = gdkpixbuf.NewPixbufLoader() - commentData, _ := base64.StdEncoding.DecodeString(commentB64) - loader.Write(commentData) + loader.Write(commentBytes) loader.Close() clientAssets["comment"] = gdk.NewTextureForPixbuf(loader.Pixbuf()) loader = gdkpixbuf.NewPixbufLoader() - informationData, _ := base64.StdEncoding.DecodeString(informationB64) - loader.Write(informationData) + loader.Write(informationBytes) loader.Close() clientAssets["information"] = gdk.NewTextureForPixbuf(loader.Pixbuf()) loader = gdkpixbuf.NewPixbufLoader() - sAData, _ := base64.StdEncoding.DecodeString(sAB64) - loader.Write(sAData) + loader.Write(sABytes) loader.Close() clientAssets["status_away"] = gdk.NewTextureForPixbuf(loader.Pixbuf()) loader = gdkpixbuf.NewPixbufLoader() - sBData, _ := base64.StdEncoding.DecodeString(sBB64) - loader.Write(sBData) + loader.Write(sBBytes) loader.Close() clientAssets["status_dnd"] = gdk.NewTextureForPixbuf(loader.Pixbuf()) loader = gdkpixbuf.NewPixbufLoader() - sCData, _ := base64.StdEncoding.DecodeString(sCB64) - loader.Write(sCData) + loader.Write(sCBytes) loader.Close() clientAssets["status_chat"] = gdk.NewTextureForPixbuf(loader.Pixbuf()) loader = gdkpixbuf.NewPixbufLoader() - xaData, _ := base64.StdEncoding.DecodeString(xaB64) - loader.Write(xaData) + loader.Write(xaBytes) loader.Close() clientAssets["status_xa"] = gdk.NewTextureForPixbuf(loader.Pixbuf()) loader = gdkpixbuf.NewPixbufLoader() - sOData, _ := base64.StdEncoding.DecodeString(sOB64) - loader.Write(sOData) + loader.Write(sOBytes) loader.Close() clientAssets["status_"] = gdk.NewTextureForPixbuf(loader.Pixbuf()) loader = gdkpixbuf.NewPixbufLoader() - carData, _ := base64.StdEncoding.DecodeString(carB64) - loader.Write(carData) + loader.Write(carBytes) loader.Close() clientAssets["car"] = gdk.NewTextureForPixbuf(loader.Pixbuf())