TrueCloudLab/restic
16
0
Fork 2
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Correctly format all node types

Browse source
This commit is contained in:
Alexander Neumann 2017-12-03 17:34:37 +01:00
parent 7092af6329
commit 88607fc625
2 changed files with 35 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
cmd/restic/format.go
View file

@ -68,17 +68,29 @@ func formatNode(prefix string, n *restic.Node, long bool) string {
return filepath.Join(prefix, n.Name) return filepath.Join(prefix, n.Name)
} }
var mode os.FileMode
var target string
switch n.Type { switch n.Type {
case "file": case "file":
return fmt.Sprintf("%s %5d %5d %6d %s %s", mode = 0
n.Mode, n.UID, n.GID, n.Size, n.ModTime.Format(TimeFormat), filepath.Join(prefix, n.Name))
case "dir": case "dir":
return fmt.Sprintf("%s %5d %5d %6d %s %s", mode = os.ModeDir
n.Mode|os.ModeDir, n.UID, n.GID, n.Size, n.ModTime.Format(TimeFormat), filepath.Join(prefix, n.Name))
case "symlink": case "symlink":
return fmt.Sprintf("%s %5d %5d %6d %s %s -> %s", mode = os.ModeSymlink
n.Mode|os.ModeSymlink, n.UID, n.GID, n.Size, n.ModTime.Format(TimeFormat), filepath.Join(prefix, n.Name), n.LinkTarget) target = fmt.Sprintf(" -> %v", n.LinkTarget)
default: case "dev":
return fmt.Sprintf("<Node(%s) %s>", n.Type, n.Name) mode = os.ModeDevice
case "chardev":
mode = os.ModeDevice | os.ModeCharDevice
case "fifo":
mode = os.ModeNamedPipe
case "socket":
mode = os.ModeSocket
} }
return fmt.Sprintf("%s %5d %5d %6d %s %s%s",
mode|n.Mode, n.UID, n.GID, n.Size,
n.ModTime.Format(TimeFormat), filepath.Join(prefix, n.Name),
target)
} }

20
internal/restic/node.go
View file

@ -61,16 +61,26 @@ func (n Nodes) Less(i, j int) bool { return n[i].Name < n[j].Name }
func (n Nodes) Swap(i, j int) { n[i], n[j] = n[j], n[i] } func (n Nodes) Swap(i, j int) { n[i], n[j] = n[j], n[i] }
func (node Node) String() string { func (node Node) String() string {
var mode os.FileMode
switch node.Type { switch node.Type {
case "file": case "file":
return fmt.Sprintf("%s %5d %5d %6d %s %s", mode = 0
node.Mode, node.UID, node.GID, node.Size, node.ModTime, node.Name)
case "dir": case "dir":
return fmt.Sprintf("%s %5d %5d %6d %s %s", mode = os.ModeDir
node.Mode|os.ModeDir, node.UID, node.GID, node.Size, node.ModTime, node.Name) case "symlink":
mode = os.ModeSymlink
case "dev":
mode = os.ModeDevice
case "chardev":
mode = os.ModeDevice | os.ModeCharDevice
case "fifo":
mode = os.ModeNamedPipe
case "socket":
mode = os.ModeSocket
} }
return fmt.Sprintf("<Node(%s) %s>", node.Type, node.Name) return fmt.Sprintf("%s %5d %5d %6d %s %s",
mode|node.Mode, node.UID, node.GID, node.Size, node.ModTime, node.Name)
} }
// NodeFromFileInfo returns a new node from the given path and FileInfo. It // NodeFromFileInfo returns a new node from the given path and FileInfo. It