feat: Make DLNA port configurable stashapp#4760

Signed-off-by: Ivan Pedrazas <[email protected]>
ipedrazas · May 14, 2024 · 8bccf93 · 8bccf93
1 parent ca5febc
commit 8bccf93
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/internal/dlna/service.go b/internal/dlna/service.go
@@ -76,6 +76,7 @@ type Config interface {
 	GetDLNAServerName() string
 	GetDLNADefaultIPWhitelist() []string
 	GetVideoSortOrder() string
+	GetDLNAPortAsString() string
 }
 
 type Service struct {
@@ -138,7 +139,7 @@ func (s *Service) init() error {
 	var dmsConfig = &dmsConfig{
 		Path:           "",
 		IfNames:        s.config.GetDLNADefaultIPWhitelist(),
-		Http:           ":1338",
+		Http:           s.config.GetDLNAPortAsString(),
 		FriendlyName:   friendlyName,
 		LogHeaders:     false,
 		NotifyInterval: 30 * time.Second,
@@ -241,7 +242,7 @@ func (s *Service) Start(duration *time.Duration) error {
 		}
 
 		go func() {
-			logger.Info("Starting DLNA")
+			logger.Info("Starting DLNA " + s.server.HTTPConn.Addr().String())
 			if err := s.server.Serve(); err != nil {
 				logger.Error(err)
 			}

diff --git a/internal/manager/config/config.go b/internal/manager/config/config.go
@@ -6,6 +6,7 @@ import (
 	"path/filepath"
 	"regexp"
 	"runtime"
+	"strconv"
 	"strings"
 
 	"sync"
@@ -237,6 +238,9 @@ const (
 	DLNAVideoSortOrder        = "dlna.video_sort_order"
 	dlnaVideoSortOrderDefault = "title"
 
+	DLNAPort        = "dlna.port"
+	DLNAPortDefault = 1338
+
 	// Logging options
 	LogFile          = "logFile"
 	LogOut           = "logOut"
@@ -1477,6 +1481,21 @@ func (i *Config) GetDLNAInterfaces() []string {
 	return i.getStringSlice(DLNAInterfaces)
 }
 
+// GetDLNAPort returns the port to run the DLNA server on. If empty, 1338
+// will be used.
+func (i *Config) GetDLNAPort() int {
+	ret := i.getInt(DLNAPort)
+	if ret == 0 {
+		ret = DLNAPortDefault
+	}
+	return ret
+}
+
+// GetDLNAPortAsString returns the port to run the DLNA server on as a string.
+func (i *Config) GetDLNAPortAsString() string {
+	return ":" + strconv.Itoa(i.GetDLNAPort())
+}
+
 // GetVideoSortOrder returns the sort order to display videos. If
 // empty, videos will be sorted by titles.
 func (i *Config) GetVideoSortOrder() string {

diff --git a/internal/manager/config/config_concurrency_test.go b/internal/manager/config/config_concurrency_test.go
@@ -97,6 +97,7 @@ func TestConcurrentConfigAccess(t *testing.T) {
 				i.Set(DLNADefaultEnabled, i.GetDLNADefaultEnabled())
 				i.Set(DLNADefaultIPWhitelist, i.GetDLNADefaultIPWhitelist())
 				i.Set(DLNAInterfaces, i.GetDLNAInterfaces())
+				i.Set(DLNAPort, i.GetDLNAPort())
 				i.Set(LogFile, i.GetLogFile())
 				i.Set(LogOut, i.GetLogOut())
 				i.Set(LogLevel, i.GetLogLevel())