larryh/corso
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updates to abstraction model.

Browse Source
This commit is contained in:
Danny Adams 2023-01-20 21:33:17 -05:00
parent 19446b85e5
commit d5e0801219
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/internal/connector/sharepoint/collection.go
View File

@ -16,6 +16,7 @@ import (
"github.com/alcionai/corso/src/internal/data" "github.com/alcionai/corso/src/internal/data"
"github.com/alcionai/corso/src/internal/observe" "github.com/alcionai/corso/src/internal/observe"
"github.com/alcionai/corso/src/pkg/backup/details" "github.com/alcionai/corso/src/pkg/backup/details"
"github.com/alcionai/corso/src/pkg/control"
"github.com/alcionai/corso/src/pkg/logger" "github.com/alcionai/corso/src/pkg/logger"
"github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/path"
) )
@ -50,7 +51,7 @@ type Collection struct {
// M365 IDs of the items of this collection // M365 IDs of the items of this collection
category DataCategory category DataCategory
service graph.Servicer service graph.Servicer
bService graph.BetaService ctrl control.Options
statusUpdater support.StatusUpdater statusUpdater support.StatusUpdater
} }
@ -67,7 +68,7 @@ func NewCollection(
data: make(chan data.Stream, collectionChannelBufferSize), data: make(chan data.Stream, collectionChannelBufferSize),
service: service, service: service,
statusUpdater: statusUpdater, statusUpdater: statusUpdater,
category: category, category: category,
} }
return c return c
@ -156,10 +157,9 @@ func (sc *Collection) finishPopulation(ctx context.Context, attempts, success in
// populate utility function to retrieve data from back store for a given collection // populate utility function to retrieve data from back store for a given collection
func (sc *Collection) populate(ctx context.Context) { func (sc *Collection) populate(ctx context.Context) {
var ( var (
numItems, success int numItems, success int
totalBytes, arrayLength int64 totalBytes, arrayLength int64
errs error errs error
objects = make([]absser.Parsable, 0)
writer = kw.NewJsonSerializationWriter() writer = kw.NewJsonSerializationWriter()
) )
@ -176,8 +176,19 @@ func (sc *Collection) populate(ctx context.Context) {
sc.finishPopulation(ctx, numItems, success, totalBytes, errs) sc.finishPopulation(ctx, numItems, success, totalBytes, errs)
}() }()
// Retrieve list data from M365 // Switch retrieval function based on category
case sc.category switch sc.category {
case List:
// do the thing
// ctx, service, writer
errs = sc.retrieveListData(ctx, *writer, colProgress)
case Pages:
// do the other thing
}
}
func (sc *Collection) retrieveListData(ctx context.Context, wtr kw.JsonSerializationWriter, progress chan<- struct{}) error {
lists, err := loadSiteLists(ctx, sc.service, sc.fullPath.ResourceOwner(), sc.jobs) lists, err := loadSiteLists(ctx, sc.service, sc.fullPath.ResourceOwner(), sc.jobs)
if err != nil { if err != nil {
errs = support.WrapAndAppend(sc.fullPath.ResourceOwner(), err, errs) errs = support.WrapAndAppend(sc.fullPath.ResourceOwner(), err, errs)
@ -214,6 +225,7 @@ func (sc *Collection) populate(ctx context.Context) {
colProgress <- struct{}{} colProgress <- struct{}{}
} }
} }
} }
func serializeListContent(writer *kw.JsonSerializationWriter, lst models.Listable) ([]byte, error) { func serializeListContent(writer *kw.JsonSerializationWriter, lst models.Listable) ([]byte, error) {