refactor: move printing accessible URL logic out of app

Author: marjune163

src/accessibleUrls.go

@@ -0,0 +1,19 @@
+package src
+
+import (
+	"mjpclab.dev/ghfs/src/util"
+	"strconv"
+)
+
+func printAccessibleURLs(accessibleUrls [][]string) {
+	file, teardown := util.GetTTYFile()
+
+	for vhIndex, vhUrls := range accessibleUrls {
+		file.WriteString("Host " + strconv.Itoa(vhIndex) + " may be accessed by URLs:\n")
+		for _, url := range vhUrls {
+			file.WriteString("  " + url + "\n")
+		}
+	}
+
+	teardown()
+}

src/app/accessibleUrls.go

@@ -1,27 +1,23 @@
 package app
 
-import (
-	"mjpclab.dev/ghfs/src/goVirtualHost"
-	"mjpclab.dev/ghfs/src/param"
-	"mjpclab.dev/ghfs/src/util"
-	"strconv"
-)
+func (app *App) GetAccessibleUrls(includeLoopback bool) (allUrls [][]string) {
+	allOrigins := app.vhostSvc.GetAccessibleURLs(includeLoopback)
+	allUrls = make([][]string, len(allOrigins))
 
-func printAccessibleURLs(vhSvc *goVirtualHost.Service, params param.Params) {
-	vhostsUrls := vhSvc.GetAccessibleURLs(false)
-	file, teardown := util.GetTTYFile()
-
-	for vhIndex := range vhostsUrls {
-		prefix := ""
-		if len(params[vhIndex].PrefixUrls) > 0 {
-			prefix = params[vhIndex].PrefixUrls[0]
+	for vhIndex, vhOrigins := range allOrigins {
+		vhPrefixes := app.params[vhIndex].PrefixUrls
+		if len(vhPrefixes) == 0 {
+			vhPrefixes = []string{""}
 		}
 
-		file.WriteString("Host " + strconv.Itoa(vhIndex) + " may be accessed by URLs:\n")
-		for urlIndex := range vhostsUrls[vhIndex] {
-			file.WriteString("  " + vhostsUrls[vhIndex][urlIndex] + prefix + "/\n")
+		allUrls[vhIndex] = make([]string, 0, len(vhOrigins)*len(vhPrefixes))
+
+		for _, origin := range vhOrigins {
+			for _, prefix := range vhPrefixes {
+				allUrls[vhIndex] = append(allUrls[vhIndex], origin+prefix+"/")
+			}
 		}
 	}
 
-	teardown()
+	return
 }

src/app/main.go

@@ -6,13 +6,13 @@ import (
 	"mjpclab.dev/ghfs/src/param"
 	"mjpclab.dev/ghfs/src/serverHandler"
 	"mjpclab.dev/ghfs/src/serverLog"
-	"mjpclab.dev/ghfs/src/setting"
 	"mjpclab.dev/ghfs/src/tpl/theme"
 	"net/http"
 	"time"
 )
 
 type App struct {
+	params   param.Params
 	vhostSvc *goVirtualHost.Service
 	logMan   *serverLog.Man
 }
@@ -49,11 +49,7 @@ func (app *App) ReLoadCertificates() []error {
 	return app.vhostSvc.ReloadCertificates()
 }
 
-func (app *App) GetAccessibleOrigins(includeLoopback bool) [][]string {
-	return app.vhostSvc.GetAccessibleURLs(includeLoopback)
-}
-
-func NewApp(params param.Params, settings *setting.Setting) (*App, []error) {
+func NewApp(params param.Params) (*App, []error) {
 	vhSvc := goVirtualHost.NewService()
 	logMan := serverLog.NewMan()
 	themePool := make(map[string]theme.Theme)
@@ -112,11 +108,8 @@ func NewApp(params param.Params, settings *setting.Setting) (*App, []error) {
 		}
 	}
 
-	if !settings.Quiet {
-		go printAccessibleURLs(vhSvc, params)
-	}
-
 	return &App{
+		params:   params,
 		vhostSvc: vhSvc,
 		logMan:   logMan,
 	}, nil

src/main.go

@@ -88,7 +88,7 @@ func Main() (ok bool) {
 	}
 
 	// app
-	appInst, errs := app.NewApp(params, settings)
+	appInst, errs := app.NewApp(params)
 	if serverError.CheckError(errs...) {
 		return
 	}
@@ -99,6 +99,9 @@ func Main() (ok bool) {
 
 	cleanupOnEnd(appInst)
 	reInitOnHup(appInst)
+	if !settings.Quiet {
+		printAccessibleURLs(appInst.GetAccessibleUrls(false))
+	}
 	errs = appInst.Open()
 	if serverError.CheckError(errs...) {
 		return