Merge pull request #53 from Raffy23/50-fix-high-cpu-load

Fix high CPU load

main.go

@@ -100,9 +100,8 @@ var (
 	statusLabel             *gtk.Label
 	status                  string
 	ignore                  string
-	showWindowTrigger       bool
 	desktopTrigger          bool
-	pinnedTrigger           bool
+	pinnedItemsChanged      chan interface{} = make(chan interface{}, 1)
 )
 
 func defaultStringIfBlank(s, fallback string) string {
@@ -148,6 +147,7 @@ func main() {
 
 	// Gentle SIGTERM handler thanks to reiki4040 https://gist.github.com/reiki4040/be3705f307d3cd136e85
 	// v0.2: we also need to support SIGUSR from now on
+	showWindowChannel := make(chan interface{}, 1)
 	signalChan := make(chan os.Signal, 1)
 	signal.Notify(signalChan, syscall.SIGTERM, syscall.SIGUSR1)
 
@@ -164,7 +164,7 @@ func main() {
 					// let's just set e helper variable here. We'll be checking it with glib.TimeoutAdd.
 					if !win.IsVisible() {
 						log.Debug("SIGUSR1 received, showing the window")
-						showWindowTrigger = true
+						showWindowChannel <- struct{}{}
 					} else {
 						log.Debug("SIGUSR1 received, hiding the window")
 						restoreStateAndHide()
@@ -492,8 +492,25 @@ func main() {
 	log.Info(fmt.Sprintf("UI created in %v ms. Thank you for your patience.", t.Sub(timeStart).Milliseconds()))
 
 	// Check if showing the window has been requested (SIGUSR1)
-	glib.TimeoutAdd(uint(1), func() bool {
-		if showWindowTrigger && win != nil && !win.IsVisible() {
+	go func() {
+		for {
+			select {
+			case <-showWindowChannel:
+				log.Debug("Showing window")
+				glib.TimeoutAdd(0, func() bool {
+					if win != nil && !win.IsVisible() {
+
+						// Refresh files before displaying the root window
+						// some .desktop file changed
+						if desktopTrigger {
+							log.Debug(".desktop file changed")
+							desktopFiles = listDesktopFiles()
+							status = parseDesktopFiles(desktopFiles)
+							appFlowBox = setUpAppsFlowBox(nil, "")
+							desktopTrigger = false
+						}
+
+						// Show window and focus the search box
 						win.ShowAll()
 						if fileSearchResultWrapper != nil {
 							fileSearchResultWrapper.Hide()
@@ -507,26 +524,21 @@ func main() {
 							}
 						}
 					}
-		showWindowTrigger = false
 
-		// some .desktop file changed
-		if desktopTrigger {
-			log.Debug(".desktop file changed")
-			desktopFiles = listDesktopFiles()
-			status = parseDesktopFiles(desktopFiles)
-			appFlowBox = setUpAppsFlowBox(nil, "")
-			desktopTrigger = false
-		}
+					return false
+				})
 
-		// pinned file changed
-		if pinnedTrigger {
+			case <-pinnedItemsChanged:
+				glib.TimeoutAdd(0, func() bool {
 					log.Debug("pinned file changed")
-			pinnedTrigger = false
 					pinned, _ = loadTextFile(pinnedFile)
 					pinnedFlowBox = setUpPinnedFlowBox()
-		}
-		return true
+
+					return false
 				})
+			}
+		}
+	}()
 
 	go watchFiles()
 

watcher.go

@@ -41,7 +41,9 @@ func watchFiles() {
 						event.Op.String() == "RENAME") {
 					desktopTrigger = true
 				} else if event.Name == pinnedFile {
-					pinnedTrigger = true
+					// TODO: This can be used to propagate information about the changed file to the
+					//       GUI to avoid recreating everything
+					pinnedItemsChanged <- struct{}{}
 				}
 
 			case err := <-watcher.Errors: