Compare commits

...

3 Commits

Author SHA1 Message Date
ryanfkeepers
848741e3ae change page size 2023-11-14 11:53:16 -07:00
ryanfkeepers
bb9771b108 minimize page size, require user input per page 2023-11-14 11:34:10 -07:00
ryanfkeepers
6bc49530a4 commit 2023-11-10 12:28:59 -07:00
3 changed files with 23 additions and 1 deletions

View File

@ -785,6 +785,8 @@ func (c *Collections) PopulateDriveCollections(
} }
} }
fmt.Printf("\n-----\n")
du, err := pager.Results() du, err := pager.Results()
if err != nil { if err != nil {
return du, nil, clues.Stack(err) return du, nil, clues.Stack(err)
@ -815,6 +817,12 @@ func (c *Collections) processItem(
"item_is_folder", isFolder) "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 { if item.GetMalware() != nil {
addtl := graph.ItemInfo(item) addtl := graph.ItemInfo(item)
skip := fault.FileSkip(fault.SkipMalware, driveID, itemID, itemName, addtl) skip := fault.FileSkip(fault.SkipMalware, driveID, itemID, itemName, addtl)
@ -826,11 +834,14 @@ func (c *Collections) processItem(
skipper.AddSkip(ctx, skip) skipper.AddSkip(ctx, skip)
logger.Ctx(ctx).Infow("malware detected", "item_details", addtl) logger.Ctx(ctx).Infow("malware detected", "item_details", addtl)
fmt.Printf("| \033[0;35m %s \033[0m", "<malware>")
return nil return nil
} }
// Deleted file or folder. // Deleted file or folder.
if item.GetDeleted() != nil { if item.GetDeleted() != nil {
fmt.Printf("| \033[0;35m %s \033[0m", "<deleted>")
err := c.handleDelete( err := c.handleDelete(
itemID, itemID,
driveID, driveID,
@ -851,6 +862,8 @@ func (c *Collections) processItem(
Label(fault.LabelForceNoBackupCreation) 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. // Skip items that don't match the folder selectors we were given.
if shouldSkip(ctx, collectionPath, c.handler, driveName) { if shouldSkip(ctx, collectionPath, c.handler, driveName) {
logger.Ctx(ictx).Debugw("path not selected", "skipped_path", collectionPath.String()) logger.Ctx(ictx).Debugw("path not selected", "skipped_path", collectionPath.String())

View File

@ -148,7 +148,7 @@ func (c Drives) newDriveItemDeltaPager(
options := &drives.ItemItemsItemDeltaRequestBuilderGetRequestConfiguration{ options := &drives.ItemItemsItemDeltaRequestBuilderGetRequestConfiguration{
Headers: newPreferHeaders(preferHeaderItems...), Headers: newPreferHeaders(preferHeaderItems...),
QueryParameters: &drives.ItemItemsItemDeltaRequestBuilderGetQueryParameters{ QueryParameters: &drives.ItemItemsItemDeltaRequestBuilderGetQueryParameters{
Top: ptr.To(maxDeltaPageSize), Top: ptr.To[int32](4),
}, },
} }

View File

@ -1,8 +1,10 @@
package pagers package pagers
import ( import (
"bufio"
"context" "context"
"fmt" "fmt"
"os"
"strings" "strings"
"time" "time"
@ -277,6 +279,13 @@ func DeltaEnumerateItems[T any](
// Loop through all pages returned by Graph API. // Loop through all pages returned by Graph API.
for len(nextLink) > 0 { 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)) page, err := pager.GetPage(graph.ConsumeNTokens(ctx, consume))
if graph.IsErrDeltaNotSupported(err) { if graph.IsErrDeltaNotSupported(err) {
logger.Ctx(ctx).Infow("delta queries not supported") logger.Ctx(ctx).Infow("delta queries not supported")