moved loadFile function

Signed-off-by: Xiaoxuan Wang <wangxiaoxuan119@gmail.com>
oras-project · Sep 12, 2023 · 91b86d9 · 91b86d9
1 parent cce32a1
commit 91b86d9
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/content/oci/deletableOci.go b/content/oci/deletableOci.go
@@ -294,7 +294,7 @@ func (ds *DeletableStore) loadIndexFile(ctx context.Context) error {
 		return fmt.Errorf("failed to decode index file: %w", err)
 	}
 	ds.index = &index
-	return loadIndexWithMemoryWithDelete(ctx, ds.index, ds.storage, ds.tagResolver, ds.graph)
+	return loadIndexInDeletableMemory(ctx, ds.index, ds.storage, ds.tagResolver, ds.graph)
 }
 
 // SaveIndex writes the `index.json` file to the file system.
@@ -348,3 +348,22 @@ func (ds *DeletableStore) writeIndexFile() error {
 	}
 	return os.WriteFile(ds.indexPath, indexJSON, 0666)
 }
+
+// loadIndexInDeletableMemory loads index into memory.
+func loadIndexInDeletableMemory(ctx context.Context, index *ocispec.Index, fetcher content.Fetcher, tagger content.Tagger, graph *graph.DeletableMemory) error {
+	for _, desc := range index.Manifests {
+		if err := tagger.Tag(ctx, deleteAnnotationRefName(desc), desc.Digest.String()); err != nil {
+			return err
+		}
+		if ref := desc.Annotations[ocispec.AnnotationRefName]; ref != "" {
+			if err := tagger.Tag(ctx, desc, ref); err != nil {
+				return err
+			}
+		}
+		plain := descriptor.Plain(desc)
+		if err := graph.IndexAll(ctx, fetcher, plain); err != nil {
+			return err
+		}
+	}
+	return nil
+}
diff --git a/content/oci/readonlyoci.go b/content/oci/readonlyoci.go
@@ -186,25 +186,6 @@ func loadIndex(ctx context.Context, index *ocispec.Index, fetcher content.Fetche
 	return nil
 }
 
-// loadIndex loads index into memory.
-func loadIndexWithMemoryWithDelete(ctx context.Context, index *ocispec.Index, fetcher content.Fetcher, tagger content.Tagger, graph *graph.DeletableMemory) error {
-	for _, desc := range index.Manifests {
-		if err := tagger.Tag(ctx, deleteAnnotationRefName(desc), desc.Digest.String()); err != nil {
-			return err
-		}
-		if ref := desc.Annotations[ocispec.AnnotationRefName]; ref != "" {
-			if err := tagger.Tag(ctx, desc, ref); err != nil {
-				return err
-			}
-		}
-		plain := descriptor.Plain(desc)
-		if err := graph.IndexAll(ctx, fetcher, plain); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
 // resolveBlob returns a descriptor describing the blob identified by dgst.
 func resolveBlob(fsys fs.FS, dgst string) (ocispec.Descriptor, error) {
 	path, err := blobPath(digest.Digest(dgst))