octoleo/restic
2
2
Fork 0
mirror of https://github.com/octoleo/restic.git synced 2024-11-26 23:06:32 +00:00
Code Issues Releases Wiki Activity

User interface inconsistency fixed

Browse Source
This commit is contained in:
Uzi 2017-01-14 11:19:47 +08:00
parent 02c02283cf
commit c13a0953c8
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/cmds/restic/cmd_ls.go
View File

@ -25,16 +25,27 @@ The special snapshot-ID "latest" can be used to list files and directories of th
},
}
var listLong bool
// LsOptions collects all options for the ls command.
type LsOptions struct {
ListLong bool
Host string
Paths []string
}
var lsOptions LsOptions
func init() {
cmdRoot.AddCommand(cmdLs)
cmdLs.Flags().BoolVarP(&listLong, "long", "l", false, "use a long listing format showing size and mode")
flags := cmdLs.Flags()
flags.BoolVarP(&lsOptions.ListLong, "long", "l", false, "use a long listing format showing size and mode")
flags.StringVarP(&lsOptions.Host, "host", "H", "", `only consider snapshots for this host when the snapshot ID is "latest"`)
flags.StringSliceVar(&lsOptions.Paths, "path", nil, "only consider snapshots which include this (absolute) `path` for snapshot ID \"latest\"")
}
func printNode(prefix string, n *restic.Node) string {
if !listLong {
if !lsOptions.ListLong {
return filepath.Join(prefix, n.Name)
}
@ -90,17 +101,16 @@ func runLs(gopts GlobalOptions, args []string) error {
snapshotIDString := args[0]
var id restic.ID
var paths []string
if snapshotIDString == "latest" {
id, err = restic.FindLatestSnapshot(repo, paths, "")
id, err = restic.FindLatestSnapshot(repo, lsOptions.Paths, lsOptions.Host)
if err != nil {
return err
Exitf(1, "latest snapshot for criteria not found: %v Paths:%v Host:%v", err, lsOptions.Paths, lsOptions.Host)
}
} else {
id, err = restic.FindSnapshot(repo, snapshotIDString)
if err != nil {
return err
Exitf(1, "invalid id %q: %v", snapshotIDString, err)
}
}