track salvage progress

api/recycle.go

@@ -0,0 +1,26 @@
+package api
+
+import (
+	"net/http"
+
+	"github.com/JackalLabs/sequoia/api/types"
+	"github.com/JackalLabs/sequoia/recycle"
+	"github.com/rs/zerolog/log"
+)
+
+func RecycleSalvageHandler(rd *recycle.RecycleDepot) func(http.ResponseWriter, *http.Request) {
+	return func(w http.ResponseWriter, req *http.Request) {
+		v := types.RecycleSalvageResponse{
+			TotalJackalProviderFiles: rd.TotalJprovFiles,
+			SalvagedFilesCount:       rd.SalvagedFilesCount,
+			IsSalvageFinished:        rd.SalvagedFilesCount == rd.TotalJprovFiles,
+		}
+
+		err := json.NewEncoder(w).Encode(v)
+		if err != nil {
+			log.Error().Err(err)
+			return
+		}
+	}
+
+}

recycle/recycle.go

@@ -90,14 +90,15 @@ func (r *RecycleDepot) SalvageFiles(jprovdHome string) error {
 		log.Error().Err(err).Msg("failed to read jprovd storage directory")
 		return err
 	}
+	r.TotalJprovFiles = int64(len(dirList))
 
 	lastSalvaged, err := r.lastSalvagedFile(recordFile)
 	if err != nil {
 		return err
 	}
 	lastSalvagedFound := false
 
-	salvaged := 0
+	r.SalvagedFilesCount = 0
 	for _, d := range dirList {
 		if !d.IsDir() {
 			continue
@@ -107,6 +108,7 @@ func (r *RecycleDepot) SalvageFiles(jprovdHome string) error {
 			if d.Name() == lastSalvaged {
 				lastSalvagedFound = true
 			}
+			r.SalvagedFilesCount++
 			continue // skip the last salvage record to avoid duplicate
 		}
 
@@ -132,10 +134,10 @@ func (r *RecycleDepot) SalvageFiles(jprovdHome string) error {
 				Msg("failed to record salvage info")
 		}
 
-		salvaged++
+		r.SalvagedFilesCount++
 	}
 
-	log.Info().Int("count", salvaged).Msg("salvaging finished...")
+	log.Info().Int("count", int(r.SalvagedFilesCount)).Msg("salvaging finished...")
 	return nil
 }