mirror
/
restic
mirror of https://github.com/restic/restic.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Move isNewer() into node.go

This commit is contained in:
Florian Weingarten 2015-04-29 03:31:07 +00:00
parent 4bb724fac2
commit 91a2a5f90a
3 changed files with 33 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
node.go
View File

@ -10,6 +10,7 @@ import (
"github.com/juju/arrar" "github.com/juju/arrar"
"github.com/restic/restic/backend" "github.com/restic/restic/backend"
"github.com/restic/restic/debug"
"github.com/restic/restic/server" "github.com/restic/restic/server"
) )
@ -308,3 +309,31 @@ func (node Node) sameContent(other Node) bool {
return true return true
} }
func (node *Node) isNewer(path string, fi os.FileInfo) bool {
if node.Type != "file" {
debug.Log("node.isNewer", "node %v is newer: not file", path)
return true
}
tpe := nodeTypeFromFileInfo(fi)
if node.Name != fi.Name() || node.Type != tpe {
debug.Log("node.isNewer", "node %v is newer: name or type changed", path)
return true
}
extendedStat := fi.Sys().(*syscall.Stat_t)
inode := extendedStat.Ino
size := uint64(extendedStat.Size)
if node.ModTime != fi.ModTime() ||
node.ChangeTime != changeTime(extendedStat) ||
node.Inode != inode ||
node.Size != size {
debug.Log("node.isNewer", "node %v is newer: timestamp, size or inode changed", path)
return true
}
debug.Log("node.isNewer", "node %v is not newer", path)
return false
}

29
node_darwin.go
View File

@ -66,31 +66,6 @@ func (node *Node) createFifoAt(path string) error {
return syscall.Mkfifo(path, 0600) return syscall.Mkfifo(path, 0600)
} }
func (node *Node) isNewer(path string, fi os.FileInfo) bool { func changeTime(stat *syscall.Stat_t) time.Unix {
if node.Type != "file" { return time.Unix(stat.Ctimespec.Unix())
debug.Log("node.isNewer", "node %v is newer: not file", path)
return true
}
tpe := nodeTypeFromFileInfo(fi)
if node.Name != fi.Name() || node.Type != tpe {
debug.Log("node.isNewer", "node %v is newer: name or type changed", path)
return false
}
extendedStat := fi.Sys().(*syscall.Stat_t)
changeTime := time.Unix(extendedStat.Ctimespec.Unix())
inode := extendedStat.Ino
size := uint64(extendedStat.Size)
if node.ModTime != fi.ModTime() ||
node.ChangeTime != changeTime ||
node.Inode != inode ||
node.Size != size {
debug.Log("node.isNewer", "node %v is newer: timestamp or inode changed", path)
return false
}
debug.Log("node.isNewer", "node %v is not newer", path)
return false
} }

31
node_linux.go
View File

@ -7,8 +7,6 @@ import (
"strconv" "strconv"
"syscall" "syscall"
"time" "time"
"github.com/restic/restic/debug"
) )
func (node *Node) OpenForReading() (*os.File, error) { func (node *Node) OpenForReading() (*os.File, error) {
@ -70,31 +68,6 @@ func (node *Node) createFifoAt(path string) error {
return syscall.Mkfifo(path, 0600) return syscall.Mkfifo(path, 0600)
} }
func (node *Node) isNewer(path string, fi os.FileInfo) bool { func changeTime(stat *syscall.Stat_t) time.Time {
if node.Type != "file" { return time.Unix(stat.Ctim.Unix())
debug.Log("node.isNewer", "node %v is newer: not file", path)
return true
}
tpe := nodeTypeFromFileInfo(fi)
if node.Name != fi.Name() || node.Type != tpe {
debug.Log("node.isNewer", "node %v is newer: name or type changed", path)
return true
}
extendedStat := fi.Sys().(*syscall.Stat_t)
changeTime := time.Unix(extendedStat.Ctim.Unix())
inode := extendedStat.Ino
size := uint64(extendedStat.Size)
if node.ModTime != fi.ModTime() ||
node.ChangeTime != changeTime ||
node.Inode != inode ||
node.Size != size {
debug.Log("node.isNewer", "node %v is newer: timestamp, size or inode changed", path)
return true
}
debug.Log("node.isNewer", "node %v is not newer", path)
return false
} }