Refactor UI assets and harden quality checks

karldns/dns/base.py

@@ -55,7 +55,7 @@ def delete_dns_records(hostname: str, settings: DdnsSettings) -> None:
 def dns_backend_configured(settings: DdnsSettings) -> bool:
     validate_dns_provider_settings(settings)
     provider = _normalized_provider(settings)
-    return provider == "cloudflare" or provider == "rfc2136" or bool(settings.rfc2136_server)
+    return _dns_backend_enabled(provider, settings)
 
 
 def validate_dns_provider_settings(settings: DdnsSettings) -> None:
@@ -65,19 +65,33 @@ def validate_dns_provider_settings(settings: DdnsSettings) -> None:
     if not settings.require_dns_provider:
         return
     if provider == "cloudflare":
-        if not settings.cloudflare_api_token or not settings.cloudflare_zone_id:
-            raise DnsConfigurationError(
-                "DDNS_CLOUDFLARE_API_TOKEN and DDNS_CLOUDFLARE_ZONE_ID are required when DDNS_DNS_PROVIDER=cloudflare"
-            )
+        _validate_cloudflare_settings(settings)
         return
-    if provider == "rfc2136" or settings.rfc2136_server:
-        if not settings.rfc2136_server or not settings.rfc2136_zone:
-            raise DnsConfigurationError(
-                "DDNS_RFC2136_SERVER and DDNS_RFC2136_ZONE are required when RFC2136 DNS publishing is enabled"
-            )
+    if _dns_backend_enabled(provider, settings):
+        _validate_rfc2136_settings(settings)
         return
     raise DnsConfigurationError("DDNS_REQUIRE_DNS_PROVIDER is set but no DNS backend is configured")
 
 
+def _dns_backend_enabled(provider: str, settings: DdnsSettings) -> bool:
+    return provider == "cloudflare" or provider == "rfc2136" or bool(settings.rfc2136_server)
+
+
+def _validate_cloudflare_settings(settings: DdnsSettings) -> None:
+    if settings.cloudflare_api_token and settings.cloudflare_zone_id:
+        return
+    raise DnsConfigurationError(
+        "DDNS_CLOUDFLARE_API_TOKEN and DDNS_CLOUDFLARE_ZONE_ID are required when DDNS_DNS_PROVIDER=cloudflare"
+    )
+
+
+def _validate_rfc2136_settings(settings: DdnsSettings) -> None:
+    if settings.rfc2136_server and settings.rfc2136_zone:
+        return
+    raise DnsConfigurationError(
+        "DDNS_RFC2136_SERVER and DDNS_RFC2136_ZONE are required when RFC2136 DNS publishing is enabled"
+    )
+
+
 def _normalized_provider(settings: DdnsSettings) -> str:
     return settings.dns_provider.strip().lower()