Merge branch 'sharepoint-restore-selectors' into restore-page-flow-4

src/cli/backup/sharepoint.go

@@ -154,12 +154,12 @@ func addSharePointCommands(cmd *cobra.Command) *cobra.Command {
 
 		fs.StringSliceVar(
 			&pageFolders,
-			utils.PageFN, nil,
+			utils.PageFolderFN, nil,
 			"Select backup data by site ID; accepts '"+utils.Wildcard+"' to select all sites.")
 
 		fs.StringSliceVar(
 			&page,
-			utils.PageItemFN, nil,
+			utils.PagesFN, nil,
 			"Select backup data by file name; accepts '"+utils.Wildcard+"' to select all pages within the site.",
 		)
 

src/cli/restore/sharepoint.go

@@ -18,6 +18,8 @@ import (
 var (
 	listItems    []string
 	listPaths    []string
+	pageFolders  []string
+	pages        []string
 	libraryItems []string
 	libraryPaths []string
 	site         []string
@@ -76,6 +78,18 @@ func addSharePointCommands(cmd *cobra.Command) *cobra.Command {
 			utils.ListItemFN, nil,
 			"Restore list items by ID")
 
+		fs.StringSliceVar(
+			&pageFolders,
+			utils.PageFolderFN, nil,
+			"Restore Site pages by SharePoint Site ID",
+		)
+
+		fs.StringSliceVar(
+			&pages,
+			utils.PagesFN, nil,
+			"Restore site pages by file name(s)",
+		)
+
 		// sharepoint info flags
 
 		// fs.StringVar(
@@ -131,6 +145,8 @@ func restoreSharePointCmd(cmd *cobra.Command, args []string) error {
 		ListPaths:    listPaths,
 		LibraryItems: libraryItems,
 		LibraryPaths: libraryPaths,
+		PageFolders:  pageFolders,
+		Pages:        pages,
 		Sites:        site,
 		WebURLs:      weburl,
 		// FileCreatedAfter:   fileCreatedAfter,

src/cli/utils/sharepoint.go

@@ -11,8 +11,8 @@ const (
 	LibraryFN     = "library"
 	ListItemFN    = "list-item"
 	ListFN        = "list"
-	PageFN        = "page"
-	PageItemFN    = "page-item"
+	PageFolderFN  = "page-folders"
+	PagesFN       = "pages"
 	WebURLFN      = "web-url"
 )