Clean up the sync

DaoCloud · Jan 13, 2025 · 75283ab · 75283ab
1 parent 025a6e8
commit 75283ab
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/sync/sync.go b/sync/sync.go
@@ -11,6 +11,7 @@ import (
 	"sync"
 
 	"github.com/daocloud/crproxy/cache"
+	"github.com/daocloud/crproxy/internal/utils"
 	"github.com/distribution/reference"
 	"github.com/docker/distribution"
 	"github.com/docker/distribution/manifest/manifestlist"
@@ -43,6 +44,7 @@ type SyncManager struct {
 	logger    *slog.Logger
 	deep      bool
 
+	uniq           map[digest.Digest]struct{}
 	excludeTags    []*regexp.Regexp
 	filterPlatform func(pf manifestlist.PlatformSpec) bool
 }
@@ -89,6 +91,7 @@ func NewSyncManager(opts ...Option) (*SyncManager, error) {
 	c := &SyncManager{
 		logger:    slog.Default(),
 		transport: http.DefaultTransport,
+		uniq:      map[digest.Digest]struct{}{},
 	}
 	for _, opt := range opts {
 		opt(c)
@@ -134,6 +137,7 @@ func (c *SyncManager) Image(ctx context.Context, image string) error {
 
 	path := reference.Path(named)
 
+	host, path = utils.CorrectImage(host, path)
 	name := newNameWithoutDomain(named, path)
 
 	repo, err := client.NewRepository(name, "https://"+host, c.transport)
@@ -148,14 +152,13 @@ func (c *SyncManager) Image(ctx context.Context, image string) error {
 
 	bs := repo.Blobs(ctx)
 
-	uniq := map[digest.Digest]struct{}{}
 	blobCallback := func(caches []*cache.Cache, dgst digest.Digest, size int64, pf *manifestlist.PlatformSpec, name string) error {
-		_, ok := uniq[dgst]
+		_, ok := c.uniq[dgst]
 		if ok {
 			c.logger.Info("skip blob by unique", "image", image, "digest", dgst)
 			return nil
 		}
-		uniq[dgst] = struct{}{}
+		c.uniq[dgst] = struct{}{}
 		blob := dgst.String()
 
 		var subCaches []*cache.Cache
@@ -186,12 +189,14 @@ func (c *SyncManager) Image(ctx context.Context, image string) error {
 		}
 		defer f.Close()
 
+		c.logger.Info("start sync blob", "image", image, "digest", dgst, "platform", pf, "name", name)
+
 		if len(subCaches) == 1 {
 			n, err := subCaches[0].PutBlob(ctx, blob, f)
 			if err != nil {
 				return fmt.Errorf("put blob failed: %w", err)
 			}
-			c.logger.Info("sync blob", "image", image, "digest", dgst, "size", n, "platform", pf, "name", name)
+			c.logger.Info("finish sync blob", "image", image, "digest", dgst, "size", n, "platform", pf, "name", name)
 			return nil
 		}
 
@@ -224,7 +229,7 @@ func (c *SyncManager) Image(ctx context.Context, image string) error {
 
 		wg.Wait()
 
-		c.logger.Info("sync blob", "image", image, "digest", dgst, "platform", pf, "name", name, "size", n)
+		c.logger.Info("finish sync blob", "image", image, "digest", dgst, "size", n, "platform", pf, "name", name)
 		return nil
 	}