diff --git a/CHANGELOG.md b/CHANGELOG.md index 357e5f8f9..0ac5b3dc6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,8 +16,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Enable compression for all data uploaded by kopia. - SharePoint --folder selectors correctly return items. - Fix Exchange cli args for filtering items -- Skip huge OneNote items that Graph API prevents us from downloading - Skip OneNote items bigger than 2GB (Graph API prevents us from downloading them) +- ParentPath of json output for Exchange calendar now shows names instead of IDs. ## [v0.6.1] (beta) - 2023-03-21 diff --git a/src/internal/connector/exchange/exchange_data_collection.go b/src/internal/connector/exchange/exchange_data_collection.go index 3a0d9c1a8..d8e1cc2e7 100644 --- a/src/internal/connector/exchange/exchange_data_collection.go +++ b/src/internal/connector/exchange/exchange_data_collection.go @@ -7,7 +7,6 @@ import ( "bytes" "context" "io" - "strings" "sync" "sync/atomic" "time" @@ -83,7 +82,6 @@ type Collection struct { // LocationPath contains the path with human-readable display names. // IE: "/Inbox/Important" instead of "/abcdxyz123/algha=lgkhal=t" - // Currently only implemented for Exchange Calendars. locationPath path.Path state data.CollectionState @@ -281,7 +279,7 @@ func (col *Collection) streamItems(ctx context.Context, errs *fault.Bus) { } info.Size = int64(len(data)) - info.ParentPath = strings.Join(col.fullPath.Folders(), "/") + info.ParentPath = col.locationPath.Folder(true) col.data <- &Stream{ id: id, diff --git a/src/internal/connector/exchange/service_iterators.go b/src/internal/connector/exchange/service_iterators.go index a014f0797..29551b21b 100644 --- a/src/internal/connector/exchange/service_iterators.go +++ b/src/internal/connector/exchange/service_iterators.go @@ -115,10 +115,6 @@ func filterContainersAndFillCollections( deltaURLs[cID] = newDelta.URL } - if qp.Category != path.EventsCategory { - locPath = nil - } - edc := NewCollection( qp.ResourceOwner, currPath,