lozy360/CustomizeTool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix templates serializing incorrectly for clipboard copies

Browse Source
This commit is contained in:
RisaDev
2025-02-27 19:40:20 +03:00
parent daca4df4d3
commit da678966b3
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CustomizePlus/Core/Helpers/Base64Helper.cs
View File

@@ -2,25 +2,27 @@
using System.IO; using System.IO;
using System.IO.Compression; using System.IO.Compression;
using System.Text; using System.Text;
using CustomizePlus.Templates.Data;
using Newtonsoft.Json; using Newtonsoft.Json;
namespace CustomizePlus.Core.Helpers; namespace CustomizePlus.Core.Helpers;
//this is jank but I don't have time to rewrite it
public static class Base64Helper public static class Base64Helper
{ {
// Compress any type to a base64 encoding of its compressed json representation, prepended with a version byte. // Compress any type to a base64 encoding of its compressed json representation, prepended with a version byte.
// Returns an empty string on failure. // Returns an empty string on failure.
// Original by Ottermandias: OtterGui <3 // Original by Ottermandias: OtterGui <3
public static unsafe string ExportToBase64<T>(T obj, byte version) public static string ExportTemplateToBase64(Template template)
{ {
try try
{ {
var json = JsonConvert.SerializeObject(obj, Formatting.None); var json = template.JsonSerialize();
var bytes = Encoding.UTF8.GetBytes(json); var bytes = Encoding.UTF8.GetBytes(json.ToString(Formatting.None));
using var compressedStream = new MemoryStream(); using var compressedStream = new MemoryStream();
using (var zipStream = new GZipStream(compressedStream, CompressionMode.Compress)) using (var zipStream = new GZipStream(compressedStream, CompressionMode.Compress))
{ {
zipStream.Write(new ReadOnlySpan<byte>(&version, 1)); zipStream.WriteByte(Template.Version);
zipStream.Write(bytes, 0, bytes.Length); zipStream.Write(bytes, 0, bytes.Length);
} }

2
CustomizePlus/UI/Windows/MainWindow/Tabs/Templates/TemplatePanel.cs
View File

@@ -230,7 +230,7 @@ public class TemplatePanel : IDisposable
{ {
try try
{ {
Clipboard.SetText(Base64Helper.ExportToBase64(_selector.Selected!, Constants.ConfigurationVersion)); Clipboard.SetText(Base64Helper.ExportTemplateToBase64(_selector.Selected!));
_popupSystem.ShowPopup(PopupSystem.Messages.ClipboardDataNotLongTerm); _popupSystem.ShowPopup(PopupSystem.Messages.ClipboardDataNotLongTerm);
} }
catch (Exception ex) catch (Exception ex)