// "sync" sub-command: sync files
-// Copyright (C) 2021 Simon Ruderich
+// Copyright (C) 2021-2023 Simon Ruderich
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
import (
"fmt"
+ "math"
"os"
- "path/filepath"
"sort"
"strings"
"ruderich.org/simon/safcm"
"ruderich.org/simon/safcm/cmd/safcm/config"
+ "ruderich.org/simon/safcm/frontend"
"ruderich.org/simon/safcm/rpc"
)
if err != nil {
return err
}
- x, err := s.sendRecv(conn, req)
+ resp, err := s.loop.HostSyncMsg(s, conn, req)
if err != nil {
return err
}
- resp, ok := x.(safcm.MsgSyncResp)
- if !ok {
- return fmt.Errorf("unexpected response %v", x)
- }
// Display changes
- var changes []string
- if len(resp.FileChanges) > 0 {
- changes = append(changes,
- s.formatFileChanges(resp.FileChanges))
- }
- if len(resp.PackageChanges) > 0 {
- changes = append(changes,
- s.formatPackageChanges(resp.PackageChanges))
- }
- if len(resp.ServiceChanges) > 0 {
- changes = append(changes,
- s.formatServiceChanges(resp.ServiceChanges))
- }
- if len(resp.CommandChanges) > 0 {
- changes = append(changes,
- s.formatCommandChanges(resp.CommandChanges))
+ c := frontend.Changes{
+ DryRun: s.config.DryRun,
+ Quiet: s.config.Quiet,
+ IsTTY: s.isTTY,
}
- if len(changes) > 0 {
- s.logf(safcm.LogInfo, true, "%s",
- "\n"+strings.Join(changes, "\n"))
+ changes := c.FormatChanges(resp)
+ if changes != "" {
+ s.log(safcm.LogInfo, true, changes)
}
if resp.Error != "" {
return empty, err
}
{
- // Don't leak internal group order which is confusing without
- // knowing the implementation details.
+ // Don't leak internal group priority which is confusing
+ // without knowing the implementation details.
groupsSorted := make([]string, len(groups))
copy(groupsSorted, groups)
sort.Strings(groupsSorted)
sort.Slice(priorities, func(i, j int) bool {
a := priorities[i]
b := priorities[j]
- return groupPriority[a] < groupPriority[b]
+ return groupPriority[a] > groupPriority[b]
})
- s.logVerbosef("host group priorities (desc. order): %v",
+ s.logVerbosef("host group priorities (descending): %v",
strings.Join(priorities, " "))
}
allFiles := make(map[string]*safcm.File)
allPackagesMap := make(map[string]bool) // map to deduplicate
allServicesMap := make(map[string]bool) // map to deduplicate
- var allCommands []string
+ var allCommands []*safcm.Command
for _, group := range groups {
// Skip non-existent group directories
return nil, nil, err
}
- // Early entries have higher priorities
+ // Early entries in "group_priority" have higher priorities
groupPriority := make(map[string]int)
- for i, x := range s.config.GroupOrder {
- groupPriority[x] = i + 1
+ for i, x := range s.config.GroupPriority {
+ groupPriority[x] = len(s.config.GroupPriority) - i
}
// Host itself always has highest priority
- groupPriority[s.host.Name] = -1
+ groupPriority[s.host.Name] = math.MaxInt32
// Sort groups after priority and name
sort.Slice(groups, func(i, j int) bool {
a := groups[i]
b := groups[j]
- if groupPriority[a] > groupPriority[b] {
+ if groupPriority[a] < groupPriority[b] {
return true
- } else if groupPriority[a] < groupPriority[b] {
+ } else if groupPriority[a] > groupPriority[b] {
return false
} else {
return a < b
newPrio := groupPriority[group]
oldPrio := groupPriority[old.OrigGroup]
- if oldPrio > newPrio {
+ if oldPrio < newPrio {
if old.Mode.IsDir() && file.Mode.IsDir() &&
old.TriggerCommands != nil {
s.logDebugf("files: %q: "+
path, group, old.OrigGroup)
}
return nil
- } else if oldPrio < newPrio {
+ } else if oldPrio > newPrio {
// Should never happen, groups are sorted by priority
panic("invalid group priorities")
}
return nil
}
- return fmt.Errorf("groups %s and %s both provide file %q\n"+
- "Use 'group_order' in config.yaml to declare preference",
+ return fmt.Errorf("groups %s and %s both provide %q\n"+
+ "Use 'group_priority' in config.yaml to declare preference",
group, old.OrigGroup, path)
}
return paths[i] < paths[j]
})
- const sep = string(filepath.Separator)
+ // Slash separated paths are used for the configuration
+ const sep = "/"
- // Remove invalid paths which can result from group_order overriding
- // paths from another group (e.g. "/foo" as file from one group and
- // "/foo/bar" from another).
+ // Remove invalid paths which can result from group_priority
+ // overriding paths from another group (e.g. "/foo" as file from one
+ // group and "/foo/bar" from another).
var last *safcm.File
for _, x := range paths {
file := files[x]