Continue export during decryption failure

cmd/export.go

@@ -10,7 +10,7 @@ var exportCmd = &cobra.Command{
 	Short: "Starts the export process",
 	Long:  ``,
 	Run: func(cmd *cobra.Command, args []string) {
-		ctrl.StartSync()
+		ctrl.Export()
 	},
 }
 

main.go

@@ -30,5 +30,4 @@ func main() {
 		}
 	}()
 	cmd.Execute(&ctrl)
-	//ctrl.StartSync()
 }

pkg/download.go

@@ -30,7 +30,8 @@ func (c *ClICtrl) downloadAndDecrypt(
 	decryptedPath := fmt.Sprintf("%s/%d.decrypted", dir, file.ID)
 	err = crypto.DecryptFile(downloadPath, decryptedPath, file.Key.MustDecrypt(deviceKey), encoding.DecodeBase64(file.FileNonce))
 	if err != nil {
-		return nil, fmt.Errorf("error decrypting file %d: %w", file.ID, err)
+		log.Printf("Error decrypting file %d: %s", file.ID, err)
+		return nil, model.ErrDecryption
 	}
 	return &decryptedPath, nil
 }

pkg/model/errors.go

@@ -0,0 +1,5 @@
+package model
+
+import "errors"
+
+var ErrDecryption = errors.New("error while decrypting the file")

pkg/remote_to_disk_file.go

@@ -7,6 +7,7 @@ import (
 	"cli-go/utils"
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"log"
 	"os"
@@ -67,7 +68,11 @@ func (c *ClICtrl) syncFiles(ctx context.Context, account model.Account) error {
 			log.Printf("[%d/%d] Sync %s for album %s", i, len(entries), existingEntry.GetTitle(), albumInfo.AlbumName)
 			err = c.downloadEntry(ctx, albumDiskInfo, *existingEntry, entry)
 			if err != nil {
-				return err
+				if errors.Is(err, model.ErrDecryption) {
+					continue
+				} else {
+					return err
+				}
 			}
 		} else {
 			log.Fatalf("remoteFile %d not found in remoteFiles", entry.FileID)

pkg/sync.go

@@ -11,13 +11,13 @@ import (
 	bolt "go.etcd.io/bbolt"
 )
 
-func (c *ClICtrl) StartSync() error {
+func (c *ClICtrl) Export() error {
 	accounts, err := c.GetAccounts(context.Background())
 	if err != nil {
 		return err
 	}
 	if len(accounts) == 0 {
-		fmt.Printf("No accounts to sync\n")
+		fmt.Printf("No accounts to sync\n Add account using `account add` cmd\n")
 		return nil
 	}
 	for _, account := range accounts {