mirror of
https://github.com/vbatts/go-mtree.git
synced 2025-07-14 02:39:11 +00:00
*: update -u
behavior
Fixes #16 In attempt to close https://github.com/vbatts/go-mtree/issues/16 I've uncovered that the update was missing a function for symlink. Additionally the update was not even opperating on the correct directory hierarchy. I've uncovered that os.Chtimes follows the symlink, and presumably only Linux has an obscure way to set the mtime/atime on a symlink itself. So I've made a custom lchtimes(). Also Mode follows through the symlink, and symlinks only ever have a mode of 0777, so don't set them. Lastly, directories need to have their mtime/atime set in a reverse order after all other updates have been done. This is going to require something like a `container/heap` to be unwound. Also, each updateFunc will _only_ perform the update if it is needed. Much less invasive this way. Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
This commit is contained in:
parent
a393e171c4
commit
73be830998
9 changed files with 304 additions and 18 deletions
76
update.go
76
update.go
|
@ -1,6 +1,7 @@
|
|||
package mtree
|
||||
|
||||
import (
|
||||
"container/heap"
|
||||
"os"
|
||||
"sort"
|
||||
|
||||
|
@ -12,8 +13,9 @@ var DefaultUpdateKeywords = []Keyword{
|
|||
"uid",
|
||||
"gid",
|
||||
"mode",
|
||||
"time",
|
||||
"xattr",
|
||||
"link",
|
||||
"time",
|
||||
}
|
||||
|
||||
// Update attempts to set the attributes of root directory path, given the values of `keywords` in dh DirectoryHierarchy.
|
||||
|
@ -29,6 +31,11 @@ func Update(root string, dh *DirectoryHierarchy, keywords []Keyword, fs FsEval)
|
|||
}
|
||||
sort.Sort(byPos(creator.DH.Entries))
|
||||
|
||||
// This is for deferring the update of mtimes of directories, to unwind them
|
||||
// in a most specific path first
|
||||
h := &pathUpdateHeap{}
|
||||
heap.Init(h)
|
||||
|
||||
results := []InodeDelta{}
|
||||
for i, e := range creator.DH.Entries {
|
||||
switch e.Type {
|
||||
|
@ -62,6 +69,19 @@ func Update(root string, dh *DirectoryHierarchy, keywords []Keyword, fs FsEval)
|
|||
logrus.Debugf("no UpdateKeywordFunc for %s; skipping", kv.Keyword())
|
||||
continue
|
||||
}
|
||||
|
||||
// TODO check for the type=dir of the entry as well
|
||||
if kv.Keyword().Prefix() == "time" && e.IsDir() {
|
||||
heap.Push(h, pathUpdate{
|
||||
Path: pathname,
|
||||
E: e,
|
||||
KV: kv,
|
||||
Func: ukFunc,
|
||||
})
|
||||
|
||||
continue
|
||||
}
|
||||
|
||||
if _, err := ukFunc(pathname, kv); err != nil {
|
||||
results = append(results, InodeDelta{
|
||||
diff: ErrorDifference,
|
||||
|
@ -75,16 +95,60 @@ func Update(root string, dh *DirectoryHierarchy, keywords []Keyword, fs FsEval)
|
|||
},
|
||||
}})
|
||||
}
|
||||
// XXX really would be great to have a Check() or Compare() right here,
|
||||
// to compare each entry as it is encountered, rather than just running
|
||||
// Check() on this path after the whole update is finished.
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for h.Len() > 0 {
|
||||
pu := heap.Pop(h).(pathUpdate)
|
||||
if _, err := pu.Func(pu.Path, pu.KV); err != nil {
|
||||
results = append(results, InodeDelta{
|
||||
diff: ErrorDifference,
|
||||
path: pu.Path,
|
||||
old: pu.E,
|
||||
keys: []KeyDelta{
|
||||
{
|
||||
diff: ErrorDifference,
|
||||
name: pu.KV.Keyword(),
|
||||
err: err,
|
||||
},
|
||||
}})
|
||||
}
|
||||
}
|
||||
return results, nil
|
||||
}
|
||||
|
||||
// Result of an "update" returns the produced results
|
||||
type Result struct {
|
||||
Path string
|
||||
Keyword Keyword
|
||||
Got string
|
||||
type pathUpdateHeap []pathUpdate
|
||||
|
||||
func (h pathUpdateHeap) Len() int { return len(h) }
|
||||
func (h pathUpdateHeap) Swap(i, j int) { h[i], h[j] = h[j], h[i] }
|
||||
|
||||
// This may end up looking backwards, but for container/heap, Less evaluates
|
||||
// the negative priority. So when popping members of the array, it will be
|
||||
// sorted by least. For this use-case, we want the most-qualified-name popped
|
||||
// first (the longest path name), such that "." is the last entry popped.
|
||||
func (h pathUpdateHeap) Less(i, j int) bool {
|
||||
return len(h[i].Path) > len(h[j].Path)
|
||||
}
|
||||
|
||||
func (h *pathUpdateHeap) Push(x interface{}) {
|
||||
*h = append(*h, x.(pathUpdate))
|
||||
}
|
||||
|
||||
func (h *pathUpdateHeap) Pop() interface{} {
|
||||
old := *h
|
||||
n := len(old)
|
||||
x := old[n-1]
|
||||
*h = old[0 : n-1]
|
||||
return x
|
||||
}
|
||||
|
||||
type pathUpdate struct {
|
||||
Path string
|
||||
E Entry
|
||||
KV KeyVal
|
||||
Func UpdateKeywordFunc
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue