From ce3a06f03b2a3a207092df74a37990eb33e00219 Mon Sep 17 00:00:00 2001 From: kolaente Date: Thu, 7 Sep 2023 10:11:59 +0200 Subject: [PATCH] fix(import): don't fail when importing from dev exports --- pkg/modules/migration/vikunja-file/vikunja.go | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/pkg/modules/migration/vikunja-file/vikunja.go b/pkg/modules/migration/vikunja-file/vikunja.go index 893f0e4e92b..020650706bc 100644 --- a/pkg/modules/migration/vikunja-file/vikunja.go +++ b/pkg/modules/migration/vikunja-file/vikunja.go @@ -30,6 +30,7 @@ import ( "code.vikunja.io/api/pkg/models" "code.vikunja.io/api/pkg/modules/migration" "code.vikunja.io/api/pkg/user" + vversion "code.vikunja.io/api/pkg/version" "github.com/hashicorp/go-version" ) @@ -119,17 +120,22 @@ func (v *FileMigrator) Migrate(user *user.User, file io.ReaderAt, size int64) er return fmt.Errorf("could not read version file: %w", err) } - dumpedVersion, err := version.NewVersion(bufVersion.String()) - if err != nil { - return err - } - minVersion, err := version.NewVersion("0.20.1+61") - if err != nil { - return err - } + versionString := bufVersion.String() + if versionString == "dev" && versionString == vversion.Version { + log.Debugf(logPrefix + "Importing from dev version") + } else { + dumpedVersion, err := version.NewVersion(bufVersion.String()) + if err != nil { + return err + } + minVersion, err := version.NewVersion("0.20.1+61") + if err != nil { + return err + } - if dumpedVersion.LessThan(minVersion) { - return fmt.Errorf("export was created with an older version, need at least %s but the export needs at least %s", dumpedVersion, minVersion) + if dumpedVersion.LessThan(minVersion) { + return fmt.Errorf("export was created with an older version, need at least %s but the export needs at least %s", dumpedVersion, minVersion) + } } //////