octoleo/restic
2
2
Fork 0
mirror of https://github.com/octoleo/restic.git synced 2025-02-09 15:18:27 +00:00
Code Issues Releases Wiki Activity

ls: fix ncdu output for file with timestamp before 1970

Browse Source
This commit is contained in:
Michael Eischer 2024-07-13 10:21:02 +02:00
parent ff9238ebf1
commit 5671dfb481
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/restic/cmd_ls.go
View File

@ -222,6 +222,10 @@ func lsNcduNode(_ string, node *restic.Node) ([]byte, error) {
if node.Mode&os.ModeSticky != 0 { if node.Mode&os.ModeSticky != 0 {
outNode.Mode |= 0o1000 outNode.Mode |= 0o1000
} }
if outNode.Mtime < 0 {
// ncdu does not allow negative times
outNode.Mtime = 0
}
return json.Marshal(outNode) return json.Marshal(outNode)
} }

25
cmd/restic/cmd_ls_test.go
View File

@ -109,11 +109,11 @@ func TestLsNodeJSON(t *testing.T) {
func TestLsNcduNode(t *testing.T) { func TestLsNcduNode(t *testing.T) {
for i, expect := range []string{ for i, expect := range []string{
`{"name":"baz","asize":12345,"dsize":12800,"dev":0,"ino":0,"nlink":1,"notreg":false,"uid":10000000,"gid":20000000,"mode":0,"mtime":-62135596800}`, `{"name":"baz","asize":12345,"dsize":12800,"dev":0,"ino":0,"nlink":1,"notreg":false,"uid":10000000,"gid":20000000,"mode":0,"mtime":0}`,
`{"name":"empty","asize":0,"dsize":0,"dev":0,"ino":0,"nlink":3840,"notreg":false,"uid":1001,"gid":1001,"mode":0,"mtime":-62135596800}`, `{"name":"empty","asize":0,"dsize":0,"dev":0,"ino":0,"nlink":3840,"notreg":false,"uid":1001,"gid":1001,"mode":0,"mtime":0}`,
`{"name":"link","asize":0,"dsize":0,"dev":0,"ino":0,"nlink":0,"notreg":true,"uid":0,"gid":0,"mode":511,"mtime":-62135596800}`, `{"name":"link","asize":0,"dsize":0,"dev":0,"ino":0,"nlink":0,"notreg":true,"uid":0,"gid":0,"mode":511,"mtime":0}`,
`{"name":"directory","asize":0,"dsize":0,"dev":0,"ino":0,"nlink":0,"notreg":false,"uid":0,"gid":0,"mode":493,"mtime":1577934245}`, `{"name":"directory","asize":0,"dsize":0,"dev":0,"ino":0,"nlink":0,"notreg":false,"uid":0,"gid":0,"mode":493,"mtime":1577934245}`,
`{"name":"sticky","asize":0,"dsize":0,"dev":0,"ino":0,"nlink":0,"notreg":false,"uid":0,"gid":0,"mode":4077,"mtime":-62135596800}`, `{"name":"sticky","asize":0,"dsize":0,"dev":0,"ino":0,"nlink":0,"notreg":false,"uid":0,"gid":0,"mode":4077,"mtime":0}`,
} { } {
c := lsTestNodes[i] c := lsTestNodes[i]
out, err := lsNcduNode(c.path, &c.Node) out, err := lsNcduNode(c.path, &c.Node)
@ -132,27 +132,30 @@ func TestLsNcdu(t *testing.T) {
printer := &ncduLsPrinter{ printer := &ncduLsPrinter{
out: &buf, out: &buf,
} }
modTime := time.Date(2020, 1, 2, 3, 4, 5, 0, time.UTC)
printer.Snapshot(&restic.Snapshot{ printer.Snapshot(&restic.Snapshot{
Hostname: "host", Hostname: "host",
Paths: []string{"/example"}, Paths: []string{"/example"},
}) })
printer.Node("/directory", &restic.Node{ printer.Node("/directory", &restic.Node{
Type: "dir", Type: "dir",
Name: "directory", Name: "directory",
ModTime: modTime,
}, false) }, false)
printer.Node("/directory/data", &restic.Node{ printer.Node("/directory/data", &restic.Node{
Type: "file", Type: "file",
Name: "data", Name: "data",
Size: 42, Size: 42,
ModTime: modTime,
}, false) }, false)
printer.LeaveDir("/directory") printer.LeaveDir("/directory")
printer.Close() printer.Close()
rtest.Equals(t, `[1, 2, {"time":"0001-01-01T00:00:00Z","tree":null,"paths":["/example"],"hostname":"host"}, [{"name":"/"}, rtest.Equals(t, `[1, 2, {"time":"0001-01-01T00:00:00Z","tree":null,"paths":["/example"],"hostname":"host"}, [{"name":"/"},
[ [
{"name":"directory","asize":0,"dsize":0,"dev":0,"ino":0,"nlink":0,"notreg":false,"uid":0,"gid":0,"mode":0,"mtime":-62135596800}, {"name":"directory","asize":0,"dsize":0,"dev":0,"ino":0,"nlink":0,"notreg":false,"uid":0,"gid":0,"mode":0,"mtime":1577934245},
{"name":"data","asize":42,"dsize":512,"dev":0,"ino":0,"nlink":0,"notreg":false,"uid":0,"gid":0,"mode":0,"mtime":-62135596800} {"name":"data","asize":42,"dsize":512,"dev":0,"ino":0,"nlink":0,"notreg":false,"uid":0,"gid":0,"mode":0,"mtime":1577934245}
] ]
] ]
] ]