Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: resolve invalid port override #334

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: resolve invalid port override #334

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions internal/arr/config/xml_parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ func (p *XML) Marshal(o map[string]interface{}) ([]byte, error) {

func (p *XML) Merge(baseURL string) func(src, dest map[string]interface{}) error {
return func(src, dest map[string]interface{}) error {

if src["api-key"] != nil && src["api-key"].(string) != "" {
dest["api-key"] = src["api-key"]
}
Expand All @@ -50,7 +49,18 @@ func (p *XML) Merge(baseURL string) func(src, dest map[string]interface{}) error
}

// Add or replace target port
u.Host = u.Hostname() + ":" + src["target-port"].(string)
target_port := src["target-port"].(string)
if len(target_port) > 0 {
// AKA Port is defined in the config xml so we use this value as the source
// of truth.
u.Host = u.Hostname() + ":" + target_port

// If Port is NOT defined in the XML it may be configured by the
// *ARR__SERVER__PORT environment varible passed directly to *arr services.
// In this case, we do not want to override whatever URL (that may include
// the port) passed to exportarr by other means.
}

u = u.JoinPath(src["url-base"].(string))
dest["url"] = u.String()
return nil
Expand Down