Raw (machine-readable) format for aptly mirror/repo/snapshot list. #27

cmd/mirror_list.go

@@ -14,24 +14,37 @@ func aptlyMirrorList(cmd *commander.Command, args []string) error {
 		return err
 	}
 
-	if context.CollectionFactory().RemoteRepoCollection().Len() > 0 {
-		fmt.Printf("List of mirrors:\n")
-		repos := make([]string, context.CollectionFactory().RemoteRepoCollection().Len())
-		i := 0
-		context.CollectionFactory().RemoteRepoCollection().ForEach(func(repo *deb.RemoteRepo) error {
+	raw := cmd.Flag.Lookup("raw").Value.Get().(bool)
+
+	repos := make([]string, context.CollectionFactory().RemoteRepoCollection().Len())
+	i := 0
+	context.CollectionFactory().RemoteRepoCollection().ForEach(func(repo *deb.RemoteRepo) error {
+		if raw {
+			repos[i] = repo.Name
+		} else {
 			repos[i] = repo.String()
-			i++
-			return nil
-		})
-
-		sort.Strings(repos)
-		for _, repo := range repos {
-			fmt.Printf(" * %s\n", repo)
 		}
+		i++
+		return nil
+	})
 
-		fmt.Printf("\nTo get more information about mirror, run `aptly mirror show <name>`.\n")
+	sort.Strings(repos)
+
+	if raw {
+		for _, repo := range repos {
+			fmt.Printf("%s\n", repo)
+		}
 	} else {
-		fmt.Printf("No mirrors found, create one with `aptly mirror create ...`.\n")
+		if len(repos) > 0 {
+			fmt.Printf("List of mirrors:\n")
+			for _, repo := range repos {
+				fmt.Printf(" * %s\n", repo)
+			}
+
+			fmt.Printf("\nTo get more information about mirror, run `aptly mirror show <name>`.\n")
+		} else {
+			fmt.Printf("No mirrors found, create one with `aptly mirror create ...`.\n")
+		}
 	}
 	return err
 }
@@ -50,5 +63,7 @@ Example:
 `,
 	}
 
+	cmd.Flag.Bool("raw", false, "display list in machine-readable format")
+
 	return cmd
 }

cmd/repo_list.go

@@ -14,30 +14,44 @@ func aptlyRepoList(cmd *commander.Command, args []string) error {
 		return err
 	}
 
-	if context.CollectionFactory().LocalRepoCollection().Len() > 0 {
-		fmt.Printf("List of mirrors:\n")
-		repos := make([]string, context.CollectionFactory().LocalRepoCollection().Len())
-		i := 0
-		context.CollectionFactory().LocalRepoCollection().ForEach(func(repo *deb.LocalRepo) error {
+	raw := cmd.Flag.Lookup("raw").Value.Get().(bool)
+
+	repos := make([]string, context.CollectionFactory().LocalRepoCollection().Len())
+	i := 0
+	context.CollectionFactory().LocalRepoCollection().ForEach(func(repo *deb.LocalRepo) error {
+		if raw {
+			repos[i] = repo.Name
+		} else {
 			err := context.CollectionFactory().LocalRepoCollection().LoadComplete(repo)
 			if err != nil {
 				return err
 			}
 
 			repos[i] = fmt.Sprintf(" * %s (packages: %d)", repo.String(), repo.NumPackages())
-			i++
-			return nil
-		})
-
-		sort.Strings(repos)
-		for _, repo := range repos {
-			fmt.Println(repo)
 		}
+		i++
+		return nil
+	})
 
-		fmt.Printf("\nTo get more information about local repository, run `aptly repo show <name>`.\n")
+	sort.Strings(repos)
+
+	if raw {
+		for _, repo := range repos {
+			fmt.Printf("%s\n", repo)
+		}
 	} else {
-		fmt.Printf("No local repositories found, create one with `aptly repo create ...`.\n")
+		if len(repos) > 0 {
+			fmt.Printf("List of local repos:\n")
+			for _, repo := range repos {
+				fmt.Println(repo)
+			}
+
+			fmt.Printf("\nTo get more information about local repository, run `aptly repo show <name>`.\n")
+		} else {
+			fmt.Printf("No local repositories found, create one with `aptly repo create ...`.\n")
+		}
 	}
+
 	return err
 }
 
@@ -55,5 +69,7 @@ Example:
 `,
 	}
 
+	cmd.Flag.Bool("raw", false, "display list in machine-readable format")
+
 	return cmd
 }

cmd/snapshot_list.go

@@ -14,26 +14,39 @@ func aptlySnapshotList(cmd *commander.Command, args []string) error {
 		return err
 	}
 
-	if context.CollectionFactory().SnapshotCollection().Len() > 0 {
-		fmt.Printf("List of snapshots:\n")
+	raw := cmd.Flag.Lookup("raw").Value.Get().(bool)
 
-		snapshots := make([]string, context.CollectionFactory().SnapshotCollection().Len())
+	snapshots := make([]string, context.CollectionFactory().SnapshotCollection().Len())
 
-		i := 0
-		context.CollectionFactory().SnapshotCollection().ForEach(func(snapshot *deb.Snapshot) error {
+	i := 0
+	context.CollectionFactory().SnapshotCollection().ForEach(func(snapshot *deb.Snapshot) error {
+		if raw {
+			snapshots[i] = snapshot.Name
+		} else {
 			snapshots[i] = snapshot.String()
-			i++
-			return nil
-		})
-
-		sort.Strings(snapshots)
-		for _, snapshot := range snapshots {
-			fmt.Printf(" * %s\n", snapshot)
 		}
+		i++
+		return nil
+	})
 
-		fmt.Printf("\nTo get more information about snapshot, run `aptly snapshot show <name>`.\n")
+	sort.Strings(snapshots)
+
+	if raw {
+		for _, snapshot := range snapshots {
+			fmt.Printf("%s\n", snapshot)
+		}
 	} else {
-		fmt.Printf("\nNo snapshots found, create one with `aptly snapshot create...`.\n")
+		if len(snapshots) > 0 {
+			fmt.Printf("List of snapshots:\n")
+
+			for _, snapshot := range snapshots {
+				fmt.Printf(" * %s\n", snapshot)
+			}
+
+			fmt.Printf("\nTo get more information about snapshot, run `aptly snapshot show <name>`.\n")
+		} else {
+			fmt.Printf("\nNo snapshots found, create one with `aptly snapshot create...`.\n")
+		}
 	}
 	return err
 
@@ -53,5 +66,7 @@ Example:
 `,
 	}
 
+	cmd.Flag.Bool("raw", false, "display list in machine-readable format")
+
 	return cmd
 }