From da2e5b7589c7fa34d619ffbfba7d1383eecfee48 Mon Sep 17 00:00:00 2001 From: Roman Khafizianov Date: Wed, 17 Apr 2024 18:44:31 +0200 Subject: [PATCH] treeexporter: add dataType to Marshall --- commonspace/object/tree/exporter/treeexporter.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/commonspace/object/tree/exporter/treeexporter.go b/commonspace/object/tree/exporter/treeexporter.go index 36275e93..be9ead92 100644 --- a/commonspace/object/tree/exporter/treeexporter.go +++ b/commonspace/object/tree/exporter/treeexporter.go @@ -10,7 +10,7 @@ import ( type DataConverter interface { Unmarshall(dataType string, decrypted []byte) (any, error) - Marshall(model any) ([]byte, error) + Marshall(model any) (data []byte, dataType string, err error) } type TreeExporterParams struct { @@ -66,14 +66,18 @@ func (t *treeExporter) ExportUnencrypted(tree objecttree.ReadableObjectTree) (er err = putStorage(change) return err == nil } - var data []byte - data, err = t.converter.Marshall(change.Model) + var ( + data []byte + dataType string + ) + data, dataType, err = t.converter.Marshall(change.Model) if err != nil { return false } // that means that change is unencrypted change.ReadKeyId = "" change.Data = data + change.DataType = dataType err = putStorage(change) return err == nil })