From 2f2646849985c839f4d0d7ed7d2b2c18f55e2bc9 Mon Sep 17 00:00:00 2001 From: euzu Date: Tue, 8 Jul 2025 13:47:49 +0200 Subject: [PATCH] fixed hdhomerun config check --- backend/src/model/config/app.rs | 6 +++++- shared/src/model/config/api_proxy.rs | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/backend/src/model/config/app.rs b/backend/src/model/config/app.rs index b3c3b85c0..a53df90ad 100644 --- a/backend/src/model/config/app.rs +++ b/backend/src/model/config/app.rs @@ -93,7 +93,11 @@ impl AppConfig { } } fn check_target_user(&self) -> Result<(), TuliproxError> { - let check_homerun = self.hdhomerun.load().as_ref().is_some_and(|h| h.enabled); + let check_homerun = { + let config = > as Access>::load(&self.config); + self.hdhomerun.store(config.hdhomerun.as_ref().map(|h| Arc::new(h.clone()))); + config.hdhomerun.as_ref().is_some_and(|h| h.enabled) + }; let sources = > as Access>::load(&self.sources); for source in &sources.sources { for target in &source.targets { diff --git a/shared/src/model/config/api_proxy.rs b/shared/src/model/config/api_proxy.rs index f6618974c..9b5cdf7e9 100644 --- a/shared/src/model/config/api_proxy.rs +++ b/shared/src/model/config/api_proxy.rs @@ -116,7 +116,7 @@ impl ApiProxyConfigDto { if token.is_empty() { user.token = None; } else if tokens.contains(token) { - errors.push(format!("Non unique token found {}", &user.username)); + errors.push(format!("Non unique user token found {} for user {}", &user.token.as_ref().map_or_else(String::new, ToString::to_string), &user.username)); } else { tokens.insert(token.to_string()); }