Compare commits
3 Commits
main
...
drive-delt
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
848741e3ae | ||
|
|
bb9771b108 | ||
|
|
6bc49530a4 |
@ -785,6 +785,8 @@ func (c *Collections) PopulateDriveCollections(
|
||||
}
|
||||
}
|
||||
|
||||
fmt.Printf("\n-----\n")
|
||||
|
||||
du, err := pager.Results()
|
||||
if err != nil {
|
||||
return du, nil, clues.Stack(err)
|
||||
@ -815,6 +817,12 @@ func (c *Collections) processItem(
|
||||
"item_is_folder", isFolder)
|
||||
)
|
||||
|
||||
fmt.Printf("\n\033[0;34m%s \033[0m| \033[0;31m %s \033[0m", itemID, itemName)
|
||||
|
||||
for i := 0; i < 12-len(itemName); i++ {
|
||||
fmt.Printf(" ")
|
||||
}
|
||||
|
||||
if item.GetMalware() != nil {
|
||||
addtl := graph.ItemInfo(item)
|
||||
skip := fault.FileSkip(fault.SkipMalware, driveID, itemID, itemName, addtl)
|
||||
@ -826,11 +834,14 @@ func (c *Collections) processItem(
|
||||
skipper.AddSkip(ctx, skip)
|
||||
logger.Ctx(ctx).Infow("malware detected", "item_details", addtl)
|
||||
|
||||
fmt.Printf("| \033[0;35m %s \033[0m", "<malware>")
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// Deleted file or folder.
|
||||
if item.GetDeleted() != nil {
|
||||
fmt.Printf("| \033[0;35m %s \033[0m", "<deleted>")
|
||||
err := c.handleDelete(
|
||||
itemID,
|
||||
driveID,
|
||||
@ -851,6 +862,8 @@ func (c *Collections) processItem(
|
||||
Label(fault.LabelForceNoBackupCreation)
|
||||
}
|
||||
|
||||
fmt.Printf("| \033[0;30m %s\033[0m", collectionPath.Folders()[2:])
|
||||
|
||||
// Skip items that don't match the folder selectors we were given.
|
||||
if shouldSkip(ctx, collectionPath, c.handler, driveName) {
|
||||
logger.Ctx(ictx).Debugw("path not selected", "skipped_path", collectionPath.String())
|
||||
|
||||
@ -148,7 +148,7 @@ func (c Drives) newDriveItemDeltaPager(
|
||||
options := &drives.ItemItemsItemDeltaRequestBuilderGetRequestConfiguration{
|
||||
Headers: newPreferHeaders(preferHeaderItems...),
|
||||
QueryParameters: &drives.ItemItemsItemDeltaRequestBuilderGetQueryParameters{
|
||||
Top: ptr.To(maxDeltaPageSize),
|
||||
Top: ptr.To[int32](4),
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
@ -1,8 +1,10 @@
|
||||
package pagers
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"context"
|
||||
"fmt"
|
||||
"os"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
@ -277,6 +279,13 @@ func DeltaEnumerateItems[T any](
|
||||
|
||||
// Loop through all pages returned by Graph API.
|
||||
for len(nextLink) > 0 {
|
||||
fmt.Printf("\n\033[0;33mPress enter when you're ready for the next page...\033[0m\n")
|
||||
reader := bufio.NewReader(os.Stdin)
|
||||
// ReadString will block until the user enters a newline
|
||||
if _, err := reader.ReadString('\n'); err != nil {
|
||||
fmt.Printf("\n\033[0;31mSomething went wrong:\033[0m [%v]\n", err)
|
||||
}
|
||||
|
||||
page, err := pager.GetPage(graph.ConsumeNTokens(ctx, consume))
|
||||
if graph.IsErrDeltaNotSupported(err) {
|
||||
logger.Ctx(ctx).Infow("delta queries not supported")
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user