Add flag to stop re-parsing the user file when we already know its
contents
This commit is contained in:
+20
-9
@@ -16,9 +16,10 @@ import "git.tebibyte.media/tomo/tomo/event"
|
||||
// directly followed by a deferred call to Unlock.
|
||||
|
||||
type config struct {
|
||||
open bool
|
||||
watcher *fsnotify.Watcher
|
||||
lock sync.RWMutex
|
||||
open bool
|
||||
watcher *fsnotify.Watcher
|
||||
lock sync.RWMutex
|
||||
ignoreNextUserUpdate bool
|
||||
|
||||
paths struct {
|
||||
user string
|
||||
@@ -68,10 +69,13 @@ func (this *config) lockAndProcessEvent (event fsnotify.Event) {
|
||||
if _, ok := this.paths.watching[event.Name]; !ok { return }
|
||||
|
||||
if event.Name == this.paths.user {
|
||||
previousUser := this.data.user
|
||||
this.reloadUser()
|
||||
newUser := this.data.user
|
||||
this.processUserDiff(newUser.Diff(previousUser))
|
||||
if !this.ignoreNextUserUpdate {
|
||||
previousUser := this.data.user
|
||||
this.reloadUser()
|
||||
newUser := this.data.user
|
||||
this.processUserDiff(newUser.Diff(previousUser))
|
||||
}
|
||||
this.ignoreNextUserUpdate = false
|
||||
} else {
|
||||
index := slices.Index(this.paths.system, event.Name)
|
||||
if index > 0 {
|
||||
@@ -148,6 +152,7 @@ func (this *config) saveUser () error {
|
||||
defer file.Close()
|
||||
_, err = this.data.user.WriteTo(file)
|
||||
if err != nil { return err }
|
||||
this.ignoreNextUserUpdate = true
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -262,7 +267,10 @@ func (this *config) Set (key string, value Value) error {
|
||||
if this.data.user == nil { this.data.user = NewFile() }
|
||||
err := this.data.user.Set(key, value)
|
||||
if err != nil { return err }
|
||||
return this.saveUser()
|
||||
err = this.saveUser()
|
||||
if err != nil { return err }
|
||||
this.broadcastChange(key)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (this *config) Reset (key string) error {
|
||||
@@ -271,7 +279,10 @@ func (this *config) Reset (key string) error {
|
||||
if this.data.user == nil { this.data.user = NewFile() }
|
||||
err := this.data.user.Reset(key)
|
||||
if err != nil { return err }
|
||||
return this.saveUser()
|
||||
err = this.saveUser()
|
||||
if err != nil { return err }
|
||||
this.broadcastChange(key)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (this *config) OnChange (callback func (string)) event.Cookie {
|
||||
|
||||
Reference in New Issue
Block a user