// "sync" sub-command: sync files
-// Copyright (C) 2021 Simon Ruderich
+// Copyright (C) 2021-2022 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
"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
- changes := s.formatChanges(resp)
+ c := frontend.Changes{
+ DryRun: s.config.DryRun,
+ Quiet: s.config.Quiet,
+ IsTTY: s.isTTY,
+ }
+ changes := c.FormatChanges(resp)
if changes != "" {
- s.logf(safcm.LogInfo, true, "%s", changes)
+ s.log(safcm.LogInfo, true, changes)
}
if resp.Error != "" {
b := priorities[j]
return groupPriority[a] > groupPriority[b]
})
- s.logVerbosef("host group priorities (desc. priority): %v",
+ s.logVerbosef("host group priorities (descending): %v",
strings.Join(priorities, " "))
}
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.GroupPriority {
groupPriority[x] = len(s.config.GroupPriority) - i
return nil
}
- return fmt.Errorf("groups %s and %s both provide file %q\n"+
+ 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_priority
// overriding paths from another group (e.g. "/foo" as file from one