[bugfix] Don't check for autosync on manual triggered sync (gopasspw#…

…3026) * [bugfix] Don't check for autosync on manual triggered sync Fixes gopasspw#3026 Signed-off-by: Ing. Thomas Mantl <[email protected]>
TM2500 · Jan 6, 2025 · 27bce73 · 27bce73
1 parent ffe0234
commit 27bce73
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/internal/action/sync.go b/internal/action/sync.go
@@ -85,11 +85,13 @@ func (s *Action) autoSync(ctx context.Context) error {
 	debug.Log("autosync - interval: %s", syncInterval)
 
 	if time.Since(ls) > syncInterval {
+		ctx = ctxutil.WithInteractive(ctx, true)
 		err := s.sync(ctx, "")
 		if err != nil {
 			autosyncLastRun = time.Now()
 		}
 
+		ctx = ctxutil.WithAutoSync(ctx, false)
 		return err
 	}
 
@@ -161,10 +163,12 @@ func (s *Action) sync(ctx context.Context, store string) error {
 func (s *Action) syncMount(ctx context.Context, mp string) error {
 	// using GetM here to get the value for this mount, it might be different
 	// than the global value
-	if as := s.cfg.GetM(mp, "core.autosync"); as == "false" {
-		debug.Log("not syncing %s, autosync is disabled for this mount", mp)
+	if as_ctx := ctxutil.HasAutoSync(ctx); as_ctx == true {
+		if as := s.cfg.GetM(mp, "core.autosync"); as == "false" {
+			debug.Log("not syncing %s, autosync is disabled for this mount", mp)
 
-		return nil
+			return nil
+		}
 	}
 
 	ctxno := out.WithNewline(ctx, false)

diff --git a/pkg/ctxutil/ctxutil.go b/pkg/ctxutil/ctxutil.go
@@ -31,6 +31,7 @@ const (
 	ctxKeyCommitTimestamp
 	ctxKeyShowParsing
 	ctxKeyHidden
+	ctxKeyAutoSync
 )
 
 // ErrNoCallback is returned when no callback is set in the context.
@@ -489,3 +490,17 @@ func IsHidden(ctx context.Context) bool {
 
 	return bv
 }
+
+// WithAutoSync returns a context with the autosync flag set
+func WithAutoSync(ctx context.Context, autosync bool) context.Context {
+	return context.WithValue(ctx, ctxKeyAutoSync, autosync)
+}
+
+func HasAutoSync(ctx context.Context) bool {
+	bv, ok := ctx.Value(ctxKeyAutoSync).(bool)
+	if !ok {
+		return false
+	}
+
+	return bv
+}