Populate location for all Exchange data types (#2829)

Always populate the location field of backup details
for Exchange data types

Fix bug where ParentPath for calendar items used
folder IDs instead of display names

---

#### Does this PR need a docs update or release note?

- [x]  Yes, it's included
- [ ] 🕐 Yes, but in a later PR
- [ ]  No

#### Type of change

- [x] 🌻 Feature
- [x] 🐛 Bugfix
- [ ] 🗺️ Documentation
- [ ] 🤖 Test
- [ ] 💻 CI/Deployment
- [ ] 🧹 Tech Debt/Cleanup

#### Issue(s)

* #2486
* closes #2827

merge after:
* #2826
* #2808
* #2828

#### Test Plan

- [x] 💪 Manual
- [ ]  Unit test
- [ ] 💚 E2E
This commit is contained in:
ashmrtn 2023-04-03 13:22:31 -07:00 committed by GitHub
parent f4f0c8c02f
commit 16d1e68ebf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 8 deletions

View File

@ -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. - Enable compression for all data uploaded by kopia.
- SharePoint --folder selectors correctly return items. - SharePoint --folder selectors correctly return items.
- Fix Exchange cli args for filtering 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) - 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 ## [v0.6.1] (beta) - 2023-03-21

View File

@ -7,7 +7,6 @@ import (
"bytes" "bytes"
"context" "context"
"io" "io"
"strings"
"sync" "sync"
"sync/atomic" "sync/atomic"
"time" "time"
@ -83,7 +82,6 @@ type Collection struct {
// LocationPath contains the path with human-readable display names. // LocationPath contains the path with human-readable display names.
// IE: "/Inbox/Important" instead of "/abcdxyz123/algha=lgkhal=t" // IE: "/Inbox/Important" instead of "/abcdxyz123/algha=lgkhal=t"
// Currently only implemented for Exchange Calendars.
locationPath path.Path locationPath path.Path
state data.CollectionState state data.CollectionState
@ -281,7 +279,7 @@ func (col *Collection) streamItems(ctx context.Context, errs *fault.Bus) {
} }
info.Size = int64(len(data)) info.Size = int64(len(data))
info.ParentPath = strings.Join(col.fullPath.Folders(), "/") info.ParentPath = col.locationPath.Folder(true)
col.data <- &Stream{ col.data <- &Stream{
id: id, id: id,

View File

@ -115,10 +115,6 @@ func filterContainersAndFillCollections(
deltaURLs[cID] = newDelta.URL deltaURLs[cID] = newDelta.URL
} }
if qp.Category != path.EventsCategory {
locPath = nil
}
edc := NewCollection( edc := NewCollection(
qp.ResourceOwner, qp.ResourceOwner,
currPath, currPath,