X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=cmd%2Fsafcm%2Fsync_sync.go;h=7e4d225705eb46dae48c851d033d7364d4eff8cf;hb=ecbcb0132728cc18016819a214378b642d92278e;hp=8b4cec45d0ba837cc490ac332a9b5d124883c136;hpb=20686d0d25d7d22f577fc80df31c192b6a88d318;p=safcm%2Fsafcm.git

diff --git a/cmd/safcm/sync_sync.go b/cmd/safcm/sync_sync.go
index 8b4cec4..7e4d225 100644
--- a/cmd/safcm/sync_sync.go
+++ b/cmd/safcm/sync_sync.go
@@ -21,12 +21,12 @@ 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"
 )
 
@@ -45,9 +45,14 @@ func (s *Sync) hostSync(conn *rpc.Conn, detectedGroups []string) error {
 	}
 
 	// 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 != "" {
@@ -66,8 +71,8 @@ func (s *Sync) hostSyncReq(detectedGroups []string) (
 		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)
@@ -83,9 +88,9 @@ func (s *Sync) hostSyncReq(detectedGroups []string) (
 		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, " "))
 	}
 
@@ -186,21 +191,21 @@ func (s *Sync) resolveHostGroups(detectedGroups []string) (
 		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] = math.MinInt32 + 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] = math.MinInt32
+	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
@@ -220,7 +225,7 @@ func (s *Sync) checkFileConflict(group string, path string, file *safcm.File,
 
 	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: "+
@@ -228,7 +233,7 @@ func (s *Sync) checkFileConflict(group string, path string, file *safcm.File,
 				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")
 	}
@@ -241,8 +246,8 @@ func (s *Sync) checkFileConflict(group string, path string, file *safcm.File,
 		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)
 }
 
@@ -255,11 +260,12 @@ func resolveFileDirConflicts(files map[string]*safcm.File) {
 		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]