[bugfix] Don't check for autosync on manual triggered sync (#3026) #3029
Conversation
|
Additional Tests are needed to verify this bugfix. |
…3026) * [bugfix] Don't check for autosync on manual triggered sync Fixes gopasspw#3026 Signed-off-by: Ing. Thomas Mantl <thomas.mantl@redgears.net>
TM2500
force-pushed
the
3026-autosync-disables-sync
branch
from
27bce73 to
e876920
Compare
| @@ -85,6 +85,7 @@ func (s *Action) autoSync(ctx context.Context) error { | |||
| debug.Log("autosync - interval: %s", syncInterval) | |||
|
|
|||
| if time.Since(ls) > syncInterval { | |||
| ctx = ctxutil.WithInteractive(ctx, true) | |||
There was a problem hiding this comment.
It looks like you're relying on the interactive context key in the end, instead of the newly added autosync one, no?
There was a problem hiding this comment.
You might mean to use
| ctx = ctxutil.WithInteractive(ctx, true) | |
| ctx = ctxutil.WithAutoSync(ctx, true) |
there, no?
|
|
||
| // WithAutoSync returns a context with the autosync flag set. | ||
| func WithAutoSync(ctx context.Context, autosync bool) context.Context { | ||
| return context.WithValue(ctx, ctxKeyAutoSync, autosync) | ||
| } | ||
|
|
||
| // HasAutoSync returns true if syncs are triggered by autosync. | ||
| func HasAutoSync(ctx context.Context) bool { | ||
| bv, ok := ctx.Value(ctxKeyAutoSync).(bool) | ||
| if !ok { | ||
| return false | ||
| } | ||
|
|
||
| return bv | ||
| } |
There was a problem hiding this comment.
Do you really need these?
It looks like you're relying on the interactive context key above, instead of that newly added autosync one, no?
| @@ -161,10 +162,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 ctxutil.HasAutoSync(ctx) { | |||
There was a problem hiding this comment.
Wait, you're setting the interactive key above, not the autosync one, no?
There was a problem hiding this comment.
I propably mixed something up. I need to take a look at it again.
I hope to include meaningful tests as well, as there are none for sync.
Fixes #3026