From 7f71ab51280b31302a95a80a28a401c143047342 Mon Sep 17 00:00:00 2001 From: "kayos@tcp.direct" Date: Thu, 4 Jul 2024 03:55:54 -0700 Subject: [PATCH] Fix: unmarshalling of backups from meta.json --- bitcask/bitcask_backup.go | 2 +- metadata/meta.go | 18 +++++++++--------- pogreb/pogreb_backup.go | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/bitcask/bitcask_backup.go b/bitcask/bitcask_backup.go index be19123..5134514 100644 --- a/bitcask/bitcask_backup.go +++ b/bitcask/bitcask_backup.go @@ -52,7 +52,7 @@ func (db *DB) BackupAll(archivePath string) (models.Backup, error) { return nil, err } if db.meta.Backups == nil { - db.meta.Backups = make(map[string]models.Backup) + db.meta.Backups = make(map[string]any) } db.meta.Backups[bu.FilePath] = bu err = db.meta.Sync() diff --git a/metadata/meta.go b/metadata/meta.go index c552f82..ef22d60 100644 --- a/metadata/meta.go +++ b/metadata/meta.go @@ -15,13 +15,13 @@ import ( // This is critical for migrating data between [Keeper]s. // The only absolute requirement is that the [Type] field is set. type Metadata struct { - KeeperType string `json:"type"` - Created time.Time `json:"created,omitempty"` - LastOpened time.Time `json:"last_opened,omitempty"` - KnownStores []string `json:"stores,omitempty"` - Backups map[string]models.Backup `json:"backups,omitempty"` - Extra map[string]interface{} `json:"extra,omitempty"` - DefStoreOpts any `json:"default_store_opts,omitempty"` + KeeperType string `json:"type"` + Created time.Time `json:"created,omitempty"` + LastOpened time.Time `json:"last_opened,omitempty"` + KnownStores []string `json:"stores,omitempty"` + Backups map[string]any `json:"backups,omitempty"` + Extra map[string]interface{} `json:"extra,omitempty"` + DefStoreOpts any `json:"default_store_opts,omitempty"` w io.WriteSeeker path string } @@ -62,7 +62,7 @@ func NewMeta(keeperType KeeperType) *Metadata { Created: time.Now(), LastOpened: time.Now(), KnownStores: make([]string, 0), - Backups: make(map[string]models.Backup), + Backups: make(map[string]any), } } @@ -94,7 +94,7 @@ func NewMetaFile(keeperType, path string) (*Metadata, error) { Created: time.Now(), LastOpened: time.Now(), KnownStores: make([]string, 0), - Backups: make(map[string]models.Backup), + Backups: make(map[string]any), path: path, } stat, err := os.Stat(path) diff --git a/pogreb/pogreb_backup.go b/pogreb/pogreb_backup.go index 3b001fc..3c2af7d 100644 --- a/pogreb/pogreb_backup.go +++ b/pogreb/pogreb_backup.go @@ -52,7 +52,7 @@ func (db *DB) BackupAll(archivePath string) (models.Backup, error) { return nil, err } if db.meta.Backups == nil { - db.meta.Backups = make(map[string]models.Backup) + db.meta.Backups = make(map[string]any) } db.meta.Backups[bu.FilePath] = bu err = db.meta.Sync()