Skip to content

Commit fb078a0

Browse files
moved loadFile function
Signed-off-by: Xiaoxuan Wang <[email protected]>
1 parent cce32a1 commit fb078a0

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

content/oci/deletableOci.go

+20-1
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,26 @@ func (ds *DeletableStore) loadIndexFile(ctx context.Context) error {
294294
return fmt.Errorf("failed to decode index file: %w", err)
295295
}
296296
ds.index = &index
297-
return loadIndexWithMemoryWithDelete(ctx, ds.index, ds.storage, ds.tagResolver, ds.graph)
297+
return loadIndexWithDeletableMemory(ctx, ds.index, ds.storage, ds.tagResolver, ds.graph)
298+
}
299+
300+
// loadIndex loads index into memory.
301+
func loadIndexWithDeletableMemory(ctx context.Context, index *ocispec.Index, fetcher content.Fetcher, tagger content.Tagger, graph *graph.DeletableMemory) error {
302+
for _, desc := range index.Manifests {
303+
if err := tagger.Tag(ctx, deleteAnnotationRefName(desc), desc.Digest.String()); err != nil {
304+
return err
305+
}
306+
if ref := desc.Annotations[ocispec.AnnotationRefName]; ref != "" {
307+
if err := tagger.Tag(ctx, desc, ref); err != nil {
308+
return err
309+
}
310+
}
311+
plain := descriptor.Plain(desc)
312+
if err := graph.IndexAll(ctx, fetcher, plain); err != nil {
313+
return err
314+
}
315+
}
316+
return nil
298317
}
299318

300319
// SaveIndex writes the `index.json` file to the file system.

content/oci/readonlyoci.go

-19
Original file line numberDiff line numberDiff line change
@@ -186,25 +186,6 @@ func loadIndex(ctx context.Context, index *ocispec.Index, fetcher content.Fetche
186186
return nil
187187
}
188188

189-
// loadIndex loads index into memory.
190-
func loadIndexWithMemoryWithDelete(ctx context.Context, index *ocispec.Index, fetcher content.Fetcher, tagger content.Tagger, graph *graph.DeletableMemory) error {
191-
for _, desc := range index.Manifests {
192-
if err := tagger.Tag(ctx, deleteAnnotationRefName(desc), desc.Digest.String()); err != nil {
193-
return err
194-
}
195-
if ref := desc.Annotations[ocispec.AnnotationRefName]; ref != "" {
196-
if err := tagger.Tag(ctx, desc, ref); err != nil {
197-
return err
198-
}
199-
}
200-
plain := descriptor.Plain(desc)
201-
if err := graph.IndexAll(ctx, fetcher, plain); err != nil {
202-
return err
203-
}
204-
}
205-
return nil
206-
}
207-
208189
// resolveBlob returns a descriptor describing the blob identified by dgst.
209190
func resolveBlob(fsys fs.FS, dgst string) (ocispec.Descriptor, error) {
210191
path, err := blobPath(digest.Digest(dgst))

0 commit comments

Comments
 (0)