move fillExtra to node.go

node.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
+	"os/user"
 	"strconv"
 	"syscall"
 	"time"
@@ -337,3 +338,49 @@ func (node *Node) isNewer(path string, fi os.FileInfo) bool {
 	debug.Log("node.isNewer", "node %v is not newer", path)
 	return false
 }
+
+func (node *Node) fillUser(stat *syscall.Stat_t) error {
+	node.UID = stat.Uid
+	node.GID = stat.Gid
+
+	u, err := user.LookupId(strconv.Itoa(int(stat.Uid)))
+	if err != nil {
+		return err
+	}
+
+	node.User = u.Username
+	return nil
+}
+
+func (node *Node) fillExtra(path string, fi os.FileInfo) error {
+	stat, ok := fi.Sys().(*syscall.Stat_t)
+	if !ok {
+		return nil
+	}
+
+	node.Inode = stat.Ino
+
+	node.fillUser(stat)
+	node.fillTimes(stat)
+
+	var err error
+
+	switch node.Type {
+	case "file":
+		node.Size = uint64(stat.Size)
+		node.Links = uint64(stat.Nlink)
+	case "dir":
+	case "symlink":
+		node.LinkTarget, err = os.Readlink(path)
+	case "dev":
+		node.fillDevice(stat)
+	case "chardev":
+		node.fillDevice(stat)
+	case "fifo":
+	case "socket":
+	default:
+		err = fmt.Errorf("invalid node type %q", node.Type)
+	}
+
+	return err
+}

node_darwin.go

@@ -15,43 +15,13 @@ func (node *Node) OpenForReading() (*os.File, error) {
 	return os.Open(node.path)
 }
 
-func (node *Node) fillExtra(path string, fi os.FileInfo) error {
+func (node *Node) fillTimes(stat *syscall.Stat_t) {
-	stat, ok := fi.Sys().(*syscall.Stat_t)
-	if !ok {
-		return nil
-	}
-
 	node.ChangeTime = time.Unix(stat.Ctimespec.Unix())
 	node.AccessTime = time.Unix(stat.Atimespec.Unix())
-	node.UID = stat.Uid
+}
-	node.GID = stat.Gid
 
-	if u, err := user.LookupId(strconv.Itoa(int(stat.Uid))); err == nil {
+func (node *Node) fillDevice(stat *syscall.Stat_t) {
-		node.User = u.Username
+	node.Device = uint64(stat.Rdev)
-	}
-
-	node.Inode = stat.Ino
-
-	var err error
-
-	switch node.Type {
-	case "file":
-		node.Size = uint64(stat.Size)
-		node.Links = uint64(stat.Nlink)
-	case "dir":
-	case "symlink":
-		node.LinkTarget, err = os.Readlink(path)
-	case "dev":
-		node.Device = uint64(stat.Rdev)
-	case "chardev":
-		node.Device = uint64(stat.Rdev)
-	case "fifo":
-	case "socket":
-	default:
-		err = fmt.Errorf("invalid node type %q", node.Type)
-	}
-
-	return err
 }
 
 func (node *Node) createDevAt(path string) error {

node_linux.go

@@ -1,10 +1,7 @@
 package restic
 
 import (
-	"fmt"
 	"os"
-	"os/user"
-	"strconv"
 	"syscall"
 	"time"
 )
@@ -17,43 +14,13 @@ func (node *Node) OpenForReading() (*os.File, error) {
 	return file, err
 }
 
-func (node *Node) fillExtra(path string, fi os.FileInfo) error {
+func (node *Node) fillTimes(stat *syscall.Stat_t) {
-	stat, ok := fi.Sys().(*syscall.Stat_t)
-	if !ok {
-		return nil
-	}
-
 	node.ChangeTime = time.Unix(stat.Ctim.Unix())
 	node.AccessTime = time.Unix(stat.Atim.Unix())
-	node.UID = stat.Uid
+}
-	node.GID = stat.Gid
 
-	if u, err := user.LookupId(strconv.Itoa(int(stat.Uid))); err == nil {
+func (node *Node) fillDevice(stat *syscall.Stat_t) {
-		node.User = u.Username
+	node.Device = stat.Rdev
-	}
-
-	node.Inode = stat.Ino
-
-	var err error
-
-	switch node.Type {
-	case "file":
-		node.Size = uint64(stat.Size)
-		node.Links = uint64(stat.Nlink)
-	case "dir":
-	case "symlink":
-		node.LinkTarget, err = os.Readlink(path)
-	case "dev":
-		node.Device = stat.Rdev
-	case "chardev":
-		node.Device = stat.Rdev
-	case "fifo":
-	case "socket":
-	default:
-		err = fmt.Errorf("invalid node type %q", node.Type)
-	}
-
-	return err
 }
 
 func (node *Node) createDevAt(path string) error {