Added webservice try_ports, if :10000 is not available

adrianrudnik · Oct 30, 2023 · ba5e832 · ba5e832
1 parent e409f8d
commit ba5e832
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 11 deletions.
diff --git a/service/FyneApp.toml b/service/FyneApp.toml
@@ -5,4 +5,4 @@ Website = "https://www.ablegram.app"
   Name = "Ablegram"
   ID = "com.ablegram.app"
   Version = "1.0.0"
-  Build = 6
+  Build = 7
diff --git a/service/internal/config/config.go b/service/internal/config/config.go
@@ -29,6 +29,10 @@ func newConfig() *Config {
 			SearchablePaths:      make([]string, 0, 100),
 			ExcludeSystemFolders: true,
 		},
+
+		Webservice: WebserviceConfig{
+			TryPorts: []int{10000, 20000, 30000, 40000, 50000, 10001},
+		},
 	}
 }
 

diff --git a/service/internal/config/types.go b/service/internal/config/types.go
@@ -1,9 +1,10 @@
 package config
 
 type Config struct {
-	Log       LogConfig       `yaml:"log"`
-	Behaviour BehaviourConfig `yaml:"behaviour"`
-	Collector CollectorConfig `yaml:"collector"`
+	Log        LogConfig        `yaml:"log"`
+	Behaviour  BehaviourConfig  `yaml:"behaviour"`
+	Collector  CollectorConfig  `yaml:"collector"`
+	Webservice WebserviceConfig `yaml:"webservice"`
 }
 
 type LogConfig struct {
@@ -22,3 +23,8 @@ type CollectorConfig struct {
 	SearchablePaths      []string `yaml:"searchable_paths"`
 	ExcludeSystemFolders bool     `yaml:"exclude_system_folders"`
 }
+
+type WebserviceConfig struct {
+	TryPorts   []int `yaml:"try_ports"`
+	ChosenPort int   `yaml:"-"`
+}
diff --git a/service/internal/indexer/worker.go b/service/internal/indexer/worker.go
@@ -41,8 +41,6 @@ func (p *Worker) doWork(progress *stats.ProcessProgress, m *stats.Metrics) {
 				continue
 			}
 
-			log.Debug().Str("document", msg.Id).Msg("Document indexed")
-
 			docCount, err := p.search.Index.DocCount()
 			if err != nil {
 				log.Warn().Err(err).Msg("Failed to retrieve document count from index")

diff --git a/service/internal/ui/opener.go b/service/internal/ui/opener.go
@@ -1,11 +1,13 @@
 package ui
 
 import (
+	"fmt"
+	"github.com/adrianrudnik/ablegram/internal/config"
 	"github.com/icza/gox/osx"
 )
 
-func OpenFrontend() {
-	err := osx.OpenDefault("http://localhost:10000")
+func OpenFrontend(c *config.Config) {
+	err := osx.OpenDefault(fmt.Sprintf("http://localhost:%d", c.Webservice.ChosenPort))
 	if err != nil {
 		Logger.Warn().Err(err).Msg("Could not open default browser")
 	}

diff --git a/service/main.go b/service/main.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"fmt"
 	"fyne.io/fyne/v2"
 	"fyne.io/fyne/v2/app"
 	"fyne.io/fyne/v2/canvas"
@@ -21,6 +22,7 @@ import (
 	"github.com/rs/zerolog/log"
 	"image/color"
 	"os"
+	"strings"
 	"time"
 )
 
@@ -109,10 +111,18 @@ func main() {
 			}
 
 			time.Sleep(50 * time.Millisecond)
-			ui.OpenFrontend()
+			ui.OpenFrontend(appConfig)
 		}()
 
-		webservice.Serve(search, appPusher, ":10000")
+		for _, port := range appConfig.Webservice.TryPorts {
+			appConfig.Webservice.ChosenPort = port
+			err := webservice.Serve(search, appPusher, fmt.Sprintf(":%d", port))
+			if err != nil && strings.Contains(err.Error(), "bind: permission denied") {
+				log.Warn().Err(err).Int("port", port).Msg("Could not start webservice, trying other port")
+				continue
+			}
+			break
+		}
 	}()
 
 	if !appConfig.Behaviour.ShowGui {
@@ -131,7 +141,7 @@ func main() {
 
 		statusTxt := canvas.NewText("The service is processing files...", color.White)
 		quitBtn := widget.NewButton("Shut down service", func() { a.Quit() })
-		startBtn := widget.NewButton("Open results in browser", func() { ui.OpenFrontend() })
+		startBtn := widget.NewButton("Open results in browser", func() { ui.OpenFrontend(appConfig) })
 		progressBar := widget.NewProgressBarInfinite()
 
 		uiUpdater := ui.NewUiUpdater(statusTxt, progressBar)