From 83e3a2e72567391d42876b9885b2eec6e1eee1aa Mon Sep 17 00:00:00 2001
From: Jonas Plum <git@jonasplum.de>
Date: Sun, 23 Oct 2022 02:07:53 +0200
Subject: [PATCH] Improve restore

---
 auth.go    | 3 ++-
 restore.go | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/auth.go b/auth.go
index 05400e7..2b7e018 100644
--- a/auth.go
+++ b/auth.go
@@ -30,7 +30,8 @@ func (c *catalystResolver) UserCreateIfNotExists(ctx context.Context, user *maut
 	}
 
 	if user == nil || user.APIKey {
-		_, err = c.database.UserCreateSetupAPIKey(ctx, password)
+		// ignore error, because we don't care if the user already exists
+		_, _ = c.database.UserCreateSetupAPIKey(ctx, password)
 	} else {
 		_, err = c.database.UserCreate(ctx, &model.UserForm{
 			Apikey:  user.APIKey,
diff --git a/restore.go b/restore.go
index 2e9f64a..e925c1f 100644
--- a/restore.go
+++ b/restore.go
@@ -83,7 +83,8 @@ func restoreS3(catalystStorage *storage.Storage, p string) error {
 
 	entries, err := fs.ReadDir(minioDir, ".")
 	if err != nil {
-		return err
+		// directory might not exist
+		return nil
 	}
 
 	for _, entry := range entries {