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

Add custom drive item

Browse Source
This commit is contained in:
Abhishek Pandey 2023-12-01 02:10:29 -08:00
parent 05dee79560
commit 7a7802e271
9 changed files with 214 additions and 240 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/internal/m365/collection/drive/collection.go
View File

@ -51,7 +51,7 @@ type Collection struct {
// represents
folderPath path.Path
// M365 IDs of file items within this collection
driveItems map[string]CorsoDriveItemable
driveItems map[string]LiteDriveItemable
// Primary M365 ID of the drive this collection was created from
driveID string
@ -91,7 +91,7 @@ type Collection struct {
counter *count.Bus
}
func (c *Collection) GetDriveItemsMap() map[string]CorsoDriveItemable {
func (c *Collection) GetDriveItemsMap() map[string]LiteDriveItemable {
return c.driveItems
}
@ -175,7 +175,7 @@ func newColl(
protectedResource: resource,
folderPath: currPath,
prevPath: prevPath,
driveItems: map[string]CorsoDriveItemable{},
driveItems: map[string]LiteDriveItemable{},
driveID: driveID,
data: dataCh,
statusUpdater: statusUpdater,
@ -193,11 +193,11 @@ func newColl(
// Adds an itemID to the collection. This will make it eligible to be
// populated. The return values denotes if the item was previously
// present or is new one.
func (oc *Collection) Add(cdi CorsoDriveItemable) bool {
func (oc *Collection) Add(cdi LiteDriveItemable) bool {
// _, found := oc.driveItems[ptr.Val(item.GetId())]
// oc.driveItems[ptr.Val(item.GetId())] = item
//cdi := ToCorsoDriveItemable(item)
//cdi := ToLiteDriveItemable(item)
_, found := oc.driveItems[ptr.Val(cdi.GetId())]
oc.driveItems[ptr.Val(cdi.GetId())] = cdi
@ -268,7 +268,7 @@ func (oc Collection) DoNotMergeItems() bool {
func (oc *Collection) getDriveItemContent(
ctx context.Context,
driveID string,
item CorsoDriveItemable,
item LiteDriveItemable,
errs *fault.Bus,
) (io.ReadCloser, error) {
// var (
@ -351,7 +351,7 @@ func downloadContent(
ctx context.Context,
iaag itemAndAPIGetter,
uc getItemPropertyer,
item CorsoDriveItemable,
item LiteDriveItemable,
driveID string,
counter *count.Bus,
) (io.ReadCloser, error) {
@ -386,7 +386,7 @@ func downloadContent(
return nil, clues.Wrap(err, "retrieving expired item")
}
cdi := ToCorsoDriveItemable(di)
cdi := ToLiteDriveItemable(di)
content, err = downloadItem(ctx, iaag, cdi)
if err != nil {
@ -482,7 +482,7 @@ func (oc *Collection) streamItems(ctx context.Context, errs *fault.Bus) {
wg.Add(1)
go func(item CorsoDriveItemable) {
go func(item LiteDriveItemable) {
defer wg.Done()
defer func() { <-semaphoreCh }()
@ -506,14 +506,14 @@ func (oc *Collection) streamItems(ctx context.Context, errs *fault.Bus) {
type lazyItemGetter struct {
info *details.ItemInfo
item CorsoDriveItemable
item LiteDriveItemable
driveID string
suffix string
itemExtensionFactory []extensions.CreateItemExtensioner
contentGetter func(
ctx context.Context,
driveID string,
item CorsoDriveItemable,
item LiteDriveItemable,
errs *fault.Bus) (io.ReadCloser, error)
}
@ -554,7 +554,7 @@ func (lig *lazyItemGetter) GetData(
func (oc *Collection) streamDriveItem(
ctx context.Context,
parentPath *path.Builder,
item CorsoDriveItemable,
item LiteDriveItemable,
stats *driveStats,
itemExtensionFactory []extensions.CreateItemExtensioner,
errs *fault.Bus,

4
src/internal/m365/collection/drive/collections.go
View File

@ -696,7 +696,7 @@ func (c *Collections) handleDelete(
func (c *Collections) getCollectionPath(
driveID string,
item CorsoDriveItemable,
item LiteDriveItemable,
) (path.Path, error) {
var (
pb = odConsts.DriveFolderPrefixBuilder(driveID)
@ -855,7 +855,7 @@ func (c *Collections) processItem(
counter *count.Bus,
skipper fault.AddSkipper,
) error {
item := ToCorsoDriveItemable(di)
item := ToLiteDriveItemable(di)
var (
itemID = ptr.Val(item.GetId())

374
src/internal/m365/collection/drive/custom_drive_item.go
View File

@ -1,112 +1,183 @@
// Disable revive linter since any structs in this file will expose the same
// funcs as the original structs in the msgraph-sdk-go package, which do not
// follow some of the golint rules.
//
//nolint:revive
package drive
import (
"strings"
"time"
"github.com/microsoftgraph/msgraph-sdk-go/models"
"github.com/alcionai/corso/src/internal/common/ptr"
"github.com/alcionai/corso/src/internal/common/str"
"github.com/microsoftgraph/msgraph-sdk-go/models"
)
// Replica of models.DriveItemable
type CorsoDriveItemable interface {
type LiteDriveItemable interface {
GetId() *string
GetName() *string
GetSize() *int64
GetFile() fileDriveItemable
GetFolder() folderDriveItemable
GetPackageEscaped() packageDriveItemable
// TODO(pandeyabs): replace with any
GetFolder() interface{}
GetPackageEscaped() interface{}
GetShared() interface{}
GetMalware() interface{}
GetDeleted() interface{}
GetRoot() interface{}
GetFile() fileItemable
GetParentReference() parentReferenceable
GetAdditionalData() map[string]interface{}
SetParentReference(parentReferenceable)
GetShared() itemSharedable
GetCreatedBy() itemIdentitySetable
GetCreatedDateTime() *time.Time
GetLastModifiedDateTime() *time.Time
GetMalware() malwareable
GetDeleted() deletedable
GetRoot() itemRootable
GetAdditionalData() map[string]interface{}
}
type fileDriveItemable interface {
var _ LiteDriveItemable = &driveItema{}
type driveItema struct {
id string
name string
size int64
folder interface{}
pkg interface{}
shared interface{}
malware interface{}
deleted interface{}
root interface{}
file fileItemable
parentRef parentReferenceable
createdBy itemIdentitySetable
createdDateTime time.Time
lastModifiedDateTime time.Time
additionalData map[string]interface{}
}
// nolint
func (c *driveItema) GetId() *string {
return &c.id
}
func (c *driveItema) GetName() *string {
return &c.name
}
func (c *driveItema) GetSize() *int64 {
return &c.size
}
func (c *driveItema) GetFolder() interface{} {
return c.folder
}
func (c *driveItema) GetPackageEscaped() interface{} {
return c.pkg
}
func (c *driveItema) GetShared() interface{} {
return c.shared
}
func (c *driveItema) GetMalware() interface{} {
return c.malware
}
func (c *driveItema) GetDeleted() interface{} {
return c.deleted
}
func (c *driveItema) GetRoot() interface{} {
return c.root
}
func (c *driveItema) GetFile() fileItemable {
return c.file
}
func (c *driveItema) GetParentReference() parentReferenceable {
return c.parentRef
}
// TODO(pandeyabs): Should we only support GETs?
func (c *driveItema) SetParentReference(parent parentReferenceable) {
c.parentRef = parent
}
func (c *driveItema) GetCreatedBy() itemIdentitySetable {
return c.createdBy
}
func (c *driveItema) GetCreatedDateTime() *time.Time {
return &c.createdDateTime
}
func (c *driveItema) GetLastModifiedDateTime() *time.Time {
return &c.lastModifiedDateTime
}
func (c *driveItema) GetAdditionalData() map[string]interface{} {
return c.additionalData
}
type (
fileItemable interface {
GetMimeType() *string
}
type folderDriveItemable interface{}
type packageDriveItemable interface{}
type parentReferenceable interface {
parentReferenceable interface {
GetPath() *string
GetId() *string
GetName() *string
GetDriveId() *string
}
type itemSharedable interface{}
type malwareable interface{}
type deletedable interface{}
type itemRootable interface{}
type itemIdentitySetable interface {
itemIdentitySetable interface {
GetUser() itemUserable
}
type itemUserable interface {
itemUserable interface {
GetAdditionalData() map[string]interface{}
}
)
// Concrete implementations
type folderDriveItem struct {
isFolder bool
}
type fileDriveItem struct {
isFile bool
var _ fileItemable = &fileItem{}
type fileItem struct {
mimeType string
}
func (fdi *fileDriveItem) GetMimeType() *string {
return &fdi.mimeType
func (f *fileItem) GetMimeType() *string {
return &f.mimeType
}
type packageDriveItem struct {
isPackage bool
}
var _ parentReferenceable = &parentRef{}
type parentReference struct {
type parentRef struct {
path string
id string
name string
driveId string
driveID string
}
func (pr *parentReference) GetPath() *string {
func (pr *parentRef) GetPath() *string {
return &pr.path
}
func (pr *parentReference) GetId() *string {
func (pr *parentRef) GetId() *string {
return &pr.id
}
func (pr *parentReference) GetName() *string {
func (pr *parentRef) GetName() *string {
return &pr.name
}
func (pr *parentReference) GetDriveId() *string {
return &pr.driveId
func (pr *parentRef) GetDriveId() *string {
return &pr.driveID
}
type itemShared struct {
isShared bool
}
type itemMalware struct {
isMalware bool
}
type itemDeleted struct {
isDeleted bool
}
type itemRoot struct {
isRoot bool
}
var _ itemIdentitySetable = &itemIdentitySet{}
type itemIdentitySet struct {
user itemUserable
@ -116,6 +187,8 @@ func (iis *itemIdentitySet) GetUser() itemUserable {
return iis.user
}
var _ itemUserable = &itemUser{}
type itemUser struct {
additionalData map[string]interface{}
}
@ -124,97 +197,70 @@ func (iu *itemUser) GetAdditionalData() map[string]interface{} {
return iu.additionalData
}
type CorsoDriveItem struct {
ID string
Name string
Size int64
File fileDriveItemable
Folder folderDriveItemable
Package packageDriveItemable
AdditionalData map[string]interface{}
ParentReference parentReferenceable
Shared itemSharedable
CreatedBy itemIdentitySetable
CreatedDateTime time.Time
LastModifiedDateTime time.Time
Malware malwareable
Deleted deletedable
Root itemRootable
func ToLiteDriveItemable(item models.DriveItemable) LiteDriveItemable {
cdi := &driveItema{
id: strings.Clone(ptr.Val(item.GetId())),
name: strings.Clone(ptr.Val(item.GetName())),
size: ptr.Val(item.GetSize()),
createdDateTime: ptr.Val(item.GetCreatedDateTime()),
lastModifiedDateTime: ptr.Val(item.GetLastModifiedDateTime()),
}
func (c *CorsoDriveItem) GetId() *string {
return &c.ID
if item.GetFolder() != nil {
cdi.folder = &struct{}{}
} else if item.GetFile() != nil {
cdi.file = &fileItem{
mimeType: strings.Clone(ptr.Val(item.GetFile().GetMimeType())),
}
} else if item.GetPackageEscaped() != nil {
cdi.pkg = &struct{}{}
}
func (c *CorsoDriveItem) GetName() *string {
return &c.Name
if item.GetParentReference() != nil {
cdi.parentRef = &parentRef{
id: strings.Clone(ptr.Val(item.GetParentReference().GetId())),
path: strings.Clone(ptr.Val(item.GetParentReference().GetPath())),
name: strings.Clone(ptr.Val(item.GetParentReference().GetName())),
driveID: strings.Clone(ptr.Val(item.GetParentReference().GetDriveId())),
}
}
func (c *CorsoDriveItem) GetSize() *int64 {
return &c.Size
if item.GetShared() != nil {
cdi.shared = &struct{}{}
}
func (c *CorsoDriveItem) GetFile() fileDriveItemable {
return c.File
if item.GetMalware() != nil {
cdi.malware = &struct{}{}
}
func (c *CorsoDriveItem) GetFolder() folderDriveItemable {
return c.Folder
if item.GetDeleted() != nil {
cdi.deleted = &struct{}{}
}
func (c *CorsoDriveItem) GetPackageEscaped() packageDriveItemable {
return c.Package
if item.GetRoot() != nil {
cdi.root = &struct{}{}
}
func (c *CorsoDriveItem) GetParentReference() parentReferenceable {
return c.ParentReference
if item.GetCreatedBy() != nil && item.GetCreatedBy().GetUser() != nil {
additionalData := item.GetCreatedBy().GetUser().GetAdditionalData()
ad := make(map[string]interface{})
var s string
ed, ok := additionalData["email"]
if ok {
s = strings.Clone(ptr.Val(ed.(*string)))
ad["email"] = &s
} else if ed, ok = additionalData["displayName"]; ok {
s = strings.Clone(ptr.Val(ed.(*string)))
ad["displayName"] = &s
}
// TODO: Should we only support GETs?
func (c *CorsoDriveItem) SetParentReference(parent parentReferenceable) {
c.ParentReference = parent
cdi.createdBy = &itemIdentitySet{
user: &itemUser{
additionalData: ad,
},
}
func (c *CorsoDriveItem) GetAdditionalData() map[string]interface{} {
return c.AdditionalData
}
func (c *CorsoDriveItem) GetShared() itemSharedable {
return c.Shared
}
func (c *CorsoDriveItem) GetCreatedBy() itemIdentitySetable {
return c.CreatedBy
}
func (c *CorsoDriveItem) GetCreatedDateTime() *time.Time {
return &c.CreatedDateTime
}
func (c *CorsoDriveItem) GetLastModifiedDateTime() *time.Time {
return &c.LastModifiedDateTime
}
func (c *CorsoDriveItem) GetMalware() malwareable {
return c.Malware
}
func (c *CorsoDriveItem) GetDeleted() deletedable {
return c.Deleted
}
func (c *CorsoDriveItem) GetRoot() itemRootable {
return c.Root
}
// models.DriveItemable to CorsoDriveItemable
func ToCorsoDriveItemable(item models.DriveItemable) CorsoDriveItemable {
cdi := &CorsoDriveItem{
ID: strings.Clone(ptr.Val(item.GetId())),
Name: strings.Clone(ptr.Val(item.GetName())),
Size: ptr.Val(item.GetSize()),
CreatedDateTime: ptr.Val(item.GetCreatedDateTime()),
LastModifiedDateTime: ptr.Val(item.GetLastModifiedDateTime()),
}
// Hacky way to cache the download url. Thats all we use from additional data
@ -222,6 +268,7 @@ func ToCorsoDriveItemable(item models.DriveItemable) CorsoDriveItemable {
// lot more memory.
if item.GetFile() != nil {
ad := make(map[string]interface{})
for _, key := range downloadURLKeys {
if v, err := str.AnyValueToString(key, item.GetAdditionalData()); err == nil {
ad[key] = strings.Clone(v)
@ -229,80 +276,7 @@ func ToCorsoDriveItemable(item models.DriveItemable) CorsoDriveItemable {
}
}
cdi.AdditionalData = ad
}
if item.GetFolder() != nil {
cdi.Folder = &folderDriveItem{
isFolder: true,
}
}
if item.GetFile() != nil {
cdi.File = &fileDriveItem{
isFile: true,
mimeType: strings.Clone(ptr.Val(item.GetFile().GetMimeType())),
}
}
if item.GetPackageEscaped() != nil {
cdi.Package = &packageDriveItem{
isPackage: true,
}
}
if item.GetParentReference() != nil {
cdi.ParentReference = &parentReference{
id: strings.Clone(ptr.Val(item.GetParentReference().GetId())),
path: strings.Clone(ptr.Val(item.GetParentReference().GetPath())),
name: strings.Clone(ptr.Val(item.GetParentReference().GetName())),
driveId: strings.Clone(ptr.Val(item.GetParentReference().GetDriveId())),
}
}
if item.GetShared() != nil {
cdi.Shared = &itemShared{
isShared: true,
}
}
if item.GetMalware() != nil {
cdi.Malware = &itemMalware{
isMalware: true,
}
}
if item.GetDeleted() != nil {
cdi.Deleted = &itemDeleted{
isDeleted: true,
}
}
if item.GetRoot() != nil {
cdi.Root = &itemRoot{
isRoot: true,
}
}
if item.GetCreatedBy() != nil && item.GetCreatedBy().GetUser() != nil {
additionalData := item.GetCreatedBy().GetUser().GetAdditionalData()
ad := make(map[string]interface{})
var str string
ed, ok := additionalData["email"]
if ok {
str = strings.Clone(ptr.Val(ed.(*string)))
ad["email"] = &str
} else if ed, ok = additionalData["displayName"]; ok {
str = strings.Clone(ptr.Val(ed.(*string)))
ad["displayName"] = &str
}
cdi.CreatedBy = &itemIdentitySet{
user: &itemUser{
additionalData: ad,
},
}
cdi.additionalData = ad
}
return cdi

2
src/internal/m365/collection/drive/group_handler.go
View File

@ -104,7 +104,7 @@ func (h groupBackupHandler) SitePathPrefix(tenantID string) (path.Path, error) {
func (h groupBackupHandler) AugmentItemInfo(
dii details.ItemInfo,
resource idname.Provider,
item CorsoDriveItemable,
item LiteDriveItemable,
size int64,
parentPath *path.Builder,
) details.ItemInfo {

4
src/internal/m365/collection/drive/handler_utils.go
View File

@ -6,7 +6,7 @@ import (
"github.com/alcionai/corso/src/internal/common/ptr"
)
func getItemCreator(item CorsoDriveItemable) string {
func getItemCreator(item LiteDriveItemable) string {
if item.GetCreatedBy() == nil || item.GetCreatedBy().GetUser() == nil {
return ""
}
@ -28,7 +28,7 @@ func getItemCreator(item CorsoDriveItemable) string {
return *ed.(*string)
}
func getItemDriveInfo(item CorsoDriveItemable) (string, string) {
func getItemDriveInfo(item LiteDriveItemable) (string, string) {
if item.GetParentReference() == nil {
return "", ""
}

2
src/internal/m365/collection/drive/handlers.go
View File

@ -23,7 +23,7 @@ type ItemInfoAugmenter interface {
AugmentItemInfo(
dii details.ItemInfo,
resource idname.Provider,
item CorsoDriveItemable,
item LiteDriveItemable,
size int64,
parentPath *path.Builder,
) details.ItemInfo

4
src/internal/m365/collection/drive/item.go
View File

@ -34,7 +34,7 @@ var downloadURLKeys = []string{
func downloadItem(
ctx context.Context,
ag api.Getter,
item CorsoDriveItemable,
item LiteDriveItemable,
) (io.ReadCloser, error) {
if item == nil {
return nil, clues.New("nil item")
@ -152,7 +152,7 @@ func downloadItemMeta(
ctx context.Context,
getter GetItemPermissioner,
driveID string,
item CorsoDriveItemable,
item LiteDriveItemable,
) (io.ReadCloser, int, error) {
meta := metadata.Metadata{
FileName: ptr.Val(item.GetName()),

2
src/internal/m365/collection/drive/site_handler.go
View File

@ -33,7 +33,7 @@ func (h baseSiteHandler) NewDrivePager(
func (h baseSiteHandler) AugmentItemInfo(
dii details.ItemInfo,
resource idname.Provider,
item CorsoDriveItemable,
item LiteDriveItemable,
size int64,
parentPath *path.Builder,
) details.ItemInfo {

2
src/internal/m365/collection/drive/user_drive_handler.go
View File

@ -42,7 +42,7 @@ func (h baseUserDriveHandler) NewDrivePager(
func (h baseUserDriveHandler) AugmentItemInfo(
dii details.ItemInfo,
resource idname.Provider,
item CorsoDriveItemable,
item LiteDriveItemable,
size int64,
parentPath *path.Builder,
) details.ItemInfo {