oss/miniflux-v2
oss/miniflux-v2
1
0
Fork 0
mirror of https://github.com/miniflux/v2.git synced 2025-09-15 18:57:04 +00:00
Code Wiki Activity

refactor(mediaproxy): use *url.URL for MEDIA_PROXY_CUSTOM_URL

Browse source 
Same behaviour as for HTTP_CLIENT_PROXY.
This commit is contained in:
gudvinr 2025-07-23 21:41:24 +03:00 • committed by Frédéric Guillot
parent 40fa77851c
commit ce6cadc176
5 changed files with 17 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

3
internal/config/config_test.go
View file

@ -1601,7 +1601,8 @@ func TestMediaProxyCustomURL(t *testing.T) {
}
expected := "http://example.org/proxy"
result := opts.MediaCustomProxyURL()
if result != expected {
if result == nil || result.String() != expected {
t.Fatalf(`Unexpected MEDIA_PROXY_CUSTOM_URL value, got %q instead of %q`, result, expected)
}
}

6
internal/config/options.go
View file

@ -148,7 +148,7 @@ type options struct {
mediaProxyHTTPClientTimeout int
mediaProxyMode string
mediaProxyResourceTypes []string
mediaProxyCustomURL string
mediaProxyCustomURL *url.URL
fetchBilibiliWatchTime bool
fetchNebulaWatchTime bool
fetchOdyseeWatchTime bool
@ -229,7 +229,7 @@ func NewOptions() *options {
mediaProxyHTTPClientTimeout: defaultMediaProxyHTTPClientTimeout,
mediaProxyMode: defaultMediaProxyMode,
mediaProxyResourceTypes: []string{defaultMediaResourceTypes},
mediaProxyCustomURL: defaultMediaProxyURL,
mediaProxyCustomURL: nil,
filterEntryMaxAgeDays: defaultFilterEntryMaxAgeDays,
fetchBilibiliWatchTime: defaultFetchBilibiliWatchTime,
fetchNebulaWatchTime: defaultFetchNebulaWatchTime,
@ -563,7 +563,7 @@ func (o *options) MediaProxyResourceTypes() []string {
}
// MediaCustomProxyURL returns the custom proxy URL for medias.
func (o *options) MediaCustomProxyURL() string {
func (o *options) MediaCustomProxyURL() *url.URL {
return o.mediaProxyCustomURL
}

5
internal/config/parser.go
View file

@ -170,7 +170,10 @@ func (p *parser) parseLines(lines []string) (err error) {
rand.Read(randomKey)
p.opts.mediaProxyPrivateKey = parseBytes(value, randomKey)
case "MEDIA_PROXY_CUSTOM_URL":
p.opts.mediaProxyCustomURL = parseString(value, defaultMediaProxyURL)
p.opts.mediaProxyCustomURL, err = url.Parse(parseString(value, defaultMediaProxyURL))
if err != nil {
return fmt.Errorf("config: invalid MEDIA_PROXY_CUSTOM_URL value: %w", err)
}
case "CREATE_ADMIN":
p.opts.createAdmin = parseBool(value, defaultCreateAdmin)
case "ADMIN_USERNAME":