Implement --no-expand flag to allow disabling expansion of file indices

clelange · Sep 28, 2020 · 25c46a4 · 25c46a4
1 parent a00514f
commit 25c46a4
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,5 @@
 # cernopendata-client-go
+
 Go implementation of the CERN Open Data client
 
 Please see the [autogenerated docs](docs/cernopendata-client-go.md).
diff --git a/cmd/download.go b/cmd/download.go
@@ -38,7 +38,7 @@ with a record.`,
 			if err != nil {
 				er(err)
 			}
-			filesList, err := getFilesList(recordJSON, true)
+			filesList, err := getFilesList(recordJSON)
 			if err != nil {
 				er(err)
 			}

diff --git a/cmd/list.go b/cmd/list.go
@@ -25,7 +25,7 @@ var (
 			if err != nil {
 				er(err)
 			}
-			filesList, err := getFilesList(recordJSON, true)
+			filesList, err := getFilesList(recordJSON)
 			if err != nil {
 				er(err)
 			}

diff --git a/cmd/root.go b/cmd/root.go
@@ -18,6 +18,7 @@ var (
 	// Used for flags.
 	recordID string
 	server   string
+	noExpand bool
 
 	rootCmd = &cobra.Command{
 		Use:   "cernopendata-client-go",
@@ -36,6 +37,7 @@ func Execute() error {
 func init() {
 
 	rootCmd.PersistentFlags().StringVarP(&recordID, "record", "r", "", "record ID to list (required)")
+	rootCmd.PersistentFlags().BoolVar(&noExpand, "no-expand", false, "expand files indices")
 	rootCmd.MarkFlagRequired("record")
 	rootCmd.PersistentFlags().StringVarP(&server, "server", "s", "http://opendata.cern.ch", "CERN Open Data server to query")
 	err := doc.GenMarkdownTree(rootCmd, "docs")
@@ -122,7 +124,7 @@ func getRecordJSON() (map[string]interface{}, error) {
 
 }
 
-func getFilesList(recordJSON map[string]interface{}, expand bool) ([]string, error) {
+func getFilesList(recordJSON map[string]interface{}) ([]string, error) {
 
 	_, hasMetadata := recordJSON["metadata"]
 	filesSlice := make([]string, 0)
@@ -141,7 +143,7 @@ func getFilesList(recordJSON map[string]interface{}, expand bool) ([]string, err
 		}
 	}
 
-	if expand {
+	if !noExpand {
 		filesSliceExpanded := make([]string, 0)
 		for idx := range filesSlice {
 			if strings.HasSuffix(filesSlice[idx], "_file_index.txt") {

diff --git a/docs/cernopendata-client-go.md b/docs/cernopendata-client-go.md
@@ -12,6 +12,7 @@ files and complete records.
 
 ```
   -h, --help            help for cernopendata-client-go
+      --no-expand       expand files indices
   -r, --record string   record ID to list (required)
   -s, --server string   CERN Open Data server to query (default "http://opendata.cern.ch")
 ```

diff --git a/docs/cernopendata-client-go_download.md b/docs/cernopendata-client-go_download.md
@@ -21,6 +21,7 @@ cernopendata-client-go download [flags]
 ### Options inherited from parent commands
 
 ```
+      --no-expand       expand files indices
   -r, --record string   record ID to list (required)
   -s, --server string   CERN Open Data server to query (default "http://opendata.cern.ch")
 ```

diff --git a/docs/cernopendata-client-go_list.md b/docs/cernopendata-client-go_list.md
@@ -20,6 +20,7 @@ cernopendata-client-go list [flags]
 ### Options inherited from parent commands
 
 ```
+      --no-expand       expand files indices
   -r, --record string   record ID to list (required)
   -s, --server string   CERN Open Data server to query (default "http://opendata.cern.ch")
 ```