From c12bac0c962297377045bee3ddeb23076a020875 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sat, 20 Jun 2020 11:37:51 +0200
Subject: [PATCH] Return errors when dumping

---
 pkg/cmd/dump.go          |  5 ++++-
 pkg/modules/dump/dump.go | 19 ++++++++++---------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/pkg/cmd/dump.go b/pkg/cmd/dump.go
index 9fd9898d..34f36b16 100644
--- a/pkg/cmd/dump.go
+++ b/pkg/cmd/dump.go
@@ -17,6 +17,7 @@
 package cmd
 
 import (
+	"code.vikunja.io/api/pkg/log"
 	"code.vikunja.io/api/pkg/modules/dump"
 	"github.com/spf13/cobra"
 	"time"
@@ -34,6 +35,8 @@ var dumpCmd = &cobra.Command{
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		filename := "vikunja-dump_" + time.Now().Format("2006-01-02_15-03-05") + ".zip"
-		dump.Dump(filename)
+		if err := dump.Dump(filename); err != nil {
+			log.Critical(err.Error())
+		}
 	},
 }
diff --git a/pkg/modules/dump/dump.go b/pkg/modules/dump/dump.go
index 291d3d74..648e9ec7 100644
--- a/pkg/modules/dump/dump.go
+++ b/pkg/modules/dump/dump.go
@@ -22,6 +22,7 @@ import (
 	"code.vikunja.io/api/pkg/files"
 	"code.vikunja.io/api/pkg/log"
 	"code.vikunja.io/api/pkg/version"
+	"fmt"
 	"github.com/spf13/viper"
 	"io"
 	"os"
@@ -33,10 +34,10 @@ import (
 const compressionUsed = zip.Deflate
 
 // Dump creates a zip file with all vikunja files at filename
-func Dump(filename string) {
+func Dump(filename string) error {
 	dumpFile, err := os.Create(filename)
 	if err != nil {
-		log.Criticalf("Error opening dump file: %s", err)
+		return fmt.Errorf("error opening dump file: %s", err)
 	}
 	defer dumpFile.Close()
 
@@ -47,7 +48,7 @@ func Dump(filename string) {
 	log.Info("Start dumping config file...")
 	err = writeFileToZip(viper.ConfigFileUsed(), dumpWriter)
 	if err != nil {
-		log.Criticalf("Error saving config file: %s", err)
+		return fmt.Errorf("error saving config file: %s", err)
 	}
 	log.Info("Dumped config file")
 
@@ -55,7 +56,7 @@ func Dump(filename string) {
 	log.Info("Start dumping version file...")
 	err = writeBytesToZip("VERSION", []byte(version.Version), dumpWriter)
 	if err != nil {
-		log.Criticalf("Error saving version: %s", err)
+		return fmt.Errorf("error saving version: %s", err)
 	}
 	log.Info("Dumped version")
 
@@ -63,12 +64,12 @@ func Dump(filename string) {
 	log.Info("Start dumping database...")
 	data, err := db.Dump()
 	if err != nil {
-		log.Criticalf("Error saving database data: %s", err)
+		return fmt.Errorf("error saving database data: %s", err)
 	}
 	for t, d := range data {
 		err = writeBytesToZip("database/"+t+".json", d, dumpWriter)
 		if err != nil {
-			log.Criticalf("Error writing database table %s: %s", t, err)
+			return fmt.Errorf("error writing database table %s: %s", t, err)
 		}
 	}
 	log.Info("Dumped database")
@@ -77,19 +78,19 @@ func Dump(filename string) {
 	log.Info("Start dumping files...")
 	allFiles, err := files.Dump()
 	if err != nil {
-		log.Criticalf("Error saving file: %s", err)
+		return fmt.Errorf("error saving file: %s", err)
 	}
 	for fid, fcontent := range allFiles {
 		err = writeBytesToZip("files/"+strconv.FormatInt(fid, 10), fcontent, dumpWriter)
 		if err != nil {
-			log.Criticalf("Error writing file %d: %s", fid, err)
+			return fmt.Errorf("error writing file %d: %s", fid, err)
 		}
 	}
 	log.Infof("Dumped files")
 
 	log.Info("Done creating dump")
 	log.Infof("Dump file saved at %s", filename)
-
+	return nil
 }
 
 func writeFileToZip(filename string, writer *zip.Writer) error {