From a2beea1bbd6ecb8ae83803bcf3f41ee0fc65c87b Mon Sep 17 00:00:00 2001 From: seydx Date: Tue, 20 May 2025 13:59:46 +0200 Subject: [PATCH] refactor --- internal/streams/handlers.go | 9 +++------ pkg/core/listener.go | 10 ++++++++++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/internal/streams/handlers.go b/internal/streams/handlers.go index bd394fc8..d2b99d65 100644 --- a/internal/streams/handlers.go +++ b/internal/streams/handlers.go @@ -47,7 +47,7 @@ func GetProducer(url string) (core.Producer, error) { } if handler, ok := handlers[scheme]; ok { - parsedURL := ParseURL(url) + parsedURL := app.ResolveSecrets(url) return handler(parsedURL) } } @@ -91,13 +91,10 @@ func GetConsumer(url string) (core.Consumer, func(), error) { scheme := url[:i] if handler, ok := consumerHandlers[scheme]; ok { - return handler(url) + parsedURL := app.ResolveSecrets(url) + return handler(parsedURL) } } return nil, nil, errors.New("streams: unsupported scheme: " + url) } - -func ParseURL(url string) string { - return app.ResolveSecrets(url) -} \ No newline at end of file diff --git a/pkg/core/listener.go b/pkg/core/listener.go index 75d9202a..2b7e198b 100644 --- a/pkg/core/listener.go +++ b/pkg/core/listener.go @@ -1,5 +1,7 @@ package core +import "github.com/AlexxIT/go2rtc/internal/app" + type EventFunc func(msg any) // Listener base struct for all classes with support feedback @@ -16,3 +18,11 @@ func (l *Listener) Fire(msg any) { f(msg) } } + +func (l *Listener) ParseSource(url string) string { + return app.ResolveSecrets(url) +} + +func (l *Listener) SaveSource(path []string, value any) error { + return app.PatchSecret(path, value) +} \ No newline at end of file