Extract StatusManager.addStatus method

Avoids a bit of code duplication.

pkg/gui/status/status_manager.go

@@ -27,19 +27,7 @@ func NewStatusManager() *StatusManager {
 }
 
 func (self *StatusManager) WithWaitingStatus(message string, f func()) {
-	self.mutex.Lock()
+	id := self.addStatus(message, "waiting")
-
-	self.nextId += 1
-	id := self.nextId
-
-	newStatus := appStatus{
-		message:    message,
-		statusType: "waiting",
-		id:         id,
-	}
-	self.statuses = append([]appStatus{newStatus}, self.statuses...)
-
-	self.mutex.Unlock()
 
 	f()
 
@@ -47,18 +35,7 @@ func (self *StatusManager) WithWaitingStatus(message string, f func()) {
 }
 
 func (self *StatusManager) AddToastStatus(message string) int {
-	self.mutex.Lock()
+	id := self.addStatus(message, "toast")
-	defer self.mutex.Unlock()
-
-	self.nextId++
-	id := self.nextId
-
-	newStatus := appStatus{
-		message:    message,
-		statusType: "toast",
-		id:         id,
-	}
-	self.statuses = append([]appStatus{newStatus}, self.statuses...)
 
 	go func() {
 		time.Sleep(time.Second * 2)
@@ -84,6 +61,23 @@ func (self *StatusManager) HasStatus() bool {
 	return len(self.statuses) > 0
 }
 
+func (self *StatusManager) addStatus(message string, statusType string) int {
+	self.mutex.Lock()
+	defer self.mutex.Unlock()
+
+	self.nextId++
+	id := self.nextId
+
+	newStatus := appStatus{
+		message:    message,
+		statusType: statusType,
+		id:         id,
+	}
+	self.statuses = append([]appStatus{newStatus}, self.statuses...)
+
+	return id
+}
+
 func (self *StatusManager) removeStatus(id int) {
 	self.mutex.Lock()
 	defer self.mutex.Unlock()