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

Fix nil ptrs and drive name setting

Browse Source
This commit is contained in:
Abhishek Pandey 2023-11-20 21:08:07 -08:00
parent 27383e950e
commit bcaa5d434d
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -577,7 +577,7 @@ func (oc *Collection) streamDriveItem(
"item_name", clues.Hide(itemName), "item_name", clues.Hide(itemName),
"item_size", itemSize) "item_size", itemSize)
// item.SetParentReference(setName(item.GetParentReference(), oc.driveName)) item.SetParentReference(setName(item.GetParentReference(), oc.driveName))
isFile := item.GetFile() != nil isFile := item.GetFile() != nil

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

@ -273,7 +273,7 @@ func ToCorsoDriveItemable(item models.DriveItemable) CorsoDriveItemable {
} }
} }
if item.GetCreatedBy() != nil { if item.GetCreatedBy() != nil && item.GetCreatedBy().GetUser() != nil {
cdi.CreatedBy = &itemIdentitySet{ cdi.CreatedBy = &itemIdentitySet{
user: &itemUser{ user: &itemUser{
additionalData: item.GetCreatedBy().GetUser().GetAdditionalData(), additionalData: item.GetCreatedBy().GetUser().GetAdditionalData(),

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

@ -205,12 +205,16 @@ func driveItemWriter(
return iw, ptr.Val(icu.GetUploadUrl()), nil return iw, ptr.Val(icu.GetUploadUrl()), nil
} }
func setName(orig models.ItemReferenceable, driveName string) models.ItemReferenceable { func setName(orig parentReferenceable, driveName string) models.ItemReferenceable {
if orig == nil { if orig == nil {
return nil return nil
} }
orig.SetName(&driveName) mod := models.NewItemReference()
mod.SetDriveId(orig.GetDriveId())
mod.SetId(orig.GetId())
mod.SetPath(orig.GetPath())
mod.SetName(&driveName)
return orig return mod
} }