push backup

cmd/cli/commands/run/run.go

@@ -37,11 +37,7 @@ func (p *RunCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}) s
 		return subcommands.ExitFailure
 	}
 
-	pg := progressbar.New(len(datastore))
-	defer pg.Close()
-
 	for _, metadata := range datastore {
-		pg.Describe("Scanning " + metadata.Name + "...")
 		metadataPath := filepath.Join(repository.DatastorePath(), metadata.ID)
 		//todo transaction
 		err := archiveIfChanged(metadata.ID, metadata.Path, filepath.Join(metadataPath, "data.tar.gz"), filepath.Join(metadataPath, ".last_run"))
@@ -57,11 +53,8 @@ func (p *RunCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}) s
 			fmt.Fprintf(os.Stderr, "error: cannot process the data of %s: %s\n", metadata.ID, err)
 			return subcommands.ExitFailure
 		}
-		pg.Add(1)
 	}
 
-	pg.Finish()
-
 	return subcommands.ExitSuccess
 }
 
@@ -69,6 +62,11 @@ func (p *RunCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}) s
 // in srcDir has a modification time > the last run time stored in stateFile.
 // After archiving, it updates stateFile to the current time.
 func archiveIfChanged(gameID, srcDir, destTarGz, stateFile string) error {
+	pg := progressbar.New(-1)
+	defer pg.Close()
+
+	pg.Describe("Scanning " + gameID + "...")
+
 	// load last run time
 	var lastRun time.Time
 	data, err := os.ReadFile(stateFile)
@@ -99,15 +97,18 @@ func archiveIfChanged(gameID, srcDir, destTarGz, stateFile string) error {
 	}
 
 	if !changed {
+		pg.Finish()
 		return nil
 	}
 
 	// make a backup
+	pg.Describe("Backup current data...")
 	if err := repository.Archive(gameID); err != nil {
 		return fmt.Errorf("failed to archive data: %w", err)
 	}
 
 	// create archive
+	pg.Describe("Archiving new data...")
 	f, err := os.Create(destTarGz)
 	if err != nil {
 		return fmt.Errorf("failed to creating archive file: %w", err)

cmd/cli/commands/sync/sync.go

@@ -65,10 +65,13 @@ func (p *SyncCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{})
 		}
 
 		if !exists {
-			if err := push(r.GameID, g, cli); err != nil {
+			if err := push(g, cli); err != nil {
 				fmt.Fprintln(os.Stderr, "failed to push:", err)
 				return subcommands.ExitFailure
 			}
+			if err := pushBackup(g, cli); err != nil {
+				slog.Warn("failed to push backup files", "err", err)
+			}
 			continue
 		}
 
@@ -96,6 +99,10 @@ func (p *SyncCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{})
 			continue
 		}
 
+		if err := pushBackup(g, cli); err != nil {
+			slog.Warn("failed to push backup files", "err", err)
+		}
+
 		if hlocal == hremote {
 			if vlocal != remoteMetadata.Version {
 				slog.Debug("version is not the same, but the hash is equal. Updating local database")
@@ -109,7 +116,7 @@ func (p *SyncCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{})
 		}
 
 		if vlocal > remoteMetadata.Version {
-			if err := push(r.GameID, g, cli); err != nil {
+			if err := push(g, cli); err != nil {
 				fmt.Fprintln(os.Stderr, "failed to push:", err)
 				return subcommands.ExitFailure
 			}
@@ -164,7 +171,7 @@ func conflict(gameID string, m, remoteMetadata repository.Metadata, cli *client.
 	switch res {
 	case prompt.My:
 		{
-			if err := push(gameID, m, cli); err != nil {
+			if err := push(m, cli); err != nil {
 				return fmt.Errorf("failed to push: %w", err)
 			}
 		}
@@ -185,10 +192,34 @@ func conflict(gameID string, m, remoteMetadata repository.Metadata, cli *client.
 	return nil
 }
 
-func push(gameID string, m repository.Metadata, cli *client.Client) error {
-	archivePath := filepath.Join(repository.DatastorePath(), gameID, "data.tar.gz")
+func push(m repository.Metadata, cli *client.Client) error {
+	archivePath := filepath.Join(repository.DatastorePath(), m.ID, "data.tar.gz")
 
-	return cli.Push(gameID, archivePath, m)
+	return cli.PushSave(archivePath, m)
+}
+
+func pushBackup(m repository.Metadata, cli *client.Client) error {
+	bs, err := repository.Archives(m.ID)
+	if err != nil {
+		return err
+	}
+
+	for _, b := range bs {
+		binfo, err := cli.ArchiveInfo(m.ID, b.UUID)
+		if err != nil {
+			if !errors.Is(err, client.ErrNotFound) {
+				return fmt.Errorf("failed to get remote information about the backup file: %w", err)
+			}
+		}
+
+		if binfo.MD5 != b.MD5 {
+			if err := cli.PushBackup(b, m); err != nil {
+				return fmt.Errorf("failed to push backup: %w", err)
+			}
+		}
+
+	}
+	return nil
 }
 
 func pull(gameID string, cli *client.Client) error {